summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus')
-rw-r--r--src/devices/bus/a1bus/a1bus.cpp12
-rw-r--r--src/devices/bus/a1bus/a1bus.h12
-rw-r--r--src/devices/bus/a1bus/a1cassette.cpp4
-rw-r--r--src/devices/bus/a1bus/a1cassette.h6
-rw-r--r--src/devices/bus/a1bus/a1cffa.cpp4
-rw-r--r--src/devices/bus/a1bus/a1cffa.h8
-rw-r--r--src/devices/bus/a2bus/a2alfam2.cpp10
-rw-r--r--src/devices/bus/a2bus/a2alfam2.h12
-rw-r--r--src/devices/bus/a2bus/a2applicard.cpp10
-rw-r--r--src/devices/bus/a2bus/a2applicard.h14
-rw-r--r--src/devices/bus/a2bus/a2arcadebd.cpp8
-rw-r--r--src/devices/bus/a2bus/a2arcadebd.h8
-rw-r--r--src/devices/bus/a2bus/a2bus.cpp20
-rw-r--r--src/devices/bus/a2bus/a2bus.h56
-rw-r--r--src/devices/bus/a2bus/a2cffa.cpp16
-rw-r--r--src/devices/bus/a2bus/a2cffa.h22
-rw-r--r--src/devices/bus/a2bus/a2corvus.cpp12
-rw-r--r--src/devices/bus/a2bus/a2corvus.h14
-rw-r--r--src/devices/bus/a2bus/a2diskii.cpp12
-rw-r--r--src/devices/bus/a2bus/a2diskii.h14
-rw-r--r--src/devices/bus/a2bus/a2diskiing.cpp8
-rw-r--r--src/devices/bus/a2bus/a2diskiing.h10
-rw-r--r--src/devices/bus/a2bus/a2dx1.cpp8
-rw-r--r--src/devices/bus/a2bus/a2dx1.h8
-rw-r--r--src/devices/bus/a2bus/a2eauxslot.cpp8
-rw-r--r--src/devices/bus/a2bus/a2eauxslot.h18
-rw-r--r--src/devices/bus/a2bus/a2echoii.cpp8
-rw-r--r--src/devices/bus/a2bus/a2echoii.h8
-rw-r--r--src/devices/bus/a2bus/a2eext80col.cpp12
-rw-r--r--src/devices/bus/a2bus/a2eext80col.h14
-rw-r--r--src/devices/bus/a2bus/a2eramworks3.cpp14
-rw-r--r--src/devices/bus/a2bus/a2eramworks3.h16
-rw-r--r--src/devices/bus/a2bus/a2estd80col.cpp12
-rw-r--r--src/devices/bus/a2bus/a2estd80col.h14
-rw-r--r--src/devices/bus/a2bus/a2hsscsi.cpp16
-rw-r--r--src/devices/bus/a2bus/a2hsscsi.h26
-rw-r--r--src/devices/bus/a2bus/a2lang.cpp10
-rw-r--r--src/devices/bus/a2bus/a2lang.h8
-rw-r--r--src/devices/bus/a2bus/a2mcms.cpp28
-rw-r--r--src/devices/bus/a2bus/a2mcms.h36
-rw-r--r--src/devices/bus/a2bus/a2memexp.cpp20
-rw-r--r--src/devices/bus/a2bus/a2memexp.h22
-rw-r--r--src/devices/bus/a2bus/a2midi.cpp10
-rw-r--r--src/devices/bus/a2bus/a2midi.h8
-rw-r--r--src/devices/bus/a2bus/a2mockingboard.cpp22
-rw-r--r--src/devices/bus/a2bus/a2mockingboard.h22
-rw-r--r--src/devices/bus/a2bus/a2pic.cpp14
-rw-r--r--src/devices/bus/a2bus/a2pic.h14
-rw-r--r--src/devices/bus/a2bus/a2sam.cpp4
-rw-r--r--src/devices/bus/a2bus/a2sam.h4
-rw-r--r--src/devices/bus/a2bus/a2scsi.cpp16
-rw-r--r--src/devices/bus/a2bus/a2scsi.h24
-rw-r--r--src/devices/bus/a2bus/a2softcard.cpp6
-rw-r--r--src/devices/bus/a2bus/a2softcard.h6
-rw-r--r--src/devices/bus/a2bus/a2ssc.cpp12
-rw-r--r--src/devices/bus/a2bus/a2ssc.h14
-rw-r--r--src/devices/bus/a2bus/a2swyft.cpp10
-rw-r--r--src/devices/bus/a2bus/a2swyft.h16
-rw-r--r--src/devices/bus/a2bus/a2themill.cpp8
-rw-r--r--src/devices/bus/a2bus/a2themill.h10
-rw-r--r--src/devices/bus/a2bus/a2thunderclock.cpp12
-rw-r--r--src/devices/bus/a2bus/a2thunderclock.h14
-rw-r--r--src/devices/bus/a2bus/a2ultraterm.cpp34
-rw-r--r--src/devices/bus/a2bus/a2ultraterm.h24
-rw-r--r--src/devices/bus/a2bus/a2videoterm.cpp44
-rw-r--r--src/devices/bus/a2bus/a2videoterm.h34
-rw-r--r--src/devices/bus/a2bus/a2vulcan.cpp16
-rw-r--r--src/devices/bus/a2bus/a2vulcan.h22
-rw-r--r--src/devices/bus/a2bus/a2zipdrive.cpp12
-rw-r--r--src/devices/bus/a2bus/a2zipdrive.h16
-rw-r--r--src/devices/bus/a2bus/corvfdc01.cpp10
-rw-r--r--src/devices/bus/a2bus/corvfdc01.h14
-rw-r--r--src/devices/bus/a2bus/corvfdc02.cpp10
-rw-r--r--src/devices/bus/a2bus/corvfdc02.h18
-rw-r--r--src/devices/bus/a2bus/ezcgi.cpp24
-rw-r--r--src/devices/bus/a2bus/ezcgi.h24
-rw-r--r--src/devices/bus/a2bus/laser128.cpp14
-rw-r--r--src/devices/bus/a2bus/laser128.h18
-rw-r--r--src/devices/bus/a2bus/mouse.cpp14
-rw-r--r--src/devices/bus/a2bus/mouse.h36
-rw-r--r--src/devices/bus/a2bus/pc_xporter.cpp18
-rw-r--r--src/devices/bus/a2bus/pc_xporter.h40
-rw-r--r--src/devices/bus/a2bus/ramcard128k.cpp12
-rw-r--r--src/devices/bus/a2bus/ramcard128k.h18
-rw-r--r--src/devices/bus/a2bus/ramcard16k.cpp12
-rw-r--r--src/devices/bus/a2bus/ramcard16k.h18
-rw-r--r--src/devices/bus/a2bus/timemasterho.cpp14
-rw-r--r--src/devices/bus/a2bus/timemasterho.h14
-rw-r--r--src/devices/bus/a7800/a78_slot.cpp26
-rw-r--r--src/devices/bus/a7800/a78_slot.h32
-rw-r--r--src/devices/bus/a7800/cpuwiz.cpp8
-rw-r--r--src/devices/bus/a7800/cpuwiz.h8
-rw-r--r--src/devices/bus/a7800/hiscore.cpp2
-rw-r--r--src/devices/bus/a7800/hiscore.h2
-rw-r--r--src/devices/bus/a7800/rom.cpp38
-rw-r--r--src/devices/bus/a7800/rom.h34
-rw-r--r--src/devices/bus/a7800/xboard.cpp6
-rw-r--r--src/devices/bus/a7800/xboard.h6
-rw-r--r--src/devices/bus/a800/a800_slot.cpp32
-rw-r--r--src/devices/bus/a800/a800_slot.h36
-rw-r--r--src/devices/bus/a800/a8sio.cpp8
-rw-r--r--src/devices/bus/a800/a8sio.h8
-rw-r--r--src/devices/bus/a800/cassette.cpp6
-rw-r--r--src/devices/bus/a800/cassette.h8
-rw-r--r--src/devices/bus/a800/oss.cpp8
-rw-r--r--src/devices/bus/a800/oss.h8
-rw-r--r--src/devices/bus/a800/rom.cpp26
-rw-r--r--src/devices/bus/a800/rom.h24
-rw-r--r--src/devices/bus/a800/sparta.cpp2
-rw-r--r--src/devices/bus/a800/sparta.h2
-rw-r--r--src/devices/bus/abcbus/abc890.cpp40
-rw-r--r--src/devices/bus/abcbus/abc890.h34
-rw-r--r--src/devices/bus/abcbus/abcbus.cpp2
-rw-r--r--src/devices/bus/abcbus/abcbus.h52
-rw-r--r--src/devices/bus/abcbus/fd2.cpp24
-rw-r--r--src/devices/bus/abcbus/fd2.h20
-rw-r--r--src/devices/bus/abcbus/hdc.cpp4
-rw-r--r--src/devices/bus/abcbus/hdc.h4
-rw-r--r--src/devices/bus/abcbus/lux10828.cpp26
-rw-r--r--src/devices/bus/abcbus/lux10828.h18
-rw-r--r--src/devices/bus/abcbus/lux21046.cpp36
-rw-r--r--src/devices/bus/abcbus/lux21046.h34
-rw-r--r--src/devices/bus/abcbus/lux21056.cpp24
-rw-r--r--src/devices/bus/abcbus/lux21056.h22
-rw-r--r--src/devices/bus/abcbus/lux4105.cpp20
-rw-r--r--src/devices/bus/abcbus/lux4105.h20
-rw-r--r--src/devices/bus/abcbus/memcard.cpp6
-rw-r--r--src/devices/bus/abcbus/memcard.h6
-rw-r--r--src/devices/bus/abcbus/ram.cpp8
-rw-r--r--src/devices/bus/abcbus/ram.h10
-rw-r--r--src/devices/bus/abcbus/sio.cpp8
-rw-r--r--src/devices/bus/abcbus/sio.h6
-rw-r--r--src/devices/bus/abcbus/slutprov.cpp4
-rw-r--r--src/devices/bus/abcbus/slutprov.h4
-rw-r--r--src/devices/bus/abcbus/turbo.cpp4
-rw-r--r--src/devices/bus/abcbus/turbo.h4
-rw-r--r--src/devices/bus/abcbus/uni800.cpp4
-rw-r--r--src/devices/bus/abcbus/uni800.h4
-rw-r--r--src/devices/bus/abckb/abc77.cpp8
-rw-r--r--src/devices/bus/abckb/abc77.h8
-rw-r--r--src/devices/bus/abckb/abc800kb.cpp4
-rw-r--r--src/devices/bus/abckb/abc800kb.h2
-rw-r--r--src/devices/bus/abckb/abc99.cpp6
-rw-r--r--src/devices/bus/abckb/abc99.h2
-rw-r--r--src/devices/bus/abckb/abckb.cpp2
-rw-r--r--src/devices/bus/abckb/abckb.h2
-rw-r--r--src/devices/bus/adam/adamlink.cpp6
-rw-r--r--src/devices/bus/adam/adamlink.h6
-rw-r--r--src/devices/bus/adam/exp.cpp6
-rw-r--r--src/devices/bus/adam/exp.h12
-rw-r--r--src/devices/bus/adam/ide.cpp6
-rw-r--r--src/devices/bus/adam/ide.h8
-rw-r--r--src/devices/bus/adam/ram.cpp6
-rw-r--r--src/devices/bus/adam/ram.h8
-rw-r--r--src/devices/bus/adamnet/adamnet.cpp4
-rw-r--r--src/devices/bus/adamnet/adamnet.h4
-rw-r--r--src/devices/bus/adamnet/ddp.cpp6
-rw-r--r--src/devices/bus/adamnet/ddp.h2
-rw-r--r--src/devices/bus/adamnet/fdc.cpp8
-rw-r--r--src/devices/bus/adamnet/fdc.h4
-rw-r--r--src/devices/bus/adamnet/kb.cpp6
-rw-r--r--src/devices/bus/adamnet/kb.h4
-rw-r--r--src/devices/bus/adamnet/printer.cpp4
-rw-r--r--src/devices/bus/adamnet/printer.h2
-rw-r--r--src/devices/bus/adamnet/spi.cpp4
-rw-r--r--src/devices/bus/adamnet/spi.h2
-rw-r--r--src/devices/bus/amiga/zorro/a2052.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/a2052.h4
-rw-r--r--src/devices/bus/amiga/zorro/a2232.cpp6
-rw-r--r--src/devices/bus/amiga/zorro/a2232.h8
-rw-r--r--src/devices/bus/amiga/zorro/a590.cpp6
-rw-r--r--src/devices/bus/amiga/zorro/a590.h8
-rw-r--r--src/devices/bus/amiga/zorro/action_replay.cpp8
-rw-r--r--src/devices/bus/amiga/zorro/action_replay.h8
-rw-r--r--src/devices/bus/amiga/zorro/buddha.cpp16
-rw-r--r--src/devices/bus/amiga/zorro/buddha.h2
-rw-r--r--src/devices/bus/amiga/zorro/zorro.cpp14
-rw-r--r--src/devices/bus/amiga/zorro/zorro.h14
-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.cpp10
-rw-r--r--src/devices/bus/apf/slot.h20
-rw-r--r--src/devices/bus/apricot/expansion/expansion.cpp6
-rw-r--r--src/devices/bus/apricot/expansion/expansion.h6
-rw-r--r--src/devices/bus/apricot/expansion/ram.cpp6
-rw-r--r--src/devices/bus/apricot/expansion/ram.h12
-rw-r--r--src/devices/bus/apricot/keyboard/hle.cpp8
-rw-r--r--src/devices/bus/apricot/keyboard/hle.h8
-rw-r--r--src/devices/bus/apricot/keyboard/keyboard.cpp2
-rw-r--r--src/devices/bus/apricot/keyboard/keyboard.h2
-rw-r--r--src/devices/bus/arcadia/rom.cpp6
-rw-r--r--src/devices/bus/arcadia/rom.h6
-rw-r--r--src/devices/bus/arcadia/slot.cpp6
-rw-r--r--src/devices/bus/arcadia/slot.h12
-rw-r--r--src/devices/bus/astrocde/exp.cpp2
-rw-r--r--src/devices/bus/astrocde/exp.h2
-rw-r--r--src/devices/bus/astrocde/ram.cpp14
-rw-r--r--src/devices/bus/astrocde/ram.h22
-rw-r--r--src/devices/bus/astrocde/rom.cpp8
-rw-r--r--src/devices/bus/astrocde/rom.h12
-rw-r--r--src/devices/bus/astrocde/slot.cpp8
-rw-r--r--src/devices/bus/astrocde/slot.h12
-rw-r--r--src/devices/bus/bbc/1mhzbus/1mhzbus.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/1mhzbus.h2
-rw-r--r--src/devices/bus/bbc/1mhzbus/opus3.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/opus3.h4
-rw-r--r--src/devices/bus/bbc/analogue/analogue.cpp6
-rw-r--r--src/devices/bus/bbc/analogue/analogue.h10
-rw-r--r--src/devices/bus/bbc/analogue/joystick.cpp10
-rw-r--r--src/devices/bus/bbc/analogue/joystick.h10
-rw-r--r--src/devices/bus/bbc/fdc/acorn.cpp4
-rw-r--r--src/devices/bus/bbc/fdc/acorn.h4
-rw-r--r--src/devices/bus/bbc/fdc/cumana.cpp6
-rw-r--r--src/devices/bus/bbc/fdc/cumana.h6
-rw-r--r--src/devices/bus/bbc/fdc/fdc.cpp2
-rw-r--r--src/devices/bus/bbc/fdc/fdc.h2
-rw-r--r--src/devices/bus/bbc/fdc/opus.cpp8
-rw-r--r--src/devices/bus/bbc/fdc/opus.h8
-rw-r--r--src/devices/bus/bbc/fdc/watford.cpp6
-rw-r--r--src/devices/bus/bbc/fdc/watford.h6
-rw-r--r--src/devices/bus/bbc/joyport/joyport.cpp6
-rw-r--r--src/devices/bus/bbc/joyport/joyport.h10
-rw-r--r--src/devices/bus/bbc/joyport/joystick.cpp6
-rw-r--r--src/devices/bus/bbc/joyport/joystick.h6
-rw-r--r--src/devices/bus/bbc/tube/tube.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube.h2
-rw-r--r--src/devices/bus/bbc/userport/userport.cpp6
-rw-r--r--src/devices/bus/bbc/userport/userport.h14
-rw-r--r--src/devices/bus/bml3/bml3bus.cpp8
-rw-r--r--src/devices/bus/bml3/bml3bus.h8
-rw-r--r--src/devices/bus/bml3/bml3kanji.cpp4
-rw-r--r--src/devices/bus/bml3/bml3kanji.h6
-rw-r--r--src/devices/bus/bml3/bml3mp1802.cpp4
-rw-r--r--src/devices/bus/bml3/bml3mp1802.h4
-rw-r--r--src/devices/bus/bml3/bml3mp1805.cpp4
-rw-r--r--src/devices/bus/bml3/bml3mp1805.h4
-rw-r--r--src/devices/bus/bw2/exp.cpp10
-rw-r--r--src/devices/bus/bw2/exp.h18
-rw-r--r--src/devices/bus/bw2/ramcard.cpp8
-rw-r--r--src/devices/bus/bw2/ramcard.h12
-rw-r--r--src/devices/bus/c64/16kb.cpp6
-rw-r--r--src/devices/bus/c64/16kb.h4
-rw-r--r--src/devices/bus/c64/4dxh.cpp2
-rw-r--r--src/devices/bus/c64/4dxh.h2
-rw-r--r--src/devices/bus/c64/4ksa.cpp2
-rw-r--r--src/devices/bus/c64/4ksa.h2
-rw-r--r--src/devices/bus/c64/4tba.cpp2
-rw-r--r--src/devices/bus/c64/4tba.h2
-rw-r--r--src/devices/bus/c64/bn1541.cpp4
-rw-r--r--src/devices/bus/c64/bn1541.h10
-rw-r--r--src/devices/bus/c64/c128_comal80.cpp6
-rw-r--r--src/devices/bus/c64/c128_comal80.h8
-rw-r--r--src/devices/bus/c64/c128_partner.cpp8
-rw-r--r--src/devices/bus/c64/c128_partner.h10
-rw-r--r--src/devices/bus/c64/comal80.cpp6
-rw-r--r--src/devices/bus/c64/comal80.h8
-rw-r--r--src/devices/bus/c64/cpm.cpp6
-rw-r--r--src/devices/bus/c64/cpm.h4
-rw-r--r--src/devices/bus/c64/currah_speech.cpp6
-rw-r--r--src/devices/bus/c64/currah_speech.h6
-rw-r--r--src/devices/bus/c64/dela_ep256.cpp6
-rw-r--r--src/devices/bus/c64/dela_ep256.h8
-rw-r--r--src/devices/bus/c64/dela_ep64.cpp6
-rw-r--r--src/devices/bus/c64/dela_ep64.h8
-rw-r--r--src/devices/bus/c64/dela_ep7x8.cpp6
-rw-r--r--src/devices/bus/c64/dela_ep7x8.h8
-rw-r--r--src/devices/bus/c64/dinamic.cpp4
-rw-r--r--src/devices/bus/c64/dinamic.h6
-rw-r--r--src/devices/bus/c64/dqbb.cpp6
-rw-r--r--src/devices/bus/c64/dqbb.h6
-rw-r--r--src/devices/bus/c64/easy_calc_result.cpp6
-rw-r--r--src/devices/bus/c64/easy_calc_result.h6
-rw-r--r--src/devices/bus/c64/easyflash.cpp6
-rw-r--r--src/devices/bus/c64/easyflash.h12
-rw-r--r--src/devices/bus/c64/epyx_fast_load.cpp6
-rw-r--r--src/devices/bus/c64/epyx_fast_load.h6
-rw-r--r--src/devices/bus/c64/exos.cpp4
-rw-r--r--src/devices/bus/c64/exos.h4
-rw-r--r--src/devices/bus/c64/exp.cpp10
-rw-r--r--src/devices/bus/c64/exp.h16
-rw-r--r--src/devices/bus/c64/fcc.cpp6
-rw-r--r--src/devices/bus/c64/fcc.h8
-rw-r--r--src/devices/bus/c64/final.cpp6
-rw-r--r--src/devices/bus/c64/final.h6
-rw-r--r--src/devices/bus/c64/final3.cpp6
-rw-r--r--src/devices/bus/c64/final3.h8
-rw-r--r--src/devices/bus/c64/fun_play.cpp6
-rw-r--r--src/devices/bus/c64/fun_play.h8
-rw-r--r--src/devices/bus/c64/geocable.cpp2
-rw-r--r--src/devices/bus/c64/geocable.h2
-rw-r--r--src/devices/bus/c64/georam.cpp6
-rw-r--r--src/devices/bus/c64/georam.h10
-rw-r--r--src/devices/bus/c64/ide64.cpp10
-rw-r--r--src/devices/bus/c64/ide64.h12
-rw-r--r--src/devices/bus/c64/ieee488.cpp10
-rw-r--r--src/devices/bus/c64/ieee488.h6
-rw-r--r--src/devices/bus/c64/kingsoft.cpp6
-rw-r--r--src/devices/bus/c64/kingsoft.h6
-rw-r--r--src/devices/bus/c64/mach5.cpp6
-rw-r--r--src/devices/bus/c64/mach5.h6
-rw-r--r--src/devices/bus/c64/magic_desk.cpp6
-rw-r--r--src/devices/bus/c64/magic_desk.h8
-rw-r--r--src/devices/bus/c64/magic_formel.cpp8
-rw-r--r--src/devices/bus/c64/magic_formel.h12
-rw-r--r--src/devices/bus/c64/magic_voice.cpp10
-rw-r--r--src/devices/bus/c64/magic_voice.h12
-rw-r--r--src/devices/bus/c64/midi_maplin.cpp6
-rw-r--r--src/devices/bus/c64/midi_maplin.h6
-rw-r--r--src/devices/bus/c64/midi_namesoft.cpp6
-rw-r--r--src/devices/bus/c64/midi_namesoft.h6
-rw-r--r--src/devices/bus/c64/midi_passport.cpp6
-rw-r--r--src/devices/bus/c64/midi_passport.h6
-rw-r--r--src/devices/bus/c64/midi_sci.cpp6
-rw-r--r--src/devices/bus/c64/midi_sci.h6
-rw-r--r--src/devices/bus/c64/midi_siel.cpp6
-rw-r--r--src/devices/bus/c64/midi_siel.h6
-rw-r--r--src/devices/bus/c64/mikro_assembler.cpp4
-rw-r--r--src/devices/bus/c64/mikro_assembler.h4
-rw-r--r--src/devices/bus/c64/multiscreen.cpp6
-rw-r--r--src/devices/bus/c64/multiscreen.h8
-rw-r--r--src/devices/bus/c64/music64.cpp6
-rw-r--r--src/devices/bus/c64/music64.h6
-rw-r--r--src/devices/bus/c64/neoram.cpp6
-rw-r--r--src/devices/bus/c64/neoram.h8
-rw-r--r--src/devices/bus/c64/ocean.cpp6
-rw-r--r--src/devices/bus/c64/ocean.h8
-rw-r--r--src/devices/bus/c64/pagefox.cpp6
-rw-r--r--src/devices/bus/c64/pagefox.h10
-rw-r--r--src/devices/bus/c64/partner.cpp6
-rw-r--r--src/devices/bus/c64/partner.h8
-rw-r--r--src/devices/bus/c64/prophet64.cpp6
-rw-r--r--src/devices/bus/c64/prophet64.h8
-rw-r--r--src/devices/bus/c64/ps64.cpp6
-rw-r--r--src/devices/bus/c64/ps64.h6
-rw-r--r--src/devices/bus/c64/reu.cpp12
-rw-r--r--src/devices/bus/c64/reu.h14
-rw-r--r--src/devices/bus/c64/rex.cpp4
-rw-r--r--src/devices/bus/c64/rex.h4
-rw-r--r--src/devices/bus/c64/rex_ep256.cpp6
-rw-r--r--src/devices/bus/c64/rex_ep256.h8
-rw-r--r--src/devices/bus/c64/ross.cpp6
-rw-r--r--src/devices/bus/c64/ross.h8
-rw-r--r--src/devices/bus/c64/sfx_sound_expander.cpp6
-rw-r--r--src/devices/bus/c64/sfx_sound_expander.h6
-rw-r--r--src/devices/bus/c64/silverrock.cpp6
-rw-r--r--src/devices/bus/c64/silverrock.h8
-rw-r--r--src/devices/bus/c64/simons_basic.cpp6
-rw-r--r--src/devices/bus/c64/simons_basic.h6
-rw-r--r--src/devices/bus/c64/stardos.cpp6
-rw-r--r--src/devices/bus/c64/stardos.h6
-rw-r--r--src/devices/bus/c64/std.cpp4
-rw-r--r--src/devices/bus/c64/std.h4
-rw-r--r--src/devices/bus/c64/structured_basic.cpp6
-rw-r--r--src/devices/bus/c64/structured_basic.h8
-rw-r--r--src/devices/bus/c64/super_explode.cpp6
-rw-r--r--src/devices/bus/c64/super_explode.h8
-rw-r--r--src/devices/bus/c64/super_games.cpp6
-rw-r--r--src/devices/bus/c64/super_games.h8
-rw-r--r--src/devices/bus/c64/supercpu.cpp6
-rw-r--r--src/devices/bus/c64/supercpu.h10
-rw-r--r--src/devices/bus/c64/sw8k.cpp4
-rw-r--r--src/devices/bus/c64/sw8k.h4
-rw-r--r--src/devices/bus/c64/swiftlink.cpp6
-rw-r--r--src/devices/bus/c64/swiftlink.h6
-rw-r--r--src/devices/bus/c64/system3.cpp6
-rw-r--r--src/devices/bus/c64/system3.h8
-rw-r--r--src/devices/bus/c64/tdos.cpp6
-rw-r--r--src/devices/bus/c64/tdos.h6
-rw-r--r--src/devices/bus/c64/turbo232.cpp6
-rw-r--r--src/devices/bus/c64/turbo232.h8
-rw-r--r--src/devices/bus/c64/vizastar.cpp4
-rw-r--r--src/devices/bus/c64/vizastar.h4
-rw-r--r--src/devices/bus/c64/vw64.cpp4
-rw-r--r--src/devices/bus/c64/vw64.h4
-rw-r--r--src/devices/bus/c64/warp_speed.cpp6
-rw-r--r--src/devices/bus/c64/warp_speed.h6
-rw-r--r--src/devices/bus/c64/westermann.cpp4
-rw-r--r--src/devices/bus/c64/westermann.h4
-rw-r--r--src/devices/bus/c64/xl80.cpp12
-rw-r--r--src/devices/bus/c64/xl80.h8
-rw-r--r--src/devices/bus/c64/zaxxon.cpp4
-rw-r--r--src/devices/bus/c64/zaxxon.h4
-rw-r--r--src/devices/bus/cbm2/24k.cpp6
-rw-r--r--src/devices/bus/cbm2/24k.h8
-rw-r--r--src/devices/bus/cbm2/exp.cpp6
-rw-r--r--src/devices/bus/cbm2/exp.h16
-rw-r--r--src/devices/bus/cbm2/hrg.cpp10
-rw-r--r--src/devices/bus/cbm2/hrg.h10
-rw-r--r--src/devices/bus/cbm2/std.cpp4
-rw-r--r--src/devices/bus/cbm2/std.h4
-rw-r--r--src/devices/bus/cbm2/user.cpp2
-rw-r--r--src/devices/bus/cbm2/user.h14
-rw-r--r--src/devices/bus/cbmiec/c1526.cpp6
-rw-r--r--src/devices/bus/cbmiec/c1526.h6
-rw-r--r--src/devices/bus/cbmiec/c1541.cpp36
-rw-r--r--src/devices/bus/cbmiec/c1541.h28
-rw-r--r--src/devices/bus/cbmiec/c1571.cpp24
-rw-r--r--src/devices/bus/cbmiec/c1571.h12
-rw-r--r--src/devices/bus/cbmiec/c1581.cpp10
-rw-r--r--src/devices/bus/cbmiec/c1581.h6
-rw-r--r--src/devices/bus/cbmiec/c64_nl10.cpp2
-rw-r--r--src/devices/bus/cbmiec/c64_nl10.h2
-rw-r--r--src/devices/bus/cbmiec/cbmiec.cpp4
-rw-r--r--src/devices/bus/cbmiec/cbmiec.h4
-rw-r--r--src/devices/bus/cbmiec/cmdhd.cpp2
-rw-r--r--src/devices/bus/cbmiec/cmdhd.h2
-rw-r--r--src/devices/bus/cbmiec/diag264_lb_iec.cpp2
-rw-r--r--src/devices/bus/cbmiec/diag264_lb_iec.h2
-rw-r--r--src/devices/bus/cbmiec/fd2000.cpp8
-rw-r--r--src/devices/bus/cbmiec/fd2000.h6
-rw-r--r--src/devices/bus/cbmiec/interpod.cpp2
-rw-r--r--src/devices/bus/cbmiec/interpod.h2
-rw-r--r--src/devices/bus/cbmiec/serialbox.cpp2
-rw-r--r--src/devices/bus/cbmiec/serialbox.h2
-rw-r--r--src/devices/bus/cbmiec/vic1515.cpp2
-rw-r--r--src/devices/bus/cbmiec/vic1515.h2
-rw-r--r--src/devices/bus/cbmiec/vic1520.cpp2
-rw-r--r--src/devices/bus/cbmiec/vic1520.h2
-rw-r--r--src/devices/bus/centronics/comxpl80.cpp2
-rw-r--r--src/devices/bus/centronics/comxpl80.h14
-rw-r--r--src/devices/bus/centronics/covox.cpp4
-rw-r--r--src/devices/bus/centronics/covox.h8
-rw-r--r--src/devices/bus/centronics/ctronics.cpp2
-rw-r--r--src/devices/bus/centronics/ctronics.h2
-rw-r--r--src/devices/bus/centronics/digiblst.cpp2
-rw-r--r--src/devices/bus/centronics/digiblst.h4
-rw-r--r--src/devices/bus/centronics/dsjoy.cpp2
-rw-r--r--src/devices/bus/centronics/dsjoy.h4
-rw-r--r--src/devices/bus/centronics/epson_ex800.cpp2
-rw-r--r--src/devices/bus/centronics/epson_ex800.h2
-rw-r--r--src/devices/bus/centronics/epson_lx800.cpp8
-rw-r--r--src/devices/bus/centronics/epson_lx800.h4
-rw-r--r--src/devices/bus/centronics/epson_lx810l.cpp32
-rw-r--r--src/devices/bus/centronics/epson_lx810l.h12
-rw-r--r--src/devices/bus/centronics/nec_p72.cpp4
-rw-r--r--src/devices/bus/centronics/nec_p72.h4
-rw-r--r--src/devices/bus/centronics/printer.cpp2
-rw-r--r--src/devices/bus/centronics/printer.h4
-rw-r--r--src/devices/bus/cgenie/expansion/expansion.cpp2
-rw-r--r--src/devices/bus/cgenie/expansion/expansion.h2
-rw-r--r--src/devices/bus/cgenie/expansion/floppy.cpp6
-rw-r--r--src/devices/bus/cgenie/expansion/floppy.h4
-rw-r--r--src/devices/bus/cgenie/parallel/joystick.cpp8
-rw-r--r--src/devices/bus/cgenie/parallel/joystick.h8
-rw-r--r--src/devices/bus/cgenie/parallel/parallel.cpp2
-rw-r--r--src/devices/bus/cgenie/parallel/parallel.h10
-rw-r--r--src/devices/bus/cgenie/parallel/printer.cpp10
-rw-r--r--src/devices/bus/cgenie/parallel/printer.h8
-rw-r--r--src/devices/bus/chanf/rom.cpp24
-rw-r--r--src/devices/bus/chanf/rom.h26
-rw-r--r--src/devices/bus/chanf/slot.cpp10
-rw-r--r--src/devices/bus/chanf/slot.h20
-rw-r--r--src/devices/bus/coco/coco_232.cpp4
-rw-r--r--src/devices/bus/coco/coco_232.h2
-rw-r--r--src/devices/bus/coco/coco_dwsock.cpp4
-rw-r--r--src/devices/bus/coco/coco_dwsock.h2
-rw-r--r--src/devices/bus/coco/coco_fdc.cpp24
-rw-r--r--src/devices/bus/coco/coco_fdc.h10
-rw-r--r--src/devices/bus/coco/coco_multi.cpp8
-rw-r--r--src/devices/bus/coco/coco_multi.h8
-rw-r--r--src/devices/bus/coco/coco_orch90.cpp2
-rw-r--r--src/devices/bus/coco/coco_orch90.h2
-rw-r--r--src/devices/bus/coco/coco_pak.cpp18
-rw-r--r--src/devices/bus/coco/coco_pak.h10
-rw-r--r--src/devices/bus/coco/cococart.cpp8
-rw-r--r--src/devices/bus/coco/cococart.h8
-rw-r--r--src/devices/bus/coco/dragon_fdc.cpp14
-rw-r--r--src/devices/bus/coleco/ctrl.cpp2
-rw-r--r--src/devices/bus/coleco/ctrl.h6
-rw-r--r--src/devices/bus/coleco/exp.cpp6
-rw-r--r--src/devices/bus/coleco/exp.h8
-rw-r--r--src/devices/bus/coleco/hand.cpp10
-rw-r--r--src/devices/bus/coleco/hand.h4
-rw-r--r--src/devices/bus/coleco/sac.cpp10
-rw-r--r--src/devices/bus/coleco/sac.h4
-rw-r--r--src/devices/bus/coleco/std.cpp4
-rw-r--r--src/devices/bus/coleco/std.h4
-rw-r--r--src/devices/bus/coleco/xin1.cpp4
-rw-r--r--src/devices/bus/coleco/xin1.h6
-rw-r--r--src/devices/bus/compis/graphics.cpp2
-rw-r--r--src/devices/bus/compis/graphics.h22
-rw-r--r--src/devices/bus/compis/hrg.cpp16
-rw-r--r--src/devices/bus/compis/hrg.h14
-rw-r--r--src/devices/bus/compucolor/floppy.cpp8
-rw-r--r--src/devices/bus/compucolor/floppy.h12
-rw-r--r--src/devices/bus/comx35/clm.cpp14
-rw-r--r--src/devices/bus/comx35/clm.h8
-rw-r--r--src/devices/bus/comx35/eprom.cpp8
-rw-r--r--src/devices/bus/comx35/eprom.h8
-rw-r--r--src/devices/bus/comx35/exp.cpp14
-rw-r--r--src/devices/bus/comx35/exp.h18
-rw-r--r--src/devices/bus/comx35/expbox.cpp14
-rw-r--r--src/devices/bus/comx35/expbox.h12
-rw-r--r--src/devices/bus/comx35/fdc.cpp12
-rw-r--r--src/devices/bus/comx35/fdc.h8
-rw-r--r--src/devices/bus/comx35/joycard.cpp6
-rw-r--r--src/devices/bus/comx35/joycard.h4
-rw-r--r--src/devices/bus/comx35/printer.cpp10
-rw-r--r--src/devices/bus/comx35/printer.h8
-rw-r--r--src/devices/bus/comx35/ram.cpp10
-rw-r--r--src/devices/bus/comx35/ram.h10
-rw-r--r--src/devices/bus/comx35/thermal.cpp10
-rw-r--r--src/devices/bus/comx35/thermal.h8
-rw-r--r--src/devices/bus/cpc/amdrum.cpp2
-rw-r--r--src/devices/bus/cpc/amdrum.h2
-rw-r--r--src/devices/bus/cpc/brunword4.cpp8
-rw-r--r--src/devices/bus/cpc/brunword4.h6
-rw-r--r--src/devices/bus/cpc/cpc_pds.cpp2
-rw-r--r--src/devices/bus/cpc/cpc_pds.h2
-rw-r--r--src/devices/bus/cpc/cpc_rom.cpp8
-rw-r--r--src/devices/bus/cpc/cpc_rom.h10
-rw-r--r--src/devices/bus/cpc/cpc_rs232.cpp6
-rw-r--r--src/devices/bus/cpc/cpc_rs232.h6
-rw-r--r--src/devices/bus/cpc/cpc_ssa1.cpp8
-rw-r--r--src/devices/bus/cpc/cpc_ssa1.h32
-rw-r--r--src/devices/bus/cpc/cpcexp.cpp2
-rw-r--r--src/devices/bus/cpc/cpcexp.h14
-rw-r--r--src/devices/bus/cpc/ddi1.cpp8
-rw-r--r--src/devices/bus/cpc/ddi1.h4
-rw-r--r--src/devices/bus/cpc/doubler.cpp4
-rw-r--r--src/devices/bus/cpc/doubler.h2
-rw-r--r--src/devices/bus/cpc/hd20.cpp4
-rw-r--r--src/devices/bus/cpc/hd20.h2
-rw-r--r--src/devices/bus/cpc/magicsound.cpp10
-rw-r--r--src/devices/bus/cpc/magicsound.h12
-rw-r--r--src/devices/bus/cpc/mface2.cpp6
-rw-r--r--src/devices/bus/cpc/mface2.h8
-rw-r--r--src/devices/bus/cpc/playcity.cpp6
-rw-r--r--src/devices/bus/cpc/playcity.h2
-rw-r--r--src/devices/bus/cpc/smartwatch.cpp6
-rw-r--r--src/devices/bus/cpc/smartwatch.h2
-rw-r--r--src/devices/bus/cpc/symbfac2.cpp14
-rw-r--r--src/devices/bus/cpc/symbfac2.h20
-rw-r--r--src/devices/bus/cpc/transtape.cpp8
-rw-r--r--src/devices/bus/cpc/transtape.h8
-rw-r--r--src/devices/bus/crvision/rom.cpp16
-rw-r--r--src/devices/bus/crvision/rom.h16
-rw-r--r--src/devices/bus/crvision/slot.cpp8
-rw-r--r--src/devices/bus/crvision/slot.h12
-rw-r--r--src/devices/bus/dmv/dmvbus.cpp14
-rw-r--r--src/devices/bus/dmv/dmvbus.h26
-rw-r--r--src/devices/bus/dmv/k210.cpp6
-rw-r--r--src/devices/bus/dmv/k210.h10
-rw-r--r--src/devices/bus/dmv/k220.cpp8
-rw-r--r--src/devices/bus/dmv/k220.h8
-rw-r--r--src/devices/bus/dmv/k230.cpp10
-rw-r--r--src/devices/bus/dmv/k230.h10
-rw-r--r--src/devices/bus/dmv/k233.cpp8
-rw-r--r--src/devices/bus/dmv/k233.h10
-rw-r--r--src/devices/bus/dmv/k801.cpp28
-rw-r--r--src/devices/bus/dmv/k801.h20
-rw-r--r--src/devices/bus/dmv/k803.cpp10
-rw-r--r--src/devices/bus/dmv/k803.h8
-rw-r--r--src/devices/bus/dmv/k806.cpp12
-rw-r--r--src/devices/bus/dmv/k806.h6
-rw-r--r--src/devices/bus/dmv/ram.cpp12
-rw-r--r--src/devices/bus/dmv/ram.h16
-rw-r--r--src/devices/bus/ecbbus/ecbbus.cpp8
-rw-r--r--src/devices/bus/ecbbus/ecbbus.h12
-rw-r--r--src/devices/bus/ecbbus/grip.cpp22
-rw-r--r--src/devices/bus/ecbbus/grip.h16
-rw-r--r--src/devices/bus/econet/e01.cpp10
-rw-r--r--src/devices/bus/econet/e01.h6
-rw-r--r--src/devices/bus/econet/econet.cpp4
-rw-r--r--src/devices/bus/econet/econet.h8
-rw-r--r--src/devices/bus/electron/exp.cpp2
-rw-r--r--src/devices/bus/electron/exp.h2
-rw-r--r--src/devices/bus/electron/m2105.cpp2
-rw-r--r--src/devices/bus/electron/m2105.h2
-rw-r--r--src/devices/bus/electron/plus3.cpp2
-rw-r--r--src/devices/bus/electron/plus3.h2
-rw-r--r--src/devices/bus/ep64/exdos.cpp4
-rw-r--r--src/devices/bus/ep64/exdos.h2
-rw-r--r--src/devices/bus/ep64/exp.cpp2
-rw-r--r--src/devices/bus/ep64/exp.h2
-rw-r--r--src/devices/bus/epson_sio/epson_sio.cpp2
-rw-r--r--src/devices/bus/epson_sio/epson_sio.h2
-rw-r--r--src/devices/bus/epson_sio/pf10.cpp2
-rw-r--r--src/devices/bus/epson_sio/pf10.h6
-rw-r--r--src/devices/bus/epson_sio/tf20.cpp2
-rw-r--r--src/devices/bus/epson_sio/tf20.h2
-rw-r--r--src/devices/bus/gameboy/gb_slot.cpp40
-rw-r--r--src/devices/bus/gameboy/gb_slot.h46
-rw-r--r--src/devices/bus/gameboy/mbc.cpp64
-rw-r--r--src/devices/bus/gameboy/mbc.h90
-rw-r--r--src/devices/bus/gameboy/rom.cpp18
-rw-r--r--src/devices/bus/gameboy/rom.h24
-rw-r--r--src/devices/bus/gamegear/ggext.cpp10
-rw-r--r--src/devices/bus/gamegear/ggext.h12
-rw-r--r--src/devices/bus/gamegear/smsctrladp.cpp6
-rw-r--r--src/devices/bus/gamegear/smsctrladp.h6
-rw-r--r--src/devices/bus/gba/gba_slot.cpp36
-rw-r--r--src/devices/bus/gba/gba_slot.h38
-rw-r--r--src/devices/bus/gba/rom.cpp80
-rw-r--r--src/devices/bus/gba/rom.h100
-rw-r--r--src/devices/bus/generic/ram.cpp16
-rw-r--r--src/devices/bus/generic/ram.h20
-rw-r--r--src/devices/bus/generic/rom.cpp18
-rw-r--r--src/devices/bus/generic/rom.h10
-rw-r--r--src/devices/bus/generic/slot.cpp10
-rw-r--r--src/devices/bus/generic/slot.h34
-rw-r--r--src/devices/bus/hp9845_io/98035.cpp32
-rw-r--r--src/devices/bus/hp9845_io/98035.h44
-rw-r--r--src/devices/bus/hp9845_io/hp9845_io.cpp4
-rw-r--r--src/devices/bus/hp9845_io/hp9845_io.h6
-rw-r--r--src/devices/bus/hp_optroms/hp_optrom.cpp8
-rw-r--r--src/devices/bus/hp_optroms/hp_optrom.h8
-rw-r--r--src/devices/bus/ieee488/c2031.cpp6
-rw-r--r--src/devices/bus/ieee488/c2031.h2
-rw-r--r--src/devices/bus/ieee488/c2040.cpp12
-rw-r--r--src/devices/bus/ieee488/c2040.h8
-rw-r--r--src/devices/bus/ieee488/c2040fdc.cpp6
-rw-r--r--src/devices/bus/ieee488/c2040fdc.h12
-rw-r--r--src/devices/bus/ieee488/c8050.cpp14
-rw-r--r--src/devices/bus/ieee488/c8050.h10
-rw-r--r--src/devices/bus/ieee488/c8050fdc.cpp4
-rw-r--r--src/devices/bus/ieee488/c8050fdc.h12
-rw-r--r--src/devices/bus/ieee488/c8280.cpp8
-rw-r--r--src/devices/bus/ieee488/c8280.h4
-rw-r--r--src/devices/bus/ieee488/d9060.cpp10
-rw-r--r--src/devices/bus/ieee488/d9060.h8
-rw-r--r--src/devices/bus/ieee488/hardbox.cpp10
-rw-r--r--src/devices/bus/ieee488/hardbox.h2
-rw-r--r--src/devices/bus/ieee488/ieee488.cpp10
-rw-r--r--src/devices/bus/ieee488/ieee488.h18
-rw-r--r--src/devices/bus/ieee488/shark.cpp2
-rw-r--r--src/devices/bus/ieee488/shark.h2
-rw-r--r--src/devices/bus/ieee488/softbox.cpp8
-rw-r--r--src/devices/bus/ieee488/softbox.h2
-rw-r--r--src/devices/bus/imi7000/imi5000h.cpp2
-rw-r--r--src/devices/bus/imi7000/imi5000h.h2
-rw-r--r--src/devices/bus/imi7000/imi7000.cpp4
-rw-r--r--src/devices/bus/imi7000/imi7000.h4
-rw-r--r--src/devices/bus/intv/ecs.cpp2
-rw-r--r--src/devices/bus/intv/ecs.h2
-rw-r--r--src/devices/bus/intv/rom.cpp10
-rw-r--r--src/devices/bus/intv/rom.h10
-rw-r--r--src/devices/bus/intv/slot.cpp40
-rw-r--r--src/devices/bus/intv/slot.h22
-rw-r--r--src/devices/bus/intv/voice.cpp2
-rw-r--r--src/devices/bus/intv/voice.h2
-rw-r--r--src/devices/bus/intv_ctrl/ctrl.cpp6
-rw-r--r--src/devices/bus/intv_ctrl/ctrl.h6
-rw-r--r--src/devices/bus/intv_ctrl/ecs_ctrl.cpp34
-rw-r--r--src/devices/bus/intv_ctrl/ecs_ctrl.h36
-rw-r--r--src/devices/bus/intv_ctrl/handctrl.cpp12
-rw-r--r--src/devices/bus/intv_ctrl/handctrl.h4
-rw-r--r--src/devices/bus/iq151/disc2.cpp10
-rw-r--r--src/devices/bus/iq151/disc2.h10
-rw-r--r--src/devices/bus/iq151/grafik.cpp6
-rw-r--r--src/devices/bus/iq151/grafik.h24
-rw-r--r--src/devices/bus/iq151/iq151.cpp12
-rw-r--r--src/devices/bus/iq151/iq151.h20
-rw-r--r--src/devices/bus/iq151/minigraf.cpp20
-rw-r--r--src/devices/bus/iq151/minigraf.h20
-rw-r--r--src/devices/bus/iq151/ms151a.cpp14
-rw-r--r--src/devices/bus/iq151/ms151a.h20
-rw-r--r--src/devices/bus/iq151/rom.cpp32
-rw-r--r--src/devices/bus/iq151/rom.h32
-rw-r--r--src/devices/bus/iq151/staper.cpp6
-rw-r--r--src/devices/bus/iq151/staper.h8
-rw-r--r--src/devices/bus/iq151/video32.cpp18
-rw-r--r--src/devices/bus/iq151/video32.h10
-rw-r--r--src/devices/bus/iq151/video64.cpp20
-rw-r--r--src/devices/bus/iq151/video64.h12
-rw-r--r--src/devices/bus/isa/3c503.cpp12
-rw-r--r--src/devices/bus/isa/3c503.h44
-rw-r--r--src/devices/bus/isa/3c505.cpp70
-rw-r--r--src/devices/bus/isa/3c505.h116
-rw-r--r--src/devices/bus/isa/adlib.cpp4
-rw-r--r--src/devices/bus/isa/adlib.h2
-rw-r--r--src/devices/bus/isa/aga.cpp152
-rw-r--r--src/devices/bus/isa/aga.h34
-rw-r--r--src/devices/bus/isa/aha1542.cpp2
-rw-r--r--src/devices/bus/isa/aha1542.h2
-rw-r--r--src/devices/bus/isa/cga.cpp226
-rw-r--r--src/devices/bus/isa/cga.h76
-rw-r--r--src/devices/bus/isa/com.cpp6
-rw-r--r--src/devices/bus/isa/com.h6
-rw-r--r--src/devices/bus/isa/dectalk.cpp2
-rw-r--r--src/devices/bus/isa/dectalk.h6
-rw-r--r--src/devices/bus/isa/ega.cpp76
-rw-r--r--src/devices/bus/isa/ega.h44
-rw-r--r--src/devices/bus/isa/fdc.cpp16
-rw-r--r--src/devices/bus/isa/fdc.h16
-rw-r--r--src/devices/bus/isa/finalchs.cpp2
-rw-r--r--src/devices/bus/isa/finalchs.h4
-rw-r--r--src/devices/bus/isa/gblaster.cpp2
-rw-r--r--src/devices/bus/isa/gblaster.h4
-rw-r--r--src/devices/bus/isa/gus.cpp52
-rw-r--r--src/devices/bus/isa/gus.h152
-rw-r--r--src/devices/bus/isa/hdc.cpp32
-rw-r--r--src/devices/bus/isa/hdc.h40
-rw-r--r--src/devices/bus/isa/ibm_mfc.cpp4
-rw-r--r--src/devices/bus/isa/ibm_mfc.h12
-rw-r--r--src/devices/bus/isa/ide.cpp2
-rw-r--r--src/devices/bus/isa/ide.h2
-rw-r--r--src/devices/bus/isa/isa.cpp40
-rw-r--r--src/devices/bus/isa/isa.h34
-rw-r--r--src/devices/bus/isa/lpt.cpp2
-rw-r--r--src/devices/bus/isa/lpt.h2
-rw-r--r--src/devices/bus/isa/mach32.cpp16
-rw-r--r--src/devices/bus/isa/mach32.h20
-rw-r--r--src/devices/bus/isa/mc1502_fdc.cpp16
-rw-r--r--src/devices/bus/isa/mc1502_fdc.h10
-rw-r--r--src/devices/bus/isa/mc1502_rom.cpp2
-rw-r--r--src/devices/bus/isa/mc1502_rom.h2
-rw-r--r--src/devices/bus/isa/mcd.cpp18
-rw-r--r--src/devices/bus/isa/mcd.h26
-rw-r--r--src/devices/bus/isa/mda.cpp80
-rw-r--r--src/devices/bus/isa/mda.h24
-rw-r--r--src/devices/bus/isa/mpu401.cpp2
-rw-r--r--src/devices/bus/isa/mpu401.h2
-rw-r--r--src/devices/bus/isa/mufdc.cpp10
-rw-r--r--src/devices/bus/isa/mufdc.h10
-rw-r--r--src/devices/bus/isa/ne1000.cpp4
-rw-r--r--src/devices/bus/isa/ne1000.h8
-rw-r--r--src/devices/bus/isa/ne2000.cpp4
-rw-r--r--src/devices/bus/isa/ne2000.h8
-rw-r--r--src/devices/bus/isa/num9rev.cpp18
-rw-r--r--src/devices/bus/isa/num9rev.h12
-rw-r--r--src/devices/bus/isa/omti8621.cpp122
-rw-r--r--src/devices/bus/isa/omti8621.h74
-rw-r--r--src/devices/bus/isa/p1_fdc.cpp8
-rw-r--r--src/devices/bus/isa/p1_fdc.h6
-rw-r--r--src/devices/bus/isa/p1_hdc.cpp4
-rw-r--r--src/devices/bus/isa/p1_hdc.h4
-rw-r--r--src/devices/bus/isa/p1_rom.cpp2
-rw-r--r--src/devices/bus/isa/p1_rom.h2
-rw-r--r--src/devices/bus/isa/p1_sound.cpp2
-rw-r--r--src/devices/bus/isa/p1_sound.h4
-rw-r--r--src/devices/bus/isa/pc1640_iga.cpp16
-rw-r--r--src/devices/bus/isa/pc1640_iga.h2
-rw-r--r--src/devices/bus/isa/pds.cpp2
-rw-r--r--src/devices/bus/isa/pds.h2
-rw-r--r--src/devices/bus/isa/pgc.cpp20
-rw-r--r--src/devices/bus/isa/pgc.h16
-rw-r--r--src/devices/bus/isa/s3virge.cpp24
-rw-r--r--src/devices/bus/isa/s3virge.h14
-rw-r--r--src/devices/bus/isa/sb16.cpp26
-rw-r--r--src/devices/bus/isa/sb16.h24
-rw-r--r--src/devices/bus/isa/sblaster.cpp64
-rw-r--r--src/devices/bus/isa/sblaster.h140
-rw-r--r--src/devices/bus/isa/sc499.cpp50
-rw-r--r--src/devices/bus/isa/sc499.h74
-rw-r--r--src/devices/bus/isa/side116.cpp10
-rw-r--r--src/devices/bus/isa/side116.h4
-rw-r--r--src/devices/bus/isa/ssi2001.cpp2
-rw-r--r--src/devices/bus/isa/ssi2001.h2
-rw-r--r--src/devices/bus/isa/stereo_fx.cpp8
-rw-r--r--src/devices/bus/isa/stereo_fx.h18
-rw-r--r--src/devices/bus/isa/svga_cirrus.cpp4
-rw-r--r--src/devices/bus/isa/svga_cirrus.h4
-rw-r--r--src/devices/bus/isa/svga_s3.cpp8
-rw-r--r--src/devices/bus/isa/svga_s3.h8
-rw-r--r--src/devices/bus/isa/svga_trident.cpp2
-rw-r--r--src/devices/bus/isa/svga_trident.h2
-rw-r--r--src/devices/bus/isa/svga_tseng.cpp2
-rw-r--r--src/devices/bus/isa/svga_tseng.h2
-rw-r--r--src/devices/bus/isa/trident.cpp102
-rw-r--r--src/devices/bus/isa/trident.h172
-rw-r--r--src/devices/bus/isa/vga.cpp2
-rw-r--r--src/devices/bus/isa/vga.h2
-rw-r--r--src/devices/bus/isa/vga_ati.cpp6
-rw-r--r--src/devices/bus/isa/vga_ati.h6
-rw-r--r--src/devices/bus/isa/wd1002a_wx1.cpp2
-rw-r--r--src/devices/bus/isa/wd1002a_wx1.h2
-rw-r--r--src/devices/bus/isa/wdxt_gen.cpp10
-rw-r--r--src/devices/bus/isa/wdxt_gen.h10
-rw-r--r--src/devices/bus/isa/xtide.cpp8
-rw-r--r--src/devices/bus/isa/xtide.h6
-rw-r--r--src/devices/bus/isbx/compis_fdc.cpp12
-rw-r--r--src/devices/bus/isbx/compis_fdc.h10
-rw-r--r--src/devices/bus/isbx/isbc_218a.cpp18
-rw-r--r--src/devices/bus/isbx/isbc_218a.h14
-rw-r--r--src/devices/bus/isbx/isbx.cpp2
-rw-r--r--src/devices/bus/isbx/isbx.h14
-rw-r--r--src/devices/bus/kc/d002.cpp14
-rw-r--r--src/devices/bus/kc/d002.h10
-rw-r--r--src/devices/bus/kc/d004.cpp30
-rw-r--r--src/devices/bus/kc/d004.h30
-rw-r--r--src/devices/bus/kc/kc.cpp22
-rw-r--r--src/devices/bus/kc/kc.h32
-rw-r--r--src/devices/bus/kc/ram.cpp52
-rw-r--r--src/devices/bus/kc/ram.h82
-rw-r--r--src/devices/bus/kc/rom.cpp22
-rw-r--r--src/devices/bus/kc/rom.h36
-rw-r--r--src/devices/bus/lpci/cirrus.cpp8
-rw-r--r--src/devices/bus/lpci/cirrus.h6
-rw-r--r--src/devices/bus/lpci/i82371ab.cpp40
-rw-r--r--src/devices/bus/lpci/i82371ab.h24
-rw-r--r--src/devices/bus/lpci/i82371sb.cpp24
-rw-r--r--src/devices/bus/lpci/i82371sb.h20
-rw-r--r--src/devices/bus/lpci/i82439tx.cpp10
-rw-r--r--src/devices/bus/lpci/i82439tx.h14
-rw-r--r--src/devices/bus/lpci/mpc105.cpp12
-rw-r--r--src/devices/bus/lpci/mpc105.h10
-rw-r--r--src/devices/bus/lpci/northbridge.cpp2
-rw-r--r--src/devices/bus/lpci/northbridge.h2
-rw-r--r--src/devices/bus/lpci/pci.cpp12
-rw-r--r--src/devices/bus/lpci/pci.h16
-rw-r--r--src/devices/bus/lpci/southbridge.cpp20
-rw-r--r--src/devices/bus/lpci/southbridge.h20
-rw-r--r--src/devices/bus/lpci/vt82c505.cpp8
-rw-r--r--src/devices/bus/lpci/vt82c505.h10
-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.cpp10
-rw-r--r--src/devices/bus/m5/slot.h20
-rw-r--r--src/devices/bus/macpds/macpds.cpp22
-rw-r--r--src/devices/bus/macpds/macpds.h18
-rw-r--r--src/devices/bus/macpds/pds_tpdfpd.cpp12
-rw-r--r--src/devices/bus/macpds/pds_tpdfpd.h12
-rw-r--r--src/devices/bus/megadrive/eeprom.cpp30
-rw-r--r--src/devices/bus/megadrive/eeprom.h48
-rw-r--r--src/devices/bus/megadrive/ggenie.cpp2
-rw-r--r--src/devices/bus/megadrive/ggenie.h8
-rw-r--r--src/devices/bus/megadrive/jcart.cpp14
-rw-r--r--src/devices/bus/megadrive/jcart.h16
-rw-r--r--src/devices/bus/megadrive/md_slot.cpp50
-rw-r--r--src/devices/bus/megadrive/md_slot.h34
-rw-r--r--src/devices/bus/megadrive/rom.cpp80
-rw-r--r--src/devices/bus/megadrive/rom.h108
-rw-r--r--src/devices/bus/megadrive/sk.cpp4
-rw-r--r--src/devices/bus/megadrive/sk.h4
-rw-r--r--src/devices/bus/megadrive/stm95.cpp12
-rw-r--r--src/devices/bus/megadrive/stm95.h10
-rw-r--r--src/devices/bus/megadrive/svp.cpp64
-rw-r--r--src/devices/bus/megadrive/svp.h22
-rw-r--r--src/devices/bus/midi/midi.cpp2
-rw-r--r--src/devices/bus/midi/midi.h2
-rw-r--r--src/devices/bus/midi/midiinport.cpp2
-rw-r--r--src/devices/bus/midi/midiinport.h2
-rw-r--r--src/devices/bus/midi/midioutport.cpp2
-rw-r--r--src/devices/bus/midi/midioutport.h2
-rw-r--r--src/devices/bus/msx_cart/arc.cpp2
-rw-r--r--src/devices/bus/msx_cart/arc.h4
-rw-r--r--src/devices/bus/msx_cart/ascii.cpp44
-rw-r--r--src/devices/bus/msx_cart/ascii.h48
-rw-r--r--src/devices/bus/msx_cart/bm_012.cpp2
-rw-r--r--src/devices/bus/msx_cart/bm_012.h2
-rw-r--r--src/devices/bus/msx_cart/cartridge.cpp8
-rw-r--r--src/devices/bus/msx_cart/cartridge.h34
-rw-r--r--src/devices/bus/msx_cart/crossblaim.cpp4
-rw-r--r--src/devices/bus/msx_cart/crossblaim.h6
-rw-r--r--src/devices/bus/msx_cart/disk.cpp32
-rw-r--r--src/devices/bus/msx_cart/disk.h30
-rw-r--r--src/devices/bus/msx_cart/dooly.cpp4
-rw-r--r--src/devices/bus/msx_cart/dooly.h4
-rw-r--r--src/devices/bus/msx_cart/fmpac.cpp2
-rw-r--r--src/devices/bus/msx_cart/fmpac.h12
-rw-r--r--src/devices/bus/msx_cart/fs_sr022.cpp2
-rw-r--r--src/devices/bus/msx_cart/fs_sr022.h6
-rw-r--r--src/devices/bus/msx_cart/halnote.cpp4
-rw-r--r--src/devices/bus/msx_cart/halnote.h6
-rw-r--r--src/devices/bus/msx_cart/hfox.cpp2
-rw-r--r--src/devices/bus/msx_cart/hfox.h6
-rw-r--r--src/devices/bus/msx_cart/holy_quran.cpp4
-rw-r--r--src/devices/bus/msx_cart/holy_quran.h8
-rw-r--r--src/devices/bus/msx_cart/konami.cpp32
-rw-r--r--src/devices/bus/msx_cart/konami.h46
-rw-r--r--src/devices/bus/msx_cart/korean.cpp28
-rw-r--r--src/devices/bus/msx_cart/korean.h28
-rw-r--r--src/devices/bus/msx_cart/majutsushi.cpp2
-rw-r--r--src/devices/bus/msx_cart/majutsushi.h6
-rw-r--r--src/devices/bus/msx_cart/moonsound.cpp2
-rw-r--r--src/devices/bus/msx_cart/moonsound.h2
-rw-r--r--src/devices/bus/msx_cart/msx_audio.cpp6
-rw-r--r--src/devices/bus/msx_cart/msx_audio.h10
-rw-r--r--src/devices/bus/msx_cart/msx_audio_kb.cpp14
-rw-r--r--src/devices/bus/msx_cart/msx_audio_kb.h2
-rw-r--r--src/devices/bus/msx_cart/msxdos2.cpp2
-rw-r--r--src/devices/bus/msx_cart/msxdos2.h6
-rw-r--r--src/devices/bus/msx_cart/nomapper.cpp12
-rw-r--r--src/devices/bus/msx_cart/nomapper.h6
-rw-r--r--src/devices/bus/msx_cart/rtype.cpp2
-rw-r--r--src/devices/bus/msx_cart/rtype.h6
-rw-r--r--src/devices/bus/msx_cart/super_swangi.cpp2
-rw-r--r--src/devices/bus/msx_cart/super_swangi.h6
-rw-r--r--src/devices/bus/msx_cart/superloderunner.cpp2
-rw-r--r--src/devices/bus/msx_cart/superloderunner.h6
-rw-r--r--src/devices/bus/msx_cart/yamaha.cpp6
-rw-r--r--src/devices/bus/msx_cart/yamaha.h8
-rw-r--r--src/devices/bus/msx_slot/bunsetsu.cpp2
-rw-r--r--src/devices/bus/msx_slot/bunsetsu.h6
-rw-r--r--src/devices/bus/msx_slot/cartridge.cpp22
-rw-r--r--src/devices/bus/msx_slot/cartridge.h8
-rw-r--r--src/devices/bus/msx_slot/disk.cpp34
-rw-r--r--src/devices/bus/msx_slot/disk.h40
-rw-r--r--src/devices/bus/msx_slot/fs4600.cpp4
-rw-r--r--src/devices/bus/msx_slot/fs4600.h18
-rw-r--r--src/devices/bus/msx_slot/music.cpp2
-rw-r--r--src/devices/bus/msx_slot/music.h2
-rw-r--r--src/devices/bus/msx_slot/panasonic08.cpp6
-rw-r--r--src/devices/bus/msx_slot/panasonic08.h16
-rw-r--r--src/devices/bus/msx_slot/ram.cpp2
-rw-r--r--src/devices/bus/msx_slot/ram.h6
-rw-r--r--src/devices/bus/msx_slot/ram_mm.cpp2
-rw-r--r--src/devices/bus/msx_slot/ram_mm.h18
-rw-r--r--src/devices/bus/msx_slot/rom.cpp6
-rw-r--r--src/devices/bus/msx_slot/rom.h10
-rw-r--r--src/devices/bus/msx_slot/slot.cpp4
-rw-r--r--src/devices/bus/msx_slot/slot.h10
-rw-r--r--src/devices/bus/msx_slot/sony08.cpp6
-rw-r--r--src/devices/bus/msx_slot/sony08.h14
-rw-r--r--src/devices/bus/nasbus/avc.cpp2
-rw-r--r--src/devices/bus/nasbus/avc.h10
-rw-r--r--src/devices/bus/nasbus/floppy.cpp4
-rw-r--r--src/devices/bus/nasbus/floppy.h4
-rw-r--r--src/devices/bus/nasbus/nasbus.cpp6
-rw-r--r--src/devices/bus/nasbus/nasbus.h6
-rw-r--r--src/devices/bus/neogeo/boot_cthd.cpp10
-rw-r--r--src/devices/bus/neogeo/boot_cthd.h12
-rw-r--r--src/devices/bus/neogeo/boot_kof10th.cpp12
-rw-r--r--src/devices/bus/neogeo/boot_kof10th.h16
-rw-r--r--src/devices/bus/neogeo/boot_kof2k2.cpp6
-rw-r--r--src/devices/bus/neogeo/boot_kof2k2.h6
-rw-r--r--src/devices/bus/neogeo/boot_kof2k3.cpp6
-rw-r--r--src/devices/bus/neogeo/boot_kof2k3.h12
-rw-r--r--src/devices/bus/neogeo/boot_misc.cpp24
-rw-r--r--src/devices/bus/neogeo/boot_misc.h26
-rw-r--r--src/devices/bus/neogeo/boot_svc.cpp8
-rw-r--r--src/devices/bus/neogeo/boot_svc.h12
-rw-r--r--src/devices/bus/neogeo/cmc.cpp28
-rw-r--r--src/devices/bus/neogeo/cmc.h30
-rw-r--r--src/devices/bus/neogeo/fatfury2.cpp2
-rw-r--r--src/devices/bus/neogeo/fatfury2.h2
-rw-r--r--src/devices/bus/neogeo/kof2k2.cpp14
-rw-r--r--src/devices/bus/neogeo/kof2k2.h14
-rw-r--r--src/devices/bus/neogeo/kof98.cpp2
-rw-r--r--src/devices/bus/neogeo/kof98.h2
-rw-r--r--src/devices/bus/neogeo/mslugx.cpp2
-rw-r--r--src/devices/bus/neogeo/mslugx.h2
-rw-r--r--src/devices/bus/neogeo/pcm2.cpp12
-rw-r--r--src/devices/bus/neogeo/pcm2.h12
-rw-r--r--src/devices/bus/neogeo/prot_cmc.cpp90
-rw-r--r--src/devices/bus/neogeo/prot_cmc.h48
-rw-r--r--src/devices/bus/neogeo/prot_cthd.cpp52
-rw-r--r--src/devices/bus/neogeo/prot_cthd.h24
-rw-r--r--src/devices/bus/neogeo/prot_fatfury2.cpp4
-rw-r--r--src/devices/bus/neogeo/prot_fatfury2.h4
-rw-r--r--src/devices/bus/neogeo/prot_kof2k2.cpp26
-rw-r--r--src/devices/bus/neogeo/prot_kof2k2.h10
-rw-r--r--src/devices/bus/neogeo/prot_kof2k3bl.cpp38
-rw-r--r--src/devices/bus/neogeo/prot_kof2k3bl.h16
-rw-r--r--src/devices/bus/neogeo/prot_kof98.cpp14
-rw-r--r--src/devices/bus/neogeo/prot_kof98.h6
-rw-r--r--src/devices/bus/neogeo/prot_misc.cpp156
-rw-r--r--src/devices/bus/neogeo/prot_misc.h52
-rw-r--r--src/devices/bus/neogeo/prot_mslugx.cpp6
-rw-r--r--src/devices/bus/neogeo/prot_mslugx.h6
-rw-r--r--src/devices/bus/neogeo/prot_pcm2.cpp18
-rw-r--r--src/devices/bus/neogeo/prot_pcm2.h6
-rw-r--r--src/devices/bus/neogeo/prot_pvc.cpp70
-rw-r--r--src/devices/bus/neogeo/prot_pvc.h16
-rw-r--r--src/devices/bus/neogeo/prot_sma.cpp62
-rw-r--r--src/devices/bus/neogeo/prot_sma.h24
-rw-r--r--src/devices/bus/neogeo/pvc.cpp12
-rw-r--r--src/devices/bus/neogeo/pvc.h14
-rw-r--r--src/devices/bus/neogeo/rom.cpp8
-rw-r--r--src/devices/bus/neogeo/rom.h8
-rw-r--r--src/devices/bus/neogeo/sbp.cpp12
-rw-r--r--src/devices/bus/neogeo/sbp.h4
-rw-r--r--src/devices/bus/neogeo/slot.cpp26
-rw-r--r--src/devices/bus/neogeo/slot.h154
-rw-r--r--src/devices/bus/neogeo/sma.cpp14
-rw-r--r--src/devices/bus/neogeo/sma.h26
-rw-r--r--src/devices/bus/neogeo_ctrl/ctrl.cpp24
-rw-r--r--src/devices/bus/neogeo_ctrl/ctrl.h24
-rw-r--r--src/devices/bus/neogeo_ctrl/dial.cpp8
-rw-r--r--src/devices/bus/neogeo_ctrl/dial.h6
-rw-r--r--src/devices/bus/neogeo_ctrl/irrmaze.cpp6
-rw-r--r--src/devices/bus/neogeo_ctrl/irrmaze.h6
-rw-r--r--src/devices/bus/neogeo_ctrl/joystick.cpp8
-rw-r--r--src/devices/bus/neogeo_ctrl/joystick.h8
-rw-r--r--src/devices/bus/neogeo_ctrl/kizuna4p.cpp10
-rw-r--r--src/devices/bus/neogeo_ctrl/kizuna4p.h8
-rw-r--r--src/devices/bus/neogeo_ctrl/mahjong.cpp14
-rw-r--r--src/devices/bus/neogeo_ctrl/mahjong.h14
-rw-r--r--src/devices/bus/nes/2a03pur.cpp2
-rw-r--r--src/devices/bus/nes/2a03pur.h4
-rw-r--r--src/devices/bus/nes/act53.cpp10
-rw-r--r--src/devices/bus/nes/act53.h6
-rw-r--r--src/devices/bus/nes/aladdin.cpp34
-rw-r--r--src/devices/bus/nes/aladdin.h32
-rw-r--r--src/devices/bus/nes/ave.cpp6
-rw-r--r--src/devices/bus/nes/ave.h8
-rw-r--r--src/devices/bus/nes/bandai.cpp20
-rw-r--r--src/devices/bus/nes/bandai.h26
-rw-r--r--src/devices/bus/nes/benshieng.cpp4
-rw-r--r--src/devices/bus/nes/benshieng.h8
-rw-r--r--src/devices/bus/nes/bootleg.cpp50
-rw-r--r--src/devices/bus/nes/bootleg.h88
-rw-r--r--src/devices/bus/nes/camerica.cpp6
-rw-r--r--src/devices/bus/nes/camerica.h10
-rw-r--r--src/devices/bus/nes/cne.cpp6
-rw-r--r--src/devices/bus/nes/cne.h6
-rw-r--r--src/devices/bus/nes/cony.cpp6
-rw-r--r--src/devices/bus/nes/cony.h18
-rw-r--r--src/devices/bus/nes/datach.cpp22
-rw-r--r--src/devices/bus/nes/datach.h28
-rw-r--r--src/devices/bus/nes/discrete.cpp8
-rw-r--r--src/devices/bus/nes/discrete.h8
-rw-r--r--src/devices/bus/nes/disksys.cpp8
-rw-r--r--src/devices/bus/nes/disksys.h24
-rw-r--r--src/devices/bus/nes/event.cpp4
-rw-r--r--src/devices/bus/nes/event.h4
-rw-r--r--src/devices/bus/nes/ggenie.cpp6
-rw-r--r--src/devices/bus/nes/ggenie.h10
-rw-r--r--src/devices/bus/nes/henggedianzi.cpp12
-rw-r--r--src/devices/bus/nes/henggedianzi.h14
-rw-r--r--src/devices/bus/nes/hes.cpp2
-rw-r--r--src/devices/bus/nes/hes.h2
-rw-r--r--src/devices/bus/nes/hosenkan.cpp2
-rw-r--r--src/devices/bus/nes/hosenkan.h8
-rw-r--r--src/devices/bus/nes/irem.cpp10
-rw-r--r--src/devices/bus/nes/irem.h14
-rw-r--r--src/devices/bus/nes/jaleco.cpp36
-rw-r--r--src/devices/bus/nes/jaleco.h46
-rw-r--r--src/devices/bus/nes/jy.cpp22
-rw-r--r--src/devices/bus/nes/jy.h42
-rw-r--r--src/devices/bus/nes/kaiser.cpp24
-rw-r--r--src/devices/bus/nes/kaiser.h44
-rw-r--r--src/devices/bus/nes/karastudio.cpp12
-rw-r--r--src/devices/bus/nes/karastudio.h18
-rw-r--r--src/devices/bus/nes/konami.cpp28
-rw-r--r--src/devices/bus/nes/konami.h28
-rw-r--r--src/devices/bus/nes/legacy.cpp8
-rw-r--r--src/devices/bus/nes/legacy.h14
-rw-r--r--src/devices/bus/nes/mmc1.cpp30
-rw-r--r--src/devices/bus/nes/mmc1.h12
-rw-r--r--src/devices/bus/nes/mmc2.cpp6
-rw-r--r--src/devices/bus/nes/mmc2.h8
-rw-r--r--src/devices/bus/nes/mmc3.cpp34
-rw-r--r--src/devices/bus/nes/mmc3.h30
-rw-r--r--src/devices/bus/nes/mmc3_clones.cpp124
-rw-r--r--src/devices/bus/nes/mmc3_clones.h130
-rw-r--r--src/devices/bus/nes/mmc5.cpp14
-rw-r--r--src/devices/bus/nes/mmc5.h42
-rw-r--r--src/devices/bus/nes/multigame.cpp124
-rw-r--r--src/devices/bus/nes/multigame.h140
-rw-r--r--src/devices/bus/nes/namcot.cpp20
-rw-r--r--src/devices/bus/nes/namcot.h34
-rw-r--r--src/devices/bus/nes/nanjing.cpp6
-rw-r--r--src/devices/bus/nes/nanjing.h8
-rw-r--r--src/devices/bus/nes/nes_ines.hxx16
-rw-r--r--src/devices/bus/nes/nes_pcb.hxx12
-rw-r--r--src/devices/bus/nes/nes_slot.cpp32
-rw-r--r--src/devices/bus/nes/nes_slot.h82
-rw-r--r--src/devices/bus/nes/nes_unif.hxx24
-rw-r--r--src/devices/bus/nes/ntdec.cpp4
-rw-r--r--src/devices/bus/nes/ntdec.h6
-rw-r--r--src/devices/bus/nes/nxrom.cpp28
-rw-r--r--src/devices/bus/nes/nxrom.h30
-rw-r--r--src/devices/bus/nes/pirate.cpp42
-rw-r--r--src/devices/bus/nes/pirate.h84
-rw-r--r--src/devices/bus/nes/pt554.cpp2
-rw-r--r--src/devices/bus/nes/pt554.h2
-rw-r--r--src/devices/bus/nes/racermate.cpp2
-rw-r--r--src/devices/bus/nes/racermate.h4
-rw-r--r--src/devices/bus/nes/rcm.cpp10
-rw-r--r--src/devices/bus/nes/rcm.h14
-rw-r--r--src/devices/bus/nes/rexsoft.cpp18
-rw-r--r--src/devices/bus/nes/rexsoft.h12
-rw-r--r--src/devices/bus/nes/sachen.cpp46
-rw-r--r--src/devices/bus/nes/sachen.h40
-rw-r--r--src/devices/bus/nes/somari.cpp12
-rw-r--r--src/devices/bus/nes/somari.h18
-rw-r--r--src/devices/bus/nes/sunsoft.cpp22
-rw-r--r--src/devices/bus/nes/sunsoft.h24
-rw-r--r--src/devices/bus/nes/sunsoft_dcs.cpp12
-rw-r--r--src/devices/bus/nes/sunsoft_dcs.h12
-rw-r--r--src/devices/bus/nes/taito.cpp10
-rw-r--r--src/devices/bus/nes/taito.h24
-rw-r--r--src/devices/bus/nes/tengen.cpp14
-rw-r--r--src/devices/bus/nes/tengen.h18
-rw-r--r--src/devices/bus/nes/txc.cpp12
-rw-r--r--src/devices/bus/nes/txc.h14
-rw-r--r--src/devices/bus/nes/waixing.cpp76
-rw-r--r--src/devices/bus/nes/waixing.h68
-rw-r--r--src/devices/bus/nes_ctrl/4score.cpp14
-rw-r--r--src/devices/bus/nes_ctrl/4score.h14
-rw-r--r--src/devices/bus/nes_ctrl/arkpaddle.cpp18
-rw-r--r--src/devices/bus/nes_ctrl/arkpaddle.h18
-rw-r--r--src/devices/bus/nes_ctrl/bcbattle.cpp6
-rw-r--r--src/devices/bus/nes_ctrl/bcbattle.h6
-rw-r--r--src/devices/bus/nes_ctrl/ctrl.cpp16
-rw-r--r--src/devices/bus/nes_ctrl/ctrl.h18
-rw-r--r--src/devices/bus/nes_ctrl/fckeybrd.cpp10
-rw-r--r--src/devices/bus/nes_ctrl/fckeybrd.h8
-rw-r--r--src/devices/bus/nes_ctrl/ftrainer.cpp8
-rw-r--r--src/devices/bus/nes_ctrl/ftrainer.h8
-rw-r--r--src/devices/bus/nes_ctrl/hori.cpp16
-rw-r--r--src/devices/bus/nes_ctrl/hori.h12
-rw-r--r--src/devices/bus/nes_ctrl/joypad.cpp30
-rw-r--r--src/devices/bus/nes_ctrl/joypad.h28
-rw-r--r--src/devices/bus/nes_ctrl/konamihs.cpp8
-rw-r--r--src/devices/bus/nes_ctrl/konamihs.h8
-rw-r--r--src/devices/bus/nes_ctrl/miracle.cpp14
-rw-r--r--src/devices/bus/nes_ctrl/miracle.h14
-rw-r--r--src/devices/bus/nes_ctrl/mjpanel.cpp8
-rw-r--r--src/devices/bus/nes_ctrl/mjpanel.h8
-rw-r--r--src/devices/bus/nes_ctrl/pachinko.cpp8
-rw-r--r--src/devices/bus/nes_ctrl/pachinko.h8
-rw-r--r--src/devices/bus/nes_ctrl/partytap.cpp8
-rw-r--r--src/devices/bus/nes_ctrl/partytap.h10
-rw-r--r--src/devices/bus/nes_ctrl/powerpad.cpp8
-rw-r--r--src/devices/bus/nes_ctrl/powerpad.h8
-rw-r--r--src/devices/bus/nes_ctrl/suborkey.cpp10
-rw-r--r--src/devices/bus/nes_ctrl/suborkey.h8
-rw-r--r--src/devices/bus/nes_ctrl/zapper.cpp10
-rw-r--r--src/devices/bus/nes_ctrl/zapper.h6
-rw-r--r--src/devices/bus/newbrain/eim.cpp10
-rw-r--r--src/devices/bus/newbrain/eim.h12
-rw-r--r--src/devices/bus/newbrain/exp.cpp10
-rw-r--r--src/devices/bus/newbrain/exp.h18
-rw-r--r--src/devices/bus/newbrain/fdc.cpp10
-rw-r--r--src/devices/bus/newbrain/fdc.h10
-rw-r--r--src/devices/bus/nubus/nubus.cpp48
-rw-r--r--src/devices/bus/nubus/nubus.h28
-rw-r--r--src/devices/bus/nubus/nubus_48gc.cpp18
-rw-r--r--src/devices/bus/nubus/nubus_48gc.h16
-rw-r--r--src/devices/bus/nubus/nubus_asntmc3b.cpp12
-rw-r--r--src/devices/bus/nubus/nubus_asntmc3b.h10
-rw-r--r--src/devices/bus/nubus/nubus_cb264.cpp14
-rw-r--r--src/devices/bus/nubus/nubus_cb264.h12
-rw-r--r--src/devices/bus/nubus/nubus_image.cpp44
-rw-r--r--src/devices/bus/nubus/nubus_image.h14
-rw-r--r--src/devices/bus/nubus/nubus_m2hires.cpp14
-rw-r--r--src/devices/bus/nubus/nubus_m2hires.h14
-rw-r--r--src/devices/bus/nubus/nubus_m2video.cpp14
-rw-r--r--src/devices/bus/nubus/nubus_m2video.h14
-rw-r--r--src/devices/bus/nubus/nubus_radiustpd.cpp14
-rw-r--r--src/devices/bus/nubus/nubus_radiustpd.h14
-rw-r--r--src/devices/bus/nubus/nubus_spec8.cpp14
-rw-r--r--src/devices/bus/nubus/nubus_spec8.h20
-rw-r--r--src/devices/bus/nubus/nubus_specpdq.cpp20
-rw-r--r--src/devices/bus/nubus/nubus_specpdq.h20
-rw-r--r--src/devices/bus/nubus/nubus_vikbw.cpp12
-rw-r--r--src/devices/bus/nubus/nubus_vikbw.h10
-rw-r--r--src/devices/bus/nubus/nubus_wsportrait.cpp14
-rw-r--r--src/devices/bus/nubus/nubus_wsportrait.h14
-rw-r--r--src/devices/bus/nubus/pds30_30hr.cpp14
-rw-r--r--src/devices/bus/nubus/pds30_30hr.h14
-rw-r--r--src/devices/bus/nubus/pds30_cb264.cpp18
-rw-r--r--src/devices/bus/nubus/pds30_cb264.h14
-rw-r--r--src/devices/bus/nubus/pds30_mc30.cpp18
-rw-r--r--src/devices/bus/nubus/pds30_mc30.h14
-rw-r--r--src/devices/bus/nubus/pds30_procolor816.cpp18
-rw-r--r--src/devices/bus/nubus/pds30_procolor816.h14
-rw-r--r--src/devices/bus/nubus/pds30_sigmalview.cpp16
-rw-r--r--src/devices/bus/nubus/pds30_sigmalview.h14
-rw-r--r--src/devices/bus/odyssey2/chess.cpp2
-rw-r--r--src/devices/bus/odyssey2/chess.h2
-rw-r--r--src/devices/bus/odyssey2/rom.cpp8
-rw-r--r--src/devices/bus/odyssey2/rom.h8
-rw-r--r--src/devices/bus/odyssey2/slot.cpp10
-rw-r--r--src/devices/bus/odyssey2/slot.h20
-rw-r--r--src/devices/bus/odyssey2/voice.cpp2
-rw-r--r--src/devices/bus/odyssey2/voice.h2
-rw-r--r--src/devices/bus/oricext/jasmin.cpp2
-rw-r--r--src/devices/bus/oricext/jasmin.h4
-rw-r--r--src/devices/bus/oricext/microdisc.cpp2
-rw-r--r--src/devices/bus/oricext/microdisc.h6
-rw-r--r--src/devices/bus/oricext/oricext.cpp8
-rw-r--r--src/devices/bus/oricext/oricext.h8
-rw-r--r--src/devices/bus/pc1512/mouse.cpp4
-rw-r--r--src/devices/bus/pc1512/mouse.h8
-rw-r--r--src/devices/bus/pc_joy/pc_joy.cpp4
-rw-r--r--src/devices/bus/pc_joy/pc_joy.h24
-rw-r--r--src/devices/bus/pc_joy/pc_joy_sw.cpp6
-rw-r--r--src/devices/bus/pc_joy/pc_joy_sw.h6
-rw-r--r--src/devices/bus/pc_kbd/ec1841.cpp6
-rw-r--r--src/devices/bus/pc_kbd/ec1841.h8
-rw-r--r--src/devices/bus/pc_kbd/iskr1030.cpp8
-rw-r--r--src/devices/bus/pc_kbd/iskr1030.h10
-rw-r--r--src/devices/bus/pc_kbd/keytro.cpp4
-rw-r--r--src/devices/bus/pc_kbd/keytro.h14
-rw-r--r--src/devices/bus/pc_kbd/msnat.cpp6
-rw-r--r--src/devices/bus/pc_kbd/msnat.h10
-rw-r--r--src/devices/bus/pc_kbd/pc83.cpp6
-rw-r--r--src/devices/bus/pc_kbd/pc83.h4
-rw-r--r--src/devices/bus/pc_kbd/pc_kbdc.cpp4
-rw-r--r--src/devices/bus/pc_kbd/pc_kbdc.h4
-rw-r--r--src/devices/bus/pc_kbd/pcat84.cpp12
-rw-r--r--src/devices/bus/pc_kbd/pcat84.h8
-rw-r--r--src/devices/bus/pc_kbd/pcxt83.cpp4
-rw-r--r--src/devices/bus/pc_kbd/pcxt83.h8
-rw-r--r--src/devices/bus/pce/pce_rom.cpp10
-rw-r--r--src/devices/bus/pce/pce_rom.h12
-rw-r--r--src/devices/bus/pce/pce_slot.cpp24
-rw-r--r--src/devices/bus/pce/pce_slot.h28
-rw-r--r--src/devices/bus/pet/2joysnd.cpp2
-rw-r--r--src/devices/bus/pet/2joysnd.h2
-rw-r--r--src/devices/bus/pet/64k.cpp12
-rw-r--r--src/devices/bus/pet/64k.h14
-rw-r--r--src/devices/bus/pet/c2n.cpp8
-rw-r--r--src/devices/bus/pet/c2n.h8
-rw-r--r--src/devices/bus/pet/cass.cpp2
-rw-r--r--src/devices/bus/pet/cass.h2
-rw-r--r--src/devices/bus/pet/cb2snd.cpp2
-rw-r--r--src/devices/bus/pet/cb2snd.h2
-rw-r--r--src/devices/bus/pet/diag.cpp2
-rw-r--r--src/devices/bus/pet/diag.h2
-rw-r--r--src/devices/bus/pet/diag264_lb_tape.cpp2
-rw-r--r--src/devices/bus/pet/diag264_lb_tape.h2
-rw-r--r--src/devices/bus/pet/exp.cpp10
-rw-r--r--src/devices/bus/pet/exp.h14
-rw-r--r--src/devices/bus/pet/hsg.cpp10
-rw-r--r--src/devices/bus/pet/hsg.h10
-rw-r--r--src/devices/bus/pet/petuja.cpp2
-rw-r--r--src/devices/bus/pet/petuja.h2
-rw-r--r--src/devices/bus/pet/superpet.cpp6
-rw-r--r--src/devices/bus/pet/superpet.h16
-rw-r--r--src/devices/bus/pet/user.cpp2
-rw-r--r--src/devices/bus/pet/user.h2
-rw-r--r--src/devices/bus/plus4/c1551.cpp18
-rw-r--r--src/devices/bus/plus4/c1551.h8
-rw-r--r--src/devices/bus/plus4/diag264_lb_user.cpp2
-rw-r--r--src/devices/bus/plus4/diag264_lb_user.h2
-rw-r--r--src/devices/bus/plus4/exp.cpp6
-rw-r--r--src/devices/bus/plus4/exp.h18
-rw-r--r--src/devices/bus/plus4/sid.cpp6
-rw-r--r--src/devices/bus/plus4/sid.h6
-rw-r--r--src/devices/bus/plus4/std.cpp4
-rw-r--r--src/devices/bus/plus4/std.h4
-rw-r--r--src/devices/bus/pofo/ccm.cpp2
-rw-r--r--src/devices/bus/pofo/ccm.h10
-rw-r--r--src/devices/bus/pofo/exp.cpp2
-rw-r--r--src/devices/bus/pofo/exp.h18
-rw-r--r--src/devices/bus/pofo/hpc101.cpp6
-rw-r--r--src/devices/bus/pofo/hpc101.h6
-rw-r--r--src/devices/bus/pofo/hpc102.cpp8
-rw-r--r--src/devices/bus/pofo/hpc102.h10
-rw-r--r--src/devices/bus/pofo/hpc104.cpp10
-rw-r--r--src/devices/bus/pofo/hpc104.h12
-rw-r--r--src/devices/bus/pofo/ram.cpp6
-rw-r--r--src/devices/bus/pofo/ram.h6
-rw-r--r--src/devices/bus/pofo/rom.cpp4
-rw-r--r--src/devices/bus/pofo/rom.h4
-rw-r--r--src/devices/bus/psx/analogue.cpp18
-rw-r--r--src/devices/bus/psx/analogue.h14
-rw-r--r--src/devices/bus/psx/ctlrport.cpp8
-rw-r--r--src/devices/bus/psx/ctlrport.h14
-rw-r--r--src/devices/bus/psx/memcard.cpp6
-rw-r--r--src/devices/bus/psx/memcard.h8
-rw-r--r--src/devices/bus/psx/multitap.cpp4
-rw-r--r--src/devices/bus/psx/multitap.h6
-rw-r--r--src/devices/bus/ql/cst_q_plus4.cpp6
-rw-r--r--src/devices/bus/ql/cst_q_plus4.h6
-rw-r--r--src/devices/bus/ql/cst_qdisc.cpp6
-rw-r--r--src/devices/bus/ql/cst_qdisc.h6
-rw-r--r--src/devices/bus/ql/cumana_fdi.cpp6
-rw-r--r--src/devices/bus/ql/cumana_fdi.h6
-rw-r--r--src/devices/bus/ql/exp.cpp2
-rw-r--r--src/devices/bus/ql/exp.h10
-rw-r--r--src/devices/bus/ql/kempston_di.cpp6
-rw-r--r--src/devices/bus/ql/kempston_di.h6
-rw-r--r--src/devices/bus/ql/miracle_gold_card.cpp6
-rw-r--r--src/devices/bus/ql/miracle_gold_card.h6
-rw-r--r--src/devices/bus/ql/miracle_hd.cpp6
-rw-r--r--src/devices/bus/ql/miracle_hd.h6
-rw-r--r--src/devices/bus/ql/mp_fdi.cpp6
-rw-r--r--src/devices/bus/ql/mp_fdi.h6
-rw-r--r--src/devices/bus/ql/opd_basic_master.cpp6
-rw-r--r--src/devices/bus/ql/opd_basic_master.h6
-rw-r--r--src/devices/bus/ql/pcml_qdisk.cpp6
-rw-r--r--src/devices/bus/ql/pcml_qdisk.h6
-rw-r--r--src/devices/bus/ql/qubide.cpp6
-rw-r--r--src/devices/bus/ql/qubide.h8
-rw-r--r--src/devices/bus/ql/rom.cpp2
-rw-r--r--src/devices/bus/ql/rom.h12
-rw-r--r--src/devices/bus/ql/sandy_superdisk.cpp6
-rw-r--r--src/devices/bus/ql/sandy_superdisk.h6
-rw-r--r--src/devices/bus/ql/sandy_superqboard.cpp14
-rw-r--r--src/devices/bus/ql/sandy_superqboard.h18
-rw-r--r--src/devices/bus/ql/std.cpp4
-rw-r--r--src/devices/bus/ql/std.h4
-rw-r--r--src/devices/bus/ql/trumpcard.cpp14
-rw-r--r--src/devices/bus/ql/trumpcard.h16
-rw-r--r--src/devices/bus/rs232/keyboard.cpp8
-rw-r--r--src/devices/bus/rs232/keyboard.h8
-rw-r--r--src/devices/bus/rs232/loopback.cpp2
-rw-r--r--src/devices/bus/rs232/loopback.h2
-rw-r--r--src/devices/bus/rs232/null_modem.cpp2
-rw-r--r--src/devices/bus/rs232/null_modem.h8
-rw-r--r--src/devices/bus/rs232/printer.cpp2
-rw-r--r--src/devices/bus/rs232/printer.h2
-rw-r--r--src/devices/bus/rs232/pty.cpp2
-rw-r--r--src/devices/bus/rs232/pty.h8
-rw-r--r--src/devices/bus/rs232/rs232.cpp4
-rw-r--r--src/devices/bus/rs232/rs232.h18
-rw-r--r--src/devices/bus/rs232/ser_mouse.cpp8
-rw-r--r--src/devices/bus/rs232/ser_mouse.h14
-rw-r--r--src/devices/bus/rs232/sun_kbd.cpp2
-rw-r--r--src/devices/bus/rs232/sun_kbd.h2
-rw-r--r--src/devices/bus/rs232/terminal.cpp6
-rw-r--r--src/devices/bus/rs232/terminal.h6
-rw-r--r--src/devices/bus/rs232/xvd701.cpp2
-rw-r--r--src/devices/bus/rs232/xvd701.h2
-rw-r--r--src/devices/bus/s100/dj2db.cpp12
-rw-r--r--src/devices/bus/s100/dj2db.h12
-rw-r--r--src/devices/bus/s100/djdma.cpp2
-rw-r--r--src/devices/bus/s100/djdma.h2
-rw-r--r--src/devices/bus/s100/mm65k16s.cpp8
-rw-r--r--src/devices/bus/s100/mm65k16s.h8
-rw-r--r--src/devices/bus/s100/nsmdsa.cpp4
-rw-r--r--src/devices/bus/s100/nsmdsa.h4
-rw-r--r--src/devices/bus/s100/nsmdsad.cpp4
-rw-r--r--src/devices/bus/s100/nsmdsad.h4
-rw-r--r--src/devices/bus/s100/s100.cpp8
-rw-r--r--src/devices/bus/s100/s100.h14
-rw-r--r--src/devices/bus/s100/wunderbus.cpp12
-rw-r--r--src/devices/bus/s100/wunderbus.h8
-rw-r--r--src/devices/bus/sat_ctrl/analog.cpp6
-rw-r--r--src/devices/bus/sat_ctrl/analog.h8
-rw-r--r--src/devices/bus/sat_ctrl/ctrl.cpp18
-rw-r--r--src/devices/bus/sat_ctrl/ctrl.h20
-rw-r--r--src/devices/bus/sat_ctrl/joy.cpp8
-rw-r--r--src/devices/bus/sat_ctrl/joy.h10
-rw-r--r--src/devices/bus/sat_ctrl/joy_md.cpp12
-rw-r--r--src/devices/bus/sat_ctrl/joy_md.h16
-rw-r--r--src/devices/bus/sat_ctrl/keybd.cpp12
-rw-r--r--src/devices/bus/sat_ctrl/keybd.h18
-rw-r--r--src/devices/bus/sat_ctrl/mouse.cpp12
-rw-r--r--src/devices/bus/sat_ctrl/mouse.h8
-rw-r--r--src/devices/bus/sat_ctrl/multitap.cpp8
-rw-r--r--src/devices/bus/sat_ctrl/multitap.h8
-rw-r--r--src/devices/bus/sat_ctrl/pointer.cpp12
-rw-r--r--src/devices/bus/sat_ctrl/pointer.h8
-rw-r--r--src/devices/bus/sat_ctrl/racing.cpp6
-rw-r--r--src/devices/bus/sat_ctrl/racing.h8
-rw-r--r--src/devices/bus/sat_ctrl/segatap.cpp8
-rw-r--r--src/devices/bus/sat_ctrl/segatap.h8
-rw-r--r--src/devices/bus/saturn/bram.cpp12
-rw-r--r--src/devices/bus/saturn/bram.h10
-rw-r--r--src/devices/bus/saturn/dram.cpp6
-rw-r--r--src/devices/bus/saturn/dram.h6
-rw-r--r--src/devices/bus/saturn/rom.cpp4
-rw-r--r--src/devices/bus/saturn/rom.h4
-rw-r--r--src/devices/bus/saturn/sat_slot.cpp24
-rw-r--r--src/devices/bus/saturn/sat_slot.h36
-rw-r--r--src/devices/bus/scsi/acb4070.cpp4
-rw-r--r--src/devices/bus/scsi/acb4070.h32
-rw-r--r--src/devices/bus/scsi/cdu76s.cpp4
-rw-r--r--src/devices/bus/scsi/cdu76s.h4
-rw-r--r--src/devices/bus/scsi/d9060hd.cpp2
-rw-r--r--src/devices/bus/scsi/d9060hd.h2
-rw-r--r--src/devices/bus/scsi/omti5100.cpp8
-rw-r--r--src/devices/bus/scsi/omti5100.h6
-rw-r--r--src/devices/bus/scsi/pc9801_sasi.cpp2
-rw-r--r--src/devices/bus/scsi/pc9801_sasi.h2
-rw-r--r--src/devices/bus/scsi/s1410.cpp14
-rw-r--r--src/devices/bus/scsi/s1410.h6
-rw-r--r--src/devices/bus/scsi/sa1403d.cpp4
-rw-r--r--src/devices/bus/scsi/sa1403d.h4
-rw-r--r--src/devices/bus/scsi/scsi.cpp4
-rw-r--r--src/devices/bus/scsi/scsi.h4
-rw-r--r--src/devices/bus/scsi/scsicd.cpp4
-rw-r--r--src/devices/bus/scsi/scsicd.h4
-rw-r--r--src/devices/bus/scsi/scsihd.cpp4
-rw-r--r--src/devices/bus/scsi/scsihd.h4
-rw-r--r--src/devices/bus/scsi/scsihle.cpp12
-rw-r--r--src/devices/bus/scsi/scsihle.h22
-rw-r--r--src/devices/bus/scv/rom.cpp16
-rw-r--r--src/devices/bus/scv/rom.h24
-rw-r--r--src/devices/bus/scv/slot.cpp16
-rw-r--r--src/devices/bus/scv/slot.h22
-rw-r--r--src/devices/bus/sega8/ccatch.cpp2
-rw-r--r--src/devices/bus/sega8/ccatch.h2
-rw-r--r--src/devices/bus/sega8/mgear.cpp2
-rw-r--r--src/devices/bus/sega8/mgear.h2
-rw-r--r--src/devices/bus/sega8/rom.cpp40
-rw-r--r--src/devices/bus/sega8/rom.h62
-rw-r--r--src/devices/bus/sega8/sega8_slot.cpp50
-rw-r--r--src/devices/bus/sega8/sega8_slot.h32
-rw-r--r--src/devices/bus/sg1000_exp/fm_unit.cpp6
-rw-r--r--src/devices/bus/sg1000_exp/fm_unit.h8
-rw-r--r--src/devices/bus/sg1000_exp/sg1000exp.cpp8
-rw-r--r--src/devices/bus/sg1000_exp/sg1000exp.h10
-rw-r--r--src/devices/bus/sg1000_exp/sk1100.cpp6
-rw-r--r--src/devices/bus/sg1000_exp/sk1100.h6
-rw-r--r--src/devices/bus/sms_ctrl/graphic.cpp6
-rw-r--r--src/devices/bus/sms_ctrl/graphic.h10
-rw-r--r--src/devices/bus/sms_ctrl/joypad.cpp4
-rw-r--r--src/devices/bus/sms_ctrl/joypad.h4
-rw-r--r--src/devices/bus/sms_ctrl/lphaser.cpp16
-rw-r--r--src/devices/bus/sms_ctrl/lphaser.h8
-rw-r--r--src/devices/bus/sms_ctrl/multitap.cpp10
-rw-r--r--src/devices/bus/sms_ctrl/multitap.h10
-rw-r--r--src/devices/bus/sms_ctrl/paddle.cpp6
-rw-r--r--src/devices/bus/sms_ctrl/paddle.h6
-rw-r--r--src/devices/bus/sms_ctrl/rfu.cpp8
-rw-r--r--src/devices/bus/sms_ctrl/rfu.h8
-rw-r--r--src/devices/bus/sms_ctrl/smsctrl.cpp10
-rw-r--r--src/devices/bus/sms_ctrl/smsctrl.h12
-rw-r--r--src/devices/bus/sms_ctrl/sports.cpp8
-rw-r--r--src/devices/bus/sms_ctrl/sports.h14
-rw-r--r--src/devices/bus/sms_ctrl/sportsjp.cpp4
-rw-r--r--src/devices/bus/sms_ctrl/sportsjp.h10
-rw-r--r--src/devices/bus/sms_exp/gender.cpp2
-rw-r--r--src/devices/bus/sms_exp/gender.h2
-rw-r--r--src/devices/bus/sms_exp/smsexp.cpp2
-rw-r--r--src/devices/bus/sms_exp/smsexp.h2
-rw-r--r--src/devices/bus/snes/bsx.cpp20
-rw-r--r--src/devices/bus/snes/bsx.h42
-rw-r--r--src/devices/bus/snes/event.cpp10
-rw-r--r--src/devices/bus/snes/event.h14
-rw-r--r--src/devices/bus/snes/rom.cpp34
-rw-r--r--src/devices/bus/snes/rom.h40
-rw-r--r--src/devices/bus/snes/rom21.cpp28
-rw-r--r--src/devices/bus/snes/rom21.h14
-rw-r--r--src/devices/bus/snes/sa1.cpp64
-rw-r--r--src/devices/bus/snes/sa1.h60
-rw-r--r--src/devices/bus/snes/sdd1.cpp72
-rw-r--r--src/devices/bus/snes/sdd1.h76
-rw-r--r--src/devices/bus/snes/sfx.cpp4
-rw-r--r--src/devices/bus/snes/sfx.h4
-rw-r--r--src/devices/bus/snes/sgb.cpp22
-rw-r--r--src/devices/bus/snes/sgb.h34
-rw-r--r--src/devices/bus/snes/snes_slot.cpp88
-rw-r--r--src/devices/bus/snes/snes_slot.h54
-rw-r--r--src/devices/bus/snes/spc7110.cpp222
-rw-r--r--src/devices/bus/snes/spc7110.h196
-rw-r--r--src/devices/bus/snes/sufami.cpp4
-rw-r--r--src/devices/bus/snes/sufami.h4
-rw-r--r--src/devices/bus/snes/upd.cpp54
-rw-r--r--src/devices/bus/snes/upd.h42
-rw-r--r--src/devices/bus/snes_ctrl/bcbattle.cpp8
-rw-r--r--src/devices/bus/snes_ctrl/bcbattle.h8
-rw-r--r--src/devices/bus/snes_ctrl/ctrl.cpp14
-rw-r--r--src/devices/bus/snes_ctrl/ctrl.h26
-rw-r--r--src/devices/bus/snes_ctrl/joypad.cpp10
-rw-r--r--src/devices/bus/snes_ctrl/joypad.h8
-rw-r--r--src/devices/bus/snes_ctrl/miracle.cpp16
-rw-r--r--src/devices/bus/snes_ctrl/miracle.h16
-rw-r--r--src/devices/bus/snes_ctrl/mouse.cpp10
-rw-r--r--src/devices/bus/snes_ctrl/mouse.h12
-rw-r--r--src/devices/bus/snes_ctrl/multitap.cpp14
-rw-r--r--src/devices/bus/snes_ctrl/multitap.h10
-rw-r--r--src/devices/bus/snes_ctrl/pachinko.cpp10
-rw-r--r--src/devices/bus/snes_ctrl/pachinko.h8
-rw-r--r--src/devices/bus/snes_ctrl/sscope.cpp10
-rw-r--r--src/devices/bus/snes_ctrl/sscope.h10
-rw-r--r--src/devices/bus/snes_ctrl/twintap.cpp8
-rw-r--r--src/devices/bus/snes_ctrl/twintap.h8
-rw-r--r--src/devices/bus/spc1000/exp.cpp2
-rw-r--r--src/devices/bus/spc1000/exp.h2
-rw-r--r--src/devices/bus/spc1000/fdd.cpp4
-rw-r--r--src/devices/bus/spc1000/fdd.h8
-rw-r--r--src/devices/bus/spc1000/vdp.cpp2
-rw-r--r--src/devices/bus/spc1000/vdp.h2
-rw-r--r--src/devices/bus/sunkbd/hlekbd.cpp38
-rw-r--r--src/devices/bus/sunkbd/hlekbd.h42
-rw-r--r--src/devices/bus/sunkbd/sunkbd.cpp4
-rw-r--r--src/devices/bus/sunkbd/sunkbd.h4
-rw-r--r--src/devices/bus/svi3x8/expander/expander.cpp2
-rw-r--r--src/devices/bus/svi3x8/expander/expander.h2
-rw-r--r--src/devices/bus/svi3x8/expander/sv601.cpp2
-rw-r--r--src/devices/bus/svi3x8/expander/sv601.h2
-rw-r--r--src/devices/bus/svi3x8/expander/sv602.cpp2
-rw-r--r--src/devices/bus/svi3x8/expander/sv602.h2
-rw-r--r--src/devices/bus/svi3x8/expander/sv603.cpp4
-rw-r--r--src/devices/bus/svi3x8/expander/sv603.h2
-rw-r--r--src/devices/bus/svi3x8/slot/slot.cpp8
-rw-r--r--src/devices/bus/svi3x8/slot/slot.h4
-rw-r--r--src/devices/bus/svi3x8/slot/sv801.cpp2
-rw-r--r--src/devices/bus/svi3x8/slot/sv801.h2
-rw-r--r--src/devices/bus/svi3x8/slot/sv802.cpp2
-rw-r--r--src/devices/bus/svi3x8/slot/sv802.h2
-rw-r--r--src/devices/bus/svi3x8/slot/sv803.cpp4
-rw-r--r--src/devices/bus/svi3x8/slot/sv803.h4
-rw-r--r--src/devices/bus/svi3x8/slot/sv805.cpp2
-rw-r--r--src/devices/bus/svi3x8/slot/sv805.h2
-rw-r--r--src/devices/bus/svi3x8/slot/sv806.cpp6
-rw-r--r--src/devices/bus/svi3x8/slot/sv806.h4
-rw-r--r--src/devices/bus/svi3x8/slot/sv807.cpp6
-rw-r--r--src/devices/bus/svi3x8/slot/sv807.h6
-rw-r--r--src/devices/bus/ti99_peb/bwg.cpp8
-rw-r--r--src/devices/bus/ti99_peb/bwg.h10
-rw-r--r--src/devices/bus/ti99_peb/evpc.cpp4
-rw-r--r--src/devices/bus/ti99_peb/evpc.h10
-rw-r--r--src/devices/bus/ti99_peb/hfdc.cpp14
-rw-r--r--src/devices/bus/ti99_peb/hfdc.h20
-rw-r--r--src/devices/bus/ti99_peb/horizon.cpp6
-rw-r--r--src/devices/bus/ti99_peb/horizon.h2
-rw-r--r--src/devices/bus/ti99_peb/hsgpl.cpp12
-rw-r--r--src/devices/bus/ti99_peb/hsgpl.h12
-rw-r--r--src/devices/bus/ti99_peb/memex.cpp2
-rw-r--r--src/devices/bus/ti99_peb/memex.h4
-rw-r--r--src/devices/bus/ti99_peb/myarcmem.cpp2
-rw-r--r--src/devices/bus/ti99_peb/myarcmem.h4
-rw-r--r--src/devices/bus/ti99_peb/pcode.cpp4
-rw-r--r--src/devices/bus/ti99_peb/pcode.h6
-rw-r--r--src/devices/bus/ti99_peb/peribox.cpp14
-rw-r--r--src/devices/bus/ti99_peb/peribox.h16
-rw-r--r--src/devices/bus/ti99_peb/samsmem.cpp2
-rw-r--r--src/devices/bus/ti99_peb/samsmem.h2
-rw-r--r--src/devices/bus/ti99_peb/spchsyn.cpp2
-rw-r--r--src/devices/bus/ti99_peb/spchsyn.h2
-rw-r--r--src/devices/bus/ti99_peb/ti_32kmem.cpp4
-rw-r--r--src/devices/bus/ti99_peb/ti_32kmem.h2
-rw-r--r--src/devices/bus/ti99_peb/ti_fdc.cpp8
-rw-r--r--src/devices/bus/ti99_peb/ti_fdc.h8
-rw-r--r--src/devices/bus/ti99_peb/ti_rs232.cpp48
-rw-r--r--src/devices/bus/ti99_peb/ti_rs232.h26
-rw-r--r--src/devices/bus/ti99_peb/tn_ide.cpp6
-rw-r--r--src/devices/bus/ti99_peb/tn_ide.h6
-rw-r--r--src/devices/bus/ti99_peb/tn_usbsm.cpp4
-rw-r--r--src/devices/bus/ti99_peb/tn_usbsm.h6
-rw-r--r--src/devices/bus/ti99x/990_dk.cpp6
-rw-r--r--src/devices/bus/ti99x/990_dk.h12
-rw-r--r--src/devices/bus/ti99x/990_hd.cpp24
-rw-r--r--src/devices/bus/ti99x/990_hd.h4
-rw-r--r--src/devices/bus/ti99x/990_tap.cpp16
-rw-r--r--src/devices/bus/ti99x/990_tap.h4
-rw-r--r--src/devices/bus/ti99x/998board.cpp14
-rw-r--r--src/devices/bus/ti99x/998board.h38
-rw-r--r--src/devices/bus/ti99x/datamux.cpp28
-rw-r--r--src/devices/bus/ti99x/datamux.h20
-rw-r--r--src/devices/bus/ti99x/genboard.cpp24
-rw-r--r--src/devices/bus/ti99x/genboard.h14
-rw-r--r--src/devices/bus/ti99x/gromport.cpp58
-rw-r--r--src/devices/bus/ti99x/gromport.h40
-rw-r--r--src/devices/bus/ti99x/handset.cpp20
-rw-r--r--src/devices/bus/ti99x/handset.h16
-rw-r--r--src/devices/bus/ti99x/joyport.cpp4
-rw-r--r--src/devices/bus/ti99x/joyport.h10
-rw-r--r--src/devices/bus/ti99x/mecmouse.cpp6
-rw-r--r--src/devices/bus/ti99x/mecmouse.h6
-rw-r--r--src/devices/bus/ti99x/ti99defs.h14
-rw-r--r--src/devices/bus/tiki100/8088.cpp6
-rw-r--r--src/devices/bus/tiki100/8088.h8
-rw-r--r--src/devices/bus/tiki100/exp.cpp8
-rw-r--r--src/devices/bus/tiki100/exp.h16
-rw-r--r--src/devices/bus/tiki100/hdc.cpp6
-rw-r--r--src/devices/bus/tiki100/hdc.h6
-rw-r--r--src/devices/bus/tvc/hbf.cpp2
-rw-r--r--src/devices/bus/tvc/hbf.h10
-rw-r--r--src/devices/bus/tvc/tvc.cpp10
-rw-r--r--src/devices/bus/tvc/tvc.h10
-rw-r--r--src/devices/bus/vboy/rom.cpp6
-rw-r--r--src/devices/bus/vboy/rom.h6
-rw-r--r--src/devices/bus/vboy/slot.cpp16
-rw-r--r--src/devices/bus/vboy/slot.h22
-rw-r--r--src/devices/bus/vc4000/rom.cpp10
-rw-r--r--src/devices/bus/vc4000/rom.h10
-rw-r--r--src/devices/bus/vc4000/slot.cpp12
-rw-r--r--src/devices/bus/vc4000/slot.h22
-rw-r--r--src/devices/bus/vcs/compumat.cpp2
-rw-r--r--src/devices/bus/vcs/compumat.h2
-rw-r--r--src/devices/bus/vcs/dpc.cpp22
-rw-r--r--src/devices/bus/vcs/dpc.h38
-rw-r--r--src/devices/bus/vcs/harmony_melody.cpp4
-rw-r--r--src/devices/bus/vcs/harmony_melody.h2
-rwxr-xr-xsrc/devices/bus/vcs/rom.cpp52
-rwxr-xr-xsrc/devices/bus/vcs/rom.h48
-rw-r--r--src/devices/bus/vcs/scharger.cpp4
-rw-r--r--src/devices/bus/vcs/scharger.h14
-rw-r--r--src/devices/bus/vcs/vcs_slot.cpp48
-rwxr-xr-xsrc/devices/bus/vcs/vcs_slot.h54
-rw-r--r--src/devices/bus/vcs_ctrl/ctrl.cpp2
-rw-r--r--src/devices/bus/vcs_ctrl/ctrl.h18
-rw-r--r--src/devices/bus/vcs_ctrl/joybooster.cpp8
-rw-r--r--src/devices/bus/vcs_ctrl/joybooster.h8
-rw-r--r--src/devices/bus/vcs_ctrl/joystick.cpp4
-rw-r--r--src/devices/bus/vcs_ctrl/joystick.h4
-rw-r--r--src/devices/bus/vcs_ctrl/keypad.cpp10
-rw-r--r--src/devices/bus/vcs_ctrl/keypad.h12
-rw-r--r--src/devices/bus/vcs_ctrl/lightpen.cpp4
-rw-r--r--src/devices/bus/vcs_ctrl/lightpen.h4
-rw-r--r--src/devices/bus/vcs_ctrl/paddles.cpp8
-rw-r--r--src/devices/bus/vcs_ctrl/paddles.h8
-rw-r--r--src/devices/bus/vcs_ctrl/wheel.cpp6
-rw-r--r--src/devices/bus/vcs_ctrl/wheel.h4
-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/vic10/exp.cpp10
-rw-r--r--src/devices/bus/vic10/exp.h16
-rw-r--r--src/devices/bus/vic10/std.cpp6
-rw-r--r--src/devices/bus/vic10/std.h6
-rw-r--r--src/devices/bus/vic20/4cga.cpp4
-rw-r--r--src/devices/bus/vic20/4cga.h6
-rw-r--r--src/devices/bus/vic20/exp.cpp10
-rw-r--r--src/devices/bus/vic20/exp.h20
-rw-r--r--src/devices/bus/vic20/fe3.cpp12
-rw-r--r--src/devices/bus/vic20/fe3.h16
-rw-r--r--src/devices/bus/vic20/megacart.cpp6
-rw-r--r--src/devices/bus/vic20/megacart.h6
-rw-r--r--src/devices/bus/vic20/std.cpp4
-rw-r--r--src/devices/bus/vic20/std.h4
-rw-r--r--src/devices/bus/vic20/vic1010.cpp8
-rw-r--r--src/devices/bus/vic20/vic1010.h6
-rw-r--r--src/devices/bus/vic20/vic1011.cpp2
-rw-r--r--src/devices/bus/vic20/vic1011.h2
-rw-r--r--src/devices/bus/vic20/vic1110.cpp10
-rw-r--r--src/devices/bus/vic20/vic1110.h8
-rw-r--r--src/devices/bus/vic20/vic1111.cpp6
-rw-r--r--src/devices/bus/vic20/vic1111.h8
-rw-r--r--src/devices/bus/vic20/vic1112.cpp8
-rw-r--r--src/devices/bus/vic20/vic1112.h8
-rw-r--r--src/devices/bus/vic20/vic1210.cpp6
-rw-r--r--src/devices/bus/vic20/vic1210.h8
-rw-r--r--src/devices/bus/vidbrain/exp.cpp12
-rw-r--r--src/devices/bus/vidbrain/exp.h18
-rw-r--r--src/devices/bus/vidbrain/money_minder.cpp8
-rw-r--r--src/devices/bus/vidbrain/money_minder.h6
-rw-r--r--src/devices/bus/vidbrain/std.cpp6
-rw-r--r--src/devices/bus/vidbrain/std.h4
-rw-r--r--src/devices/bus/vidbrain/timeshare.cpp8
-rw-r--r--src/devices/bus/vidbrain/timeshare.h6
-rw-r--r--src/devices/bus/vip/byteio.cpp6
-rw-r--r--src/devices/bus/vip/byteio.h10
-rw-r--r--src/devices/bus/vip/exp.cpp22
-rw-r--r--src/devices/bus/vip/exp.h30
-rw-r--r--src/devices/bus/vip/vp550.cpp4
-rw-r--r--src/devices/bus/vip/vp550.h4
-rw-r--r--src/devices/bus/vip/vp570.cpp8
-rw-r--r--src/devices/bus/vip/vp570.h8
-rw-r--r--src/devices/bus/vip/vp575.cpp24
-rw-r--r--src/devices/bus/vip/vp575.h16
-rw-r--r--src/devices/bus/vip/vp585.cpp4
-rw-r--r--src/devices/bus/vip/vp585.h6
-rw-r--r--src/devices/bus/vip/vp590.cpp14
-rw-r--r--src/devices/bus/vip/vp590.h16
-rw-r--r--src/devices/bus/vip/vp595.cpp4
-rw-r--r--src/devices/bus/vip/vp595.h4
-rw-r--r--src/devices/bus/vip/vp620.cpp4
-rw-r--r--src/devices/bus/vip/vp620.h6
-rw-r--r--src/devices/bus/vip/vp700.cpp6
-rw-r--r--src/devices/bus/vip/vp700.h4
-rw-r--r--src/devices/bus/vtech/ioexp/ioexp.cpp2
-rw-r--r--src/devices/bus/vtech/ioexp/ioexp.h2
-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.cpp2
-rw-r--r--src/devices/bus/vtech/ioexp/printer.h2
-rw-r--r--src/devices/bus/vtech/memexp/floppy.cpp6
-rw-r--r--src/devices/bus/vtech/memexp/floppy.h4
-rw-r--r--src/devices/bus/vtech/memexp/memexp.cpp2
-rw-r--r--src/devices/bus/vtech/memexp/memexp.h2
-rw-r--r--src/devices/bus/vtech/memexp/memory.cpp8
-rw-r--r--src/devices/bus/vtech/memexp/memory.h16
-rw-r--r--src/devices/bus/vtech/memexp/rs232.cpp2
-rw-r--r--src/devices/bus/vtech/memexp/rs232.h2
-rw-r--r--src/devices/bus/vtech/memexp/rtty.cpp2
-rw-r--r--src/devices/bus/vtech/memexp/rtty.h2
-rw-r--r--src/devices/bus/vtech/memexp/wordpro.cpp2
-rw-r--r--src/devices/bus/vtech/memexp/wordpro.h2
-rw-r--r--src/devices/bus/wangpc/emb.cpp14
-rw-r--r--src/devices/bus/wangpc/emb.h14
-rw-r--r--src/devices/bus/wangpc/lic.cpp14
-rw-r--r--src/devices/bus/wangpc/lic.h10
-rw-r--r--src/devices/bus/wangpc/lvc.cpp18
-rw-r--r--src/devices/bus/wangpc/lvc.h16
-rw-r--r--src/devices/bus/wangpc/mcc.cpp8
-rw-r--r--src/devices/bus/wangpc/mcc.h8
-rw-r--r--src/devices/bus/wangpc/mvc.cpp24
-rw-r--r--src/devices/bus/wangpc/mvc.h18
-rw-r--r--src/devices/bus/wangpc/rtc.cpp14
-rw-r--r--src/devices/bus/wangpc/rtc.h12
-rw-r--r--src/devices/bus/wangpc/tig.cpp16
-rw-r--r--src/devices/bus/wangpc/tig.h18
-rw-r--r--src/devices/bus/wangpc/wangpc.cpp14
-rw-r--r--src/devices/bus/wangpc/wangpc.h20
-rw-r--r--src/devices/bus/wangpc/wdc.cpp18
-rw-r--r--src/devices/bus/wangpc/wdc.h18
-rw-r--r--src/devices/bus/wswan/rom.cpp12
-rw-r--r--src/devices/bus/wswan/rom.h42
-rw-r--r--src/devices/bus/wswan/slot.cpp24
-rw-r--r--src/devices/bus/wswan/slot.h24
-rw-r--r--src/devices/bus/x68k/x68k_neptunex.cpp6
-rw-r--r--src/devices/bus/x68k/x68k_neptunex.h6
-rw-r--r--src/devices/bus/x68k/x68k_scsiext.cpp4
-rw-r--r--src/devices/bus/x68k/x68k_scsiext.h2
-rw-r--r--src/devices/bus/x68k/x68kexp.cpp2
-rw-r--r--src/devices/bus/x68k/x68kexp.h2
-rw-r--r--src/devices/bus/z88/flash.cpp4
-rw-r--r--src/devices/bus/z88/flash.h6
-rw-r--r--src/devices/bus/z88/ram.cpp12
-rw-r--r--src/devices/bus/z88/ram.h22
-rw-r--r--src/devices/bus/z88/rom.cpp10
-rw-r--r--src/devices/bus/z88/rom.h18
-rw-r--r--src/devices/bus/z88/z88.cpp4
-rw-r--r--src/devices/bus/z88/z88.h6
1687 files changed, 11229 insertions, 11229 deletions
diff --git a/src/devices/bus/a1bus/a1bus.cpp b/src/devices/bus/a1bus/a1bus.cpp
index 273452fd2c1..8e0d024ebf1 100644
--- a/src/devices/bus/a1bus/a1bus.cpp
+++ b/src/devices/bus/a1bus/a1bus.cpp
@@ -23,7 +23,7 @@ const device_type A1BUS_SLOT = &device_creator<a1bus_slot_device>;
//-------------------------------------------------
// a1bus_slot_device - constructor
//-------------------------------------------------
-a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A1BUS_SLOT, "Apple I Slot", tag, owner, clock, "a1bus_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_a1bus_tag(nullptr),
@@ -31,7 +31,7 @@ a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, const char *
{
}
-a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a1bus_slot_device::a1bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this), m_a1bus_tag(nullptr), m_a1bus_slottag(nullptr)
{
@@ -75,14 +75,14 @@ void a1bus_device::static_set_cputag(device_t &device, const char *tag)
// a1bus_device - constructor
//-------------------------------------------------
-a1bus_device::a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a1bus_device::a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A1BUS, "Apple I Bus", tag, owner, clock, "a1bus", __FILE__), m_maincpu(nullptr),
m_out_irq_cb(*this),
m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)
{
}
-a1bus_device::a1bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a1bus_device::a1bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr),
m_out_irq_cb(*this),
m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)
@@ -139,7 +139,7 @@ void a1bus_device::install_device(offs_t start, offs_t end, read8_delegate rhand
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler);
}
-void a1bus_device::install_bank(offs_t start, offs_t end, const char *tag, UINT8 *data)
+void a1bus_device::install_bank(offs_t start, offs_t end, const char *tag, uint8_t *data)
{
// printf("install_bank: %s @ %x->%x\n", tag, start, end);
m_maincpu = machine().device<cpu_device>(m_cputag);
@@ -199,7 +199,7 @@ void device_a1bus_card_interface::install_device(offs_t start, offs_t end, read8
m_a1bus->install_device(start, end, rhandler, whandler);
}
-void device_a1bus_card_interface::install_bank(offs_t start, offs_t end, char *tag, UINT8 *data)
+void device_a1bus_card_interface::install_bank(offs_t start, offs_t end, char *tag, uint8_t *data)
{
m_a1bus->install_bank(start, end, tag, data);
}
diff --git a/src/devices/bus/a1bus/a1bus.h b/src/devices/bus/a1bus/a1bus.h
index 5bfe4b632a5..f2d7763a879 100644
--- a/src/devices/bus/a1bus/a1bus.h
+++ b/src/devices/bus/a1bus/a1bus.h
@@ -49,8 +49,8 @@ class a1bus_slot_device : public device_t,
{
public:
// construction/destruction
- a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a1bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a1bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -72,8 +72,8 @@ class a1bus_device : public device_t
{
public:
// construction/destruction
- a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a1bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a1bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
@@ -87,7 +87,7 @@ public:
void set_nmi_line(int state);
void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler);
- void install_bank(offs_t start, offs_t end, const char *tag, UINT8 *data);
+ void install_bank(offs_t start, offs_t end, const char *tag, uint8_t *data);
DECLARE_WRITE_LINE_MEMBER( irq_w );
DECLARE_WRITE_LINE_MEMBER( nmi_w );
@@ -132,7 +132,7 @@ public:
void lower_slot_nmi() { m_a1bus->set_nmi_line(CLEAR_LINE); }
void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler);
- void install_bank(offs_t start, offs_t end, char *tag, UINT8 *data);
+ void install_bank(offs_t start, offs_t end, char *tag, uint8_t *data);
// inline configuration
static void static_set_a1bus_tag(device_t &device, const char *tag, const char *slottag);
diff --git a/src/devices/bus/a1bus/a1cassette.cpp b/src/devices/bus/a1bus/a1cassette.cpp
index 9a33b667fa9..2e322c688a1 100644
--- a/src/devices/bus/a1bus/a1cassette.cpp
+++ b/src/devices/bus/a1bus/a1cassette.cpp
@@ -56,14 +56,14 @@ const tiny_rom_entry *a1bus_cassette_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A1BUS_CASSETTE, "Apple I cassette board", tag, owner, clock, "a1cass", __FILE__),
device_a1bus_card_interface(mconfig, *this),
m_cassette(*this, "cassette"), m_rom(nullptr), m_cassette_output_flipflop(0)
{
}
-a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a1bus_cassette_device::a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a1bus_card_interface(mconfig, *this),
m_cassette(*this, "cassette"), m_rom(nullptr), m_cassette_output_flipflop(0)
diff --git a/src/devices/bus/a1bus/a1cassette.h b/src/devices/bus/a1bus/a1cassette.h
index b5391e680ff..408ae5fe4cf 100644
--- a/src/devices/bus/a1bus/a1cassette.h
+++ b/src/devices/bus/a1bus/a1cassette.h
@@ -24,8 +24,8 @@ class a1bus_cassette_device:
{
public:
// construction/destruction
- a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a1bus_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -43,7 +43,7 @@ protected:
void cassette_toggle_output();
private:
- UINT8 *m_rom;
+ uint8_t *m_rom;
int m_cassette_output_flipflop;
};
diff --git a/src/devices/bus/a1bus/a1cffa.cpp b/src/devices/bus/a1bus/a1cffa.cpp
index 4edaf39c5d0..c553d63a2af 100644
--- a/src/devices/bus/a1bus/a1cffa.cpp
+++ b/src/devices/bus/a1bus/a1cffa.cpp
@@ -51,14 +51,14 @@ const tiny_rom_entry *a1bus_cffa_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A1BUS_CFFA, "CFFA Compact Flash for Apple I", tag, owner, clock, "cffa1", __FILE__),
device_a1bus_card_interface(mconfig, *this),
m_ata(*this, CFFA_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_writeprotect(false)
{
}
-a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a1bus_cffa_device::a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a1bus_card_interface(mconfig, *this),
m_ata(*this, CFFA_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_writeprotect(false)
diff --git a/src/devices/bus/a1bus/a1cffa.h b/src/devices/bus/a1bus/a1cffa.h
index 1a342c34b33..30b55fea2d9 100644
--- a/src/devices/bus/a1bus/a1cffa.h
+++ b/src/devices/bus/a1bus/a1cffa.h
@@ -25,8 +25,8 @@ class a1bus_cffa_device:
{
public:
// construction/destruction
- a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a1bus_cffa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -42,8 +42,8 @@ protected:
virtual void device_reset() override;
private:
- UINT8 *m_rom;
- UINT16 m_lastdata;
+ uint8_t *m_rom;
+ uint16_t m_lastdata;
bool m_writeprotect;
};
diff --git a/src/devices/bus/a2bus/a2alfam2.cpp b/src/devices/bus/a2bus/a2alfam2.cpp
index 3e701a636fd..0bee8380532 100644
--- a/src/devices/bus/a2bus/a2alfam2.cpp
+++ b/src/devices/bus/a2bus/a2alfam2.cpp
@@ -82,7 +82,7 @@ machine_config_constructor a2bus_aesms_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-a2bus_sn76489_device::a2bus_sn76489_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_sn76489_device::a2bus_sn76489_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_sn1(*this, SN1_TAG),
@@ -92,13 +92,13 @@ a2bus_sn76489_device::a2bus_sn76489_device(const machine_config &mconfig, device
{
}
-a2bus_alfam2_device::a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_alfam2_device::a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_sn76489_device(mconfig, A2BUS_ALFAM2, "ALF MC1 / Apple Music II", tag, owner, clock, "a2alfam2", __FILE__)
{
m_has4thsn = false;
}
-a2bus_aesms_device::a2bus_aesms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_aesms_device::a2bus_aesms_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_sn76489_device(mconfig, A2BUS_ALFAM2, "Applied Engineering Super Music Synthesizer", tag, owner, clock, "a2aesms", __FILE__)
{
m_has4thsn = true;
@@ -125,7 +125,7 @@ void a2bus_sn76489_device::device_reset()
m_latch0 = m_latch1 = m_latch2 = m_latch3 = 0;
}
-UINT8 a2bus_sn76489_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_sn76489_device::read_c0nx(address_space &space, uint8_t offset)
{
// SN76489 can't be read, it appears from the schematics this is what happens
switch (offset)
@@ -146,7 +146,7 @@ UINT8 a2bus_sn76489_device::read_c0nx(address_space &space, UINT8 offset)
return 0xff;
}
-void a2bus_sn76489_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_sn76489_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/devices/bus/a2bus/a2alfam2.h b/src/devices/bus/a2bus/a2alfam2.h
index b02792afe9a..7aa17be0263 100644
--- a/src/devices/bus/a2bus/a2alfam2.h
+++ b/src/devices/bus/a2bus/a2alfam2.h
@@ -25,7 +25,7 @@ class a2bus_sn76489_device:
{
public:
// construction/destruction
- a2bus_sn76489_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_sn76489_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -40,12 +40,12 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
virtual bool take_c800() override;
private:
- UINT8 m_latch0, m_latch1, m_latch2, m_latch3;
+ uint8_t m_latch0, m_latch1, m_latch2, m_latch3;
protected:
bool m_has4thsn;
@@ -54,13 +54,13 @@ protected:
class a2bus_alfam2_device : public a2bus_sn76489_device
{
public:
- a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class a2bus_aesms_device : public a2bus_sn76489_device
{
public:
- a2bus_aesms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_aesms_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
diff --git a/src/devices/bus/a2bus/a2applicard.cpp b/src/devices/bus/a2bus/a2applicard.cpp
index 3075bd12ede..1e4f71e3e33 100644
--- a/src/devices/bus/a2bus/a2applicard.cpp
+++ b/src/devices/bus/a2bus/a2applicard.cpp
@@ -75,14 +75,14 @@ const tiny_rom_entry *a2bus_applicard_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_z80(*this, Z80_TAG), m_bROMAtZ80Zero(false), m_z80stat(false), m_6502stat(false), m_toz80(0), m_to6502(0), m_z80rom(nullptr)
{
}
-a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_APPLICARD, "PCPI Applicard", tag, owner, clock, "a2aplcrd", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_z80(*this, Z80_TAG), m_bROMAtZ80Zero(false), m_z80stat(false), m_6502stat(false), m_toz80(0), m_to6502(0), m_z80rom(nullptr)
@@ -117,7 +117,7 @@ void a2bus_applicard_device::device_reset()
m_z80stat = false;
}
-UINT8 a2bus_applicard_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_applicard_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset & 0xf)
{
@@ -160,7 +160,7 @@ UINT8 a2bus_applicard_device::read_c0nx(address_space &space, UINT8 offset)
return 0xff;
}
-void a2bus_applicard_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_applicard_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset & 0xf)
{
@@ -184,7 +184,7 @@ void a2bus_applicard_device::write_c0nx(address_space &space, UINT8 offset, UINT
READ8_MEMBER( a2bus_applicard_device::z80_io_r )
{
- UINT8 tmp = 0;
+ uint8_t tmp = 0;
switch (offset)
{
diff --git a/src/devices/bus/a2bus/a2applicard.h b/src/devices/bus/a2bus/a2applicard.h
index fa0b11be8bf..610353c71b2 100644
--- a/src/devices/bus/a2bus/a2applicard.h
+++ b/src/devices/bus/a2bus/a2applicard.h
@@ -24,8 +24,8 @@ class a2bus_applicard_device:
{
public:
// construction/destruction
- a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,8 +41,8 @@ protected:
virtual const tiny_rom_entry *device_rom_region() const override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
virtual bool take_c800() override;
required_device<cpu_device> m_z80;
@@ -50,9 +50,9 @@ protected:
private:
bool m_bROMAtZ80Zero;
bool m_z80stat, m_6502stat;
- UINT8 m_toz80, m_to6502;
- UINT8 m_z80ram[64*1024];
- UINT8 *m_z80rom;
+ uint8_t m_toz80, m_to6502;
+ uint8_t m_z80ram[64*1024];
+ uint8_t *m_z80rom;
};
// device type definition
diff --git a/src/devices/bus/a2bus/a2arcadebd.cpp b/src/devices/bus/a2bus/a2arcadebd.cpp
index dcad400f8b1..31d86d7bddc 100644
--- a/src/devices/bus/a2bus/a2arcadebd.cpp
+++ b/src/devices/bus/a2bus/a2arcadebd.cpp
@@ -57,7 +57,7 @@ machine_config_constructor a2bus_arcboard_device::device_mconfig_additions() con
// LIVE DEVICE
//**************************************************************************
-a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_ARCADEBOARD, "Third Millenium Engineering Arcade Board", tag, owner, clock, "a2arcbd", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG),
@@ -65,7 +65,7 @@ a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, cons
{
}
-a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG),
@@ -97,7 +97,7 @@ void a2bus_arcboard_device::device_reset()
6 - AY data
*/
-UINT8 a2bus_arcboard_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_arcboard_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset)
{
@@ -114,7 +114,7 @@ UINT8 a2bus_arcboard_device::read_c0nx(address_space &space, UINT8 offset)
return 0xff;
}
-void a2bus_arcboard_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_arcboard_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/devices/bus/a2bus/a2arcadebd.h b/src/devices/bus/a2bus/a2arcadebd.h
index 1268244ca9f..38fa21902a5 100644
--- a/src/devices/bus/a2bus/a2arcadebd.h
+++ b/src/devices/bus/a2bus/a2arcadebd.h
@@ -26,8 +26,8 @@ class a2bus_arcboard_device:
{
public:
// construction/destruction
- a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -39,8 +39,8 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
required_device<tms9918a_device> m_tms;
required_device<ay8910_device> m_ay;
diff --git a/src/devices/bus/a2bus/a2bus.cpp b/src/devices/bus/a2bus/a2bus.cpp
index 2083a607690..b1c97c08693 100644
--- a/src/devices/bus/a2bus/a2bus.cpp
+++ b/src/devices/bus/a2bus/a2bus.cpp
@@ -87,13 +87,13 @@ const device_type A2BUS_SLOT = &device_creator<a2bus_slot_device>;
//-------------------------------------------------
// a2bus_slot_device - constructor
//-------------------------------------------------
-a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_SLOT, "Apple II Slot", tag, owner, clock, "a2bus_slot", __FILE__),
device_slot_interface(mconfig, *this), m_a2bus_tag(nullptr), m_a2bus_slottag(nullptr)
{
}
-a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this), m_a2bus_tag(nullptr), m_a2bus_slottag(nullptr)
{
@@ -137,7 +137,7 @@ void a2bus_device::static_set_cputag(device_t &device, const char *tag)
// a2bus_device - constructor
//-------------------------------------------------
-a2bus_device::a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_device::a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS, "Apple II Bus", tag, owner, clock, "a2bus", __FILE__), m_maincpu(nullptr), m_maincpu_space(nullptr),
m_out_irq_cb(*this),
m_out_nmi_cb(*this),
@@ -145,7 +145,7 @@ a2bus_device::a2bus_device(const machine_config &mconfig, const char *tag, devic
{
}
-a2bus_device::a2bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_device::a2bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_maincpu_space(nullptr),
m_out_irq_cb(*this),
m_out_nmi_cb(*this),
@@ -203,12 +203,12 @@ void a2bus_device::add_a2bus_card(int slot, device_a2bus_card_interface *card)
m_device_list[slot] = card;
}
-UINT8 a2bus_device::get_a2bus_irq_mask()
+uint8_t a2bus_device::get_a2bus_irq_mask()
{
return m_slot_irq_mask;
}
-UINT8 a2bus_device::get_a2bus_nmi_mask()
+uint8_t a2bus_device::get_a2bus_nmi_mask()
{
return m_slot_nmi_mask;
}
@@ -246,26 +246,26 @@ void a2bus_device::set_maincpu_halt(int state)
m_maincpu->set_input_line(INPUT_LINE_HALT, state);
}
-UINT8 a2bus_device::dma_r(address_space &space, UINT16 offset)
+uint8_t a2bus_device::dma_r(address_space &space, uint16_t offset)
{
m_maincpu_space->set_debugger_access(space.debugger_access());
return m_maincpu_space->read_byte(offset);
}
-void a2bus_device::dma_w(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_device::dma_w(address_space &space, uint16_t offset, uint8_t data)
{
m_maincpu_space->set_debugger_access(space.debugger_access());
m_maincpu_space->write_byte(offset, data);
}
-UINT8 a2bus_device::dma_nospace_r(UINT16 offset)
+uint8_t a2bus_device::dma_nospace_r(uint16_t offset)
{
return m_maincpu_space->read_byte(offset);
}
-void a2bus_device::dma_nospace_w(UINT16 offset, UINT8 data)
+void a2bus_device::dma_nospace_w(uint16_t offset, uint8_t data)
{
m_maincpu_space->write_byte(offset, data);
}
diff --git a/src/devices/bus/a2bus/a2bus.h b/src/devices/bus/a2bus/a2bus.h
index 07d4e57781d..72706946730 100644
--- a/src/devices/bus/a2bus/a2bus.h
+++ b/src/devices/bus/a2bus/a2bus.h
@@ -63,8 +63,8 @@ class a2bus_slot_device : public device_t,
{
public:
// construction/destruction
- a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -88,8 +88,8 @@ class a2bus_device : public device_t
friend class a2bus_mcms2_device;
public:
// construction/destruction
- a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
@@ -99,17 +99,17 @@ public:
void add_a2bus_card(int slot, device_a2bus_card_interface *card);
device_a2bus_card_interface *get_a2bus_card(int slot);
- UINT8 get_a2bus_irq_mask();
- UINT8 get_a2bus_nmi_mask();
+ uint8_t get_a2bus_irq_mask();
+ uint8_t get_a2bus_nmi_mask();
void set_irq_line(int state, int slot);
void set_nmi_line(int state, int slot);
void set_maincpu_halt(int state);
void recalc_inh(int slot);
- UINT8 dma_r(address_space &space, UINT16 offset);
- void dma_w(address_space &space, UINT16 offset, UINT8 data);
- UINT8 dma_nospace_r(UINT16 offset);
- void dma_nospace_w(UINT16 offset, UINT8 data);
+ uint8_t dma_r(address_space &space, uint16_t offset);
+ void dma_w(address_space &space, uint16_t offset, uint8_t data);
+ uint8_t dma_nospace_r(uint16_t offset);
+ void dma_nospace_w(uint16_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER( irq_w );
DECLARE_WRITE_LINE_MEMBER( nmi_w );
@@ -130,8 +130,8 @@ protected:
device_a2bus_card_interface *m_device_list[8];
const char *m_cputag;
- UINT8 m_slot_irq_mask;
- UINT8 m_slot_nmi_mask;
+ uint8_t m_slot_irq_mask;
+ uint8_t m_slot_nmi_mask;
};
@@ -149,25 +149,25 @@ public:
device_a2bus_card_interface(const machine_config &mconfig, device_t &device);
virtual ~device_a2bus_card_interface();
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) { m_device.logerror("a2bus: unhandled read at C0n%x\n", offset); return 0; } // C0nX - /DEVSEL
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) { m_device.logerror("a2bus: unhandled write %02x to C0n%x\n", data, offset); }
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) { return 0; } // CnXX - /IOSEL
- virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) { m_device.logerror("a2bus: unhandled write %02x to Cn%02x\n", data, offset); }
- virtual UINT8 read_c800(address_space &space, UINT16 offset) { return 0; } // C800 - /IOSTB
- virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) {m_device.logerror("a2bus: unhandled write %02x to %04x\n", data, offset + 0xc800); }
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) { m_device.logerror("a2bus: unhandled read at C0n%x\n", offset); return 0; } // C0nX - /DEVSEL
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) { m_device.logerror("a2bus: unhandled write %02x to C0n%x\n", data, offset); }
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) { return 0; } // CnXX - /IOSEL
+ virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) { m_device.logerror("a2bus: unhandled write %02x to Cn%02x\n", data, offset); }
+ virtual uint8_t read_c800(address_space &space, uint16_t offset) { return 0; } // C800 - /IOSTB
+ virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) {m_device.logerror("a2bus: unhandled write %02x to %04x\n", data, offset + 0xc800); }
virtual bool take_c800() { return true; } // override and return false if your card doesn't take over the c800 space
- virtual UINT8 read_inh_rom(address_space &space, UINT16 offset) { return 0; }
- virtual void write_inh_rom(address_space &space, UINT16 offset, UINT8 data) { }
- virtual UINT16 inh_start() { return INH_START_INVALID; }
- virtual UINT16 inh_end() { return INH_END_INVALID; }
+ virtual uint8_t read_inh_rom(address_space &space, uint16_t offset) { return 0; }
+ virtual void write_inh_rom(address_space &space, uint16_t offset, uint8_t data) { }
+ virtual uint16_t inh_start() { return INH_START_INVALID; }
+ virtual uint16_t inh_end() { return INH_END_INVALID; }
virtual int inh_type() { return INH_NONE; }
device_a2bus_card_interface *next() const { return m_next; }
void set_a2bus_device();
- UINT32 get_slotromspace() { return 0xc000 | (m_slot<<8); } // return Cn00 address for this slot
- UINT32 get_slotiospace() { return 0xc080 + (m_slot<<4); } // return C0n0 address for this slot
+ uint32_t get_slotromspace() { return 0xc000 | (m_slot<<8); } // return Cn00 address for this slot
+ uint32_t get_slotiospace() { return 0xc080 + (m_slot<<4); } // return C0n0 address for this slot
void raise_slot_irq() { m_a2bus->set_irq_line(ASSERT_LINE, m_slot); }
void lower_slot_irq() { m_a2bus->set_irq_line(CLEAR_LINE, m_slot); }
@@ -178,12 +178,12 @@ public:
// pass through the original address space if any for debugger protection
// when debugging e.g. coprocessor cards (Z80 SoftCard etc).
- UINT8 slot_dma_read(address_space &space, UINT16 offset) { return m_a2bus->dma_r(space, offset); }
- void slot_dma_write(address_space &space, UINT16 offset, UINT8 data) { m_a2bus->dma_w(space, offset, data); }
+ uint8_t slot_dma_read(address_space &space, uint16_t offset) { return m_a2bus->dma_r(space, offset); }
+ void slot_dma_write(address_space &space, uint16_t offset, uint8_t data) { m_a2bus->dma_w(space, offset, data); }
// these versions forego that protection for when the DMA isn't coming from a debuggable CPU device
- UINT8 slot_dma_read_no_space(UINT16 offset) { return m_a2bus->dma_nospace_r(offset); }
- void slot_dma_write_no_space(UINT16 offset, UINT8 data) { m_a2bus->dma_nospace_w(offset, data); }
+ uint8_t slot_dma_read_no_space(uint16_t offset) { return m_a2bus->dma_nospace_r(offset); }
+ void slot_dma_write_no_space(uint16_t offset, uint8_t data) { m_a2bus->dma_nospace_w(offset, data); }
// inline configuration
static void static_set_a2bus_tag(device_t &device, const char *tag, const char *slottag);
diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp
index 85eef339230..e046b2e120e 100644
--- a/src/devices/bus/a2bus/a2cffa.cpp
+++ b/src/devices/bus/a2bus/a2cffa.cpp
@@ -83,20 +83,20 @@ const tiny_rom_entry *a2bus_cffa2_6502_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_cffa2000_device::a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_cffa2000_device::a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_ata(*this, CFFA2_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_lastreaddata(0), m_writeprotect(false), m_inwritecycle(false)
{
}
-a2bus_cffa2_device::a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_cffa2_device::a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_cffa2000_device(mconfig, A2BUS_CFFA2, "CFFA2000 Compact Flash (65C02 firmware, www.dreher.net)", tag, owner, clock, "a2cffa2", __FILE__),
device_nvram_interface(mconfig, *this)
{
}
-a2bus_cffa2_6502_device::a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_cffa2_6502_device::a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_cffa2000_device(mconfig, A2BUS_CFFA2, "CFFA2000 Compact Flash (6502 firmware, www.dreher.net)", tag, owner, clock, "a2cffa02", __FILE__),
device_nvram_interface(mconfig, *this)
{
@@ -135,7 +135,7 @@ void a2bus_cffa2000_device::device_reset()
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_cffa2000_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_cffa2000_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset)
{
@@ -176,7 +176,7 @@ UINT8 a2bus_cffa2000_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_cffa2000_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_cffa2000_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
m_inwritecycle = false;
@@ -220,7 +220,7 @@ void a2bus_cffa2000_device::write_c0nx(address_space &space, UINT8 offset, UINT8
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_cffa2000_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_cffa2000_device::read_cnxx(address_space &space, uint8_t offset)
{
int slotimg = m_slot * 0x100;
@@ -232,12 +232,12 @@ UINT8 a2bus_cffa2000_device::read_cnxx(address_space &space, UINT8 offset)
read_c800 - called for reads from this card's c800 space
-------------------------------------------------*/
-UINT8 a2bus_cffa2000_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_cffa2000_device::read_c800(address_space &space, uint16_t offset)
{
return m_eeprom[offset+0x800];
}
-void a2bus_cffa2000_device::write_c800(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_cffa2000_device::write_c800(address_space &space, uint16_t offset, uint8_t data)
{
if (!m_writeprotect)
{
diff --git a/src/devices/bus/a2bus/a2cffa.h b/src/devices/bus/a2bus/a2cffa.h
index b628fb16d1a..d5713ff254f 100644
--- a/src/devices/bus/a2bus/a2cffa.h
+++ b/src/devices/bus/a2bus/a2cffa.h
@@ -26,7 +26,7 @@ class a2bus_cffa2000_device:
{
public:
// construction/destruction
- a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -37,19 +37,19 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
- virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
- virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+ virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+ virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
required_device<ata_interface_device> m_ata;
- UINT8 *m_rom;
- UINT8 m_eeprom[0x1000];
+ uint8_t *m_rom;
+ uint8_t m_eeprom[0x1000];
private:
- UINT16 m_lastdata, m_lastreaddata;
+ uint16_t m_lastdata, m_lastreaddata;
bool m_writeprotect;
bool m_inwritecycle;
};
@@ -57,7 +57,7 @@ private:
class a2bus_cffa2_device : public a2bus_cffa2000_device, public device_nvram_interface
{
public:
- a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device_config_nvram_interface overrides
@@ -69,7 +69,7 @@ protected:
class a2bus_cffa2_6502_device : public a2bus_cffa2000_device, public device_nvram_interface
{
public:
- a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
protected:
diff --git a/src/devices/bus/a2bus/a2corvus.cpp b/src/devices/bus/a2bus/a2corvus.cpp
index cc95c3919cb..9ee553b17d8 100644
--- a/src/devices/bus/a2bus/a2corvus.cpp
+++ b/src/devices/bus/a2bus/a2corvus.cpp
@@ -101,14 +101,14 @@ const tiny_rom_entry *a2bus_corvus_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_corvushd(*this, CORVUS_HD_TAG), m_rom(nullptr)
{
}
-a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_CORVUS, "Corvus Flat Cable interface", tag, owner, clock, "a2corvus", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_corvushd(*this, CORVUS_HD_TAG), m_rom(nullptr)
@@ -136,7 +136,7 @@ void a2bus_corvus_device::device_reset()
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_corvus_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_corvus_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset)
{
@@ -159,7 +159,7 @@ UINT8 a2bus_corvus_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_corvus_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_corvus_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
if (offset == 0)
{
@@ -171,7 +171,7 @@ void a2bus_corvus_device::write_c0nx(address_space &space, UINT8 offset, UINT8 d
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_corvus_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_corvus_device::read_cnxx(address_space &space, uint8_t offset)
{
// one slot image at the end of the ROM, it appears
return m_rom[offset+0x700];
@@ -181,7 +181,7 @@ UINT8 a2bus_corvus_device::read_cnxx(address_space &space, UINT8 offset)
read_c800 - called for reads from this card's c800 space
-------------------------------------------------*/
-UINT8 a2bus_corvus_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_corvus_device::read_c800(address_space &space, uint16_t offset)
{
return m_rom[offset & 0x7ff];
}
diff --git a/src/devices/bus/a2bus/a2corvus.h b/src/devices/bus/a2bus/a2corvus.h
index 2e64d8b9cdc..2d6a0042637 100644
--- a/src/devices/bus/a2bus/a2corvus.h
+++ b/src/devices/bus/a2bus/a2corvus.h
@@ -26,8 +26,8 @@ class a2bus_corvus_device:
{
public:
// construction/destruction
- a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -40,13 +40,13 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
- virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+ virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
private:
- UINT8 *m_rom;
+ uint8_t *m_rom;
};
// device type definition
diff --git a/src/devices/bus/a2bus/a2diskii.cpp b/src/devices/bus/a2bus/a2diskii.cpp
index cfda06bbdcb..50243e2f596 100644
--- a/src/devices/bus/a2bus/a2diskii.cpp
+++ b/src/devices/bus/a2bus/a2diskii.cpp
@@ -90,19 +90,19 @@ const tiny_rom_entry *a2bus_floppy_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_floppy_device::a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_floppy_device::a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_fdc(*this, FDC_TAG), m_rom(nullptr)
{
}
-a2bus_diskii_device::a2bus_diskii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_diskii_device::a2bus_diskii_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_floppy_device(mconfig, A2BUS_DISKII, "Apple Disk II controller", tag, owner, clock, "a2diskii", __FILE__)
{
}
-a2bus_iwmflop_device::a2bus_iwmflop_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_iwmflop_device::a2bus_iwmflop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_floppy_device(mconfig, A2BUS_IWM_FDC, "Apple IWM floppy card", tag, owner, clock, "a2iwm_flop", __FILE__)
{
}
@@ -128,7 +128,7 @@ void a2bus_floppy_device::device_reset()
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_floppy_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_floppy_device::read_c0nx(address_space &space, uint8_t offset)
{
return m_fdc->read(offset);
}
@@ -138,7 +138,7 @@ UINT8 a2bus_floppy_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_floppy_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_floppy_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
m_fdc->write(offset, data);
}
@@ -147,7 +147,7 @@ void a2bus_floppy_device::write_c0nx(address_space &space, UINT8 offset, UINT8 d
read_cnxx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_floppy_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_floppy_device::read_cnxx(address_space &space, uint8_t offset)
{
return m_rom[offset];
}
diff --git a/src/devices/bus/a2bus/a2diskii.h b/src/devices/bus/a2bus/a2diskii.h
index 75363e244ed..622369e25fc 100644
--- a/src/devices/bus/a2bus/a2diskii.h
+++ b/src/devices/bus/a2bus/a2diskii.h
@@ -25,7 +25,7 @@ class a2bus_floppy_device:
{
public:
// construction/destruction
- a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -36,26 +36,26 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
required_device<applefdc_base_device> m_fdc;
private:
- UINT8 *m_rom;
+ uint8_t *m_rom;
};
class a2bus_diskii_device: public a2bus_floppy_device
{
public:
- a2bus_diskii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ 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 clock);
+ a2bus_iwmflop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
diff --git a/src/devices/bus/a2bus/a2diskiing.cpp b/src/devices/bus/a2bus/a2diskiing.cpp
index cf83f6d16df..749bd0000c0 100644
--- a/src/devices/bus/a2bus/a2diskiing.cpp
+++ b/src/devices/bus/a2bus/a2diskiing.cpp
@@ -68,7 +68,7 @@ const tiny_rom_entry *a2bus_diskiing_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_diskiing_device::a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_diskiing_device::a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_DISKIING, "Apple Disk II NG controller", tag, owner, clock, "a2diskiing", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_wozfdc(*this, WOZFDC_TAG),
@@ -98,7 +98,7 @@ void a2bus_diskiing_device::device_reset()
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_diskiing_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_diskiing_device::read_c0nx(address_space &space, uint8_t offset)
{
return m_wozfdc->read(space, offset);
}
@@ -108,7 +108,7 @@ UINT8 a2bus_diskiing_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_diskiing_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_diskiing_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
m_wozfdc->write(space, offset, data);
}
@@ -117,7 +117,7 @@ void a2bus_diskiing_device::write_c0nx(address_space &space, UINT8 offset, UINT8
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_diskiing_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_diskiing_device::read_cnxx(address_space &space, uint8_t offset)
{
return m_rom[offset];
}
diff --git a/src/devices/bus/a2bus/a2diskiing.h b/src/devices/bus/a2bus/a2diskiing.h
index f1ac98cc8c0..164476fe381 100644
--- a/src/devices/bus/a2bus/a2diskiing.h
+++ b/src/devices/bus/a2bus/a2diskiing.h
@@ -28,7 +28,7 @@ class a2bus_diskiing_device:
{
public:
// construction/destruction
- a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,16 +41,16 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
private:
required_device<diskii_fdc> m_wozfdc;
required_device<floppy_connector> floppy0;
required_device<floppy_connector> floppy1;
- const UINT8 *m_rom;
+ const uint8_t *m_rom;
};
// device type definition
diff --git a/src/devices/bus/a2bus/a2dx1.cpp b/src/devices/bus/a2bus/a2dx1.cpp
index aa2281eff1e..158403ee10c 100644
--- a/src/devices/bus/a2bus/a2dx1.cpp
+++ b/src/devices/bus/a2bus/a2dx1.cpp
@@ -49,7 +49,7 @@ machine_config_constructor a2bus_dx1_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_dac(*this, "dac"),
@@ -57,7 +57,7 @@ a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, device_type ty
{
}
-a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_DX1, "Decillonix DX-1", tag, owner, clock, "a2dx1", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_dac(*this, "dac"),
@@ -75,7 +75,7 @@ void a2bus_dx1_device::device_start()
set_a2bus_device();
}
-UINT8 a2bus_dx1_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_dx1_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset)
{
@@ -92,7 +92,7 @@ UINT8 a2bus_dx1_device::read_c0nx(address_space &space, UINT8 offset)
return 0xff;
}
-void a2bus_dx1_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_dx1_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/devices/bus/a2bus/a2dx1.h b/src/devices/bus/a2bus/a2dx1.h
index 3dcf59e81e3..1f68489ce52 100644
--- a/src/devices/bus/a2bus/a2dx1.h
+++ b/src/devices/bus/a2bus/a2dx1.h
@@ -25,8 +25,8 @@ class a2bus_dx1_device:
{
public:
// construction/destruction
- a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -38,8 +38,8 @@ protected:
virtual void device_start() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
virtual bool take_c800() override;
};
diff --git a/src/devices/bus/a2bus/a2eauxslot.cpp b/src/devices/bus/a2bus/a2eauxslot.cpp
index c362c23abe5..e8588f31260 100644
--- a/src/devices/bus/a2bus/a2eauxslot.cpp
+++ b/src/devices/bus/a2bus/a2eauxslot.cpp
@@ -25,7 +25,7 @@ const device_type A2EAUXSLOT_SLOT = &device_creator<a2eauxslot_slot_device>;
//-------------------------------------------------
// a2eauxslot_slot_device - constructor
//-------------------------------------------------
-a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2EAUXSLOT_SLOT, "Apple IIe AUX Slot", tag, owner, clock, "a2eauxslot_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_a2eauxslot_tag(nullptr),
@@ -33,7 +33,7 @@ a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, co
{
}
-a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this), m_a2eauxslot_tag(nullptr), m_a2eauxslot_slottag(nullptr)
{
@@ -77,14 +77,14 @@ void a2eauxslot_device::static_set_cputag(device_t &device, const char *tag)
// a2eauxslot_device - constructor
//-------------------------------------------------
-a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2EAUXSLOT, "Apple IIe AUX Bus", tag, owner, clock, "a2eauxslot", __FILE__), m_maincpu(nullptr),
m_out_irq_cb(*this),
m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)
{
}
-a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr),
m_out_irq_cb(*this),
m_out_nmi_cb(*this), m_device(nullptr), m_cputag(nullptr)
diff --git a/src/devices/bus/a2bus/a2eauxslot.h b/src/devices/bus/a2bus/a2eauxslot.h
index 06d83a9435d..f040ea56fa6 100644
--- a/src/devices/bus/a2bus/a2eauxslot.h
+++ b/src/devices/bus/a2bus/a2eauxslot.h
@@ -47,8 +47,8 @@ class a2eauxslot_slot_device : public device_t,
{
public:
// construction/destruction
- a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -71,8 +71,8 @@ class a2eauxslot_device : public device_t
{
public:
// construction/destruction
- a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2eauxslot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
@@ -118,11 +118,11 @@ public:
device_a2eauxslot_card_interface(const machine_config &mconfig, device_t &device);
virtual ~device_a2eauxslot_card_interface();
- virtual UINT8 read_auxram(UINT16 offset) { printf("a2eauxslot: unhandled auxram read @ %04x\n", offset); return 0xff; }
- virtual void write_auxram(UINT16 offset, UINT8 data) { printf("a2eauxslot: unhandled auxram write %02x @ %04x\n", data, offset); }
- virtual void write_c07x(address_space &space, UINT8 offset, UINT8 data) {}
- virtual UINT8 *get_vram_ptr() = 0;
- virtual UINT8 *get_auxbank_ptr() = 0;
+ virtual uint8_t read_auxram(uint16_t offset) { printf("a2eauxslot: unhandled auxram read @ %04x\n", offset); return 0xff; }
+ virtual void write_auxram(uint16_t offset, uint8_t data) { printf("a2eauxslot: unhandled auxram write %02x @ %04x\n", data, offset); }
+ virtual void write_c07x(address_space &space, uint8_t offset, uint8_t data) {}
+ virtual uint8_t *get_vram_ptr() = 0;
+ virtual uint8_t *get_auxbank_ptr() = 0;
virtual bool allow_dhr() { return true; }
device_a2eauxslot_card_interface *next() const { return m_next; }
diff --git a/src/devices/bus/a2bus/a2echoii.cpp b/src/devices/bus/a2bus/a2echoii.cpp
index e6be96b5d85..ee8e318da31 100644
--- a/src/devices/bus/a2bus/a2echoii.cpp
+++ b/src/devices/bus/a2bus/a2echoii.cpp
@@ -48,14 +48,14 @@ machine_config_constructor a2bus_echoii_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
}
-a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_ECHOII, "Street Electronics Echo II", tag, owner, clock, "a2echoii", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
@@ -76,7 +76,7 @@ void a2bus_echoii_device::device_reset()
{
}
-UINT8 a2bus_echoii_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_echoii_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset)
{
@@ -87,7 +87,7 @@ UINT8 a2bus_echoii_device::read_c0nx(address_space &space, UINT8 offset)
return 0;
}
-void a2bus_echoii_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_echoii_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/devices/bus/a2bus/a2echoii.h b/src/devices/bus/a2bus/a2echoii.h
index 70a83b5fd8b..a148bded238 100644
--- a/src/devices/bus/a2bus/a2echoii.h
+++ b/src/devices/bus/a2bus/a2echoii.h
@@ -25,8 +25,8 @@ class a2bus_echoii_device:
{
public:
// construction/destruction
- a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -38,8 +38,8 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
virtual bool take_c800() override;
};
diff --git a/src/devices/bus/a2bus/a2eext80col.cpp b/src/devices/bus/a2bus/a2eext80col.cpp
index c3e9af48cac..1d2f6ae4e74 100644
--- a/src/devices/bus/a2bus/a2eext80col.cpp
+++ b/src/devices/bus/a2bus/a2eext80col.cpp
@@ -27,13 +27,13 @@ const device_type A2EAUX_EXT80COL = &device_creator<a2eaux_ext80col_device>;
// LIVE DEVICE
//**************************************************************************
-a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2EAUX_EXT80COL, "Apple IIe Extended 80-Column Card", tag, owner, clock, "a2eext80", __FILE__),
device_a2eauxslot_card_interface(mconfig, *this)
{
}
-a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2eauxslot_card_interface(mconfig, *this)
{
@@ -54,22 +54,22 @@ void a2eaux_ext80col_device::device_reset()
{
}
-UINT8 a2eaux_ext80col_device::read_auxram(UINT16 offset)
+uint8_t a2eaux_ext80col_device::read_auxram(uint16_t offset)
{
return m_ram[offset];
}
-void a2eaux_ext80col_device::write_auxram(UINT16 offset, UINT8 data)
+void a2eaux_ext80col_device::write_auxram(uint16_t offset, uint8_t data)
{
m_ram[offset] = data;
}
-UINT8 *a2eaux_ext80col_device::get_vram_ptr()
+uint8_t *a2eaux_ext80col_device::get_vram_ptr()
{
return &m_ram[0];
}
-UINT8 *a2eaux_ext80col_device::get_auxbank_ptr()
+uint8_t *a2eaux_ext80col_device::get_auxbank_ptr()
{
return &m_ram[0];
}
diff --git a/src/devices/bus/a2bus/a2eext80col.h b/src/devices/bus/a2bus/a2eext80col.h
index 01c56a7a714..2d6958c3639 100644
--- a/src/devices/bus/a2bus/a2eext80col.h
+++ b/src/devices/bus/a2bus/a2eext80col.h
@@ -24,21 +24,21 @@ class a2eaux_ext80col_device:
{
public:
// construction/destruction
- a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_auxram(UINT16 offset) override;
- virtual void write_auxram(UINT16 offset, UINT8 data) override;
- virtual UINT8 *get_vram_ptr() override;
- virtual UINT8 *get_auxbank_ptr() override;
+ virtual uint8_t read_auxram(uint16_t offset) override;
+ virtual void write_auxram(uint16_t offset, uint8_t data) override;
+ virtual uint8_t *get_vram_ptr() override;
+ virtual uint8_t *get_auxbank_ptr() override;
virtual bool allow_dhr() override { return true; }
private:
- UINT8 m_ram[64*1024];
+ uint8_t m_ram[64*1024];
};
// device type definition
diff --git a/src/devices/bus/a2bus/a2eramworks3.cpp b/src/devices/bus/a2bus/a2eramworks3.cpp
index b7d6897b82d..c0a0e2c016d 100644
--- a/src/devices/bus/a2bus/a2eramworks3.cpp
+++ b/src/devices/bus/a2bus/a2eramworks3.cpp
@@ -28,14 +28,14 @@ const device_type A2EAUX_RAMWORKS3 = &device_creator<a2eaux_ramworks3_device>;
// LIVE DEVICE
//**************************************************************************
-a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2EAUX_RAMWORKS3, "Applied Engineering RamWorks III", tag, owner, clock, "a2erwks3", __FILE__),
device_a2eauxslot_card_interface(mconfig, *this),
m_bank(0)
{
}
-a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2eauxslot_card_interface(mconfig, *this), m_bank(0)
{
@@ -57,22 +57,22 @@ void a2eaux_ramworks3_device::device_reset()
m_bank = 0;
}
-UINT8 a2eaux_ramworks3_device::read_auxram(UINT16 offset)
+uint8_t a2eaux_ramworks3_device::read_auxram(uint16_t offset)
{
return m_ram[offset+m_bank];
}
-void a2eaux_ramworks3_device::write_auxram(UINT16 offset, UINT8 data)
+void a2eaux_ramworks3_device::write_auxram(uint16_t offset, uint8_t data)
{
m_ram[offset+m_bank] = data;
}
-UINT8 *a2eaux_ramworks3_device::get_vram_ptr()
+uint8_t *a2eaux_ramworks3_device::get_vram_ptr()
{
return &m_ram[0];
}
-UINT8 *a2eaux_ramworks3_device::get_auxbank_ptr()
+uint8_t *a2eaux_ramworks3_device::get_auxbank_ptr()
{
return &m_ram[m_bank];
}
@@ -90,7 +90,7 @@ UINT8 *a2eaux_ramworks3_device::get_auxbank_ptr()
However, the software will recognize and correctly use a configuration in which
all of banks 00-7F are populated for a total of 8 megabytes. So that's what we do.
*/
-void a2eaux_ramworks3_device::write_c07x(address_space &space, UINT8 offset, UINT8 data)
+void a2eaux_ramworks3_device::write_c07x(address_space &space, uint8_t offset, uint8_t data)
{
// write to C073?
if (offset == 3)
diff --git a/src/devices/bus/a2bus/a2eramworks3.h b/src/devices/bus/a2bus/a2eramworks3.h
index 7978a405512..c5b2a7e04f1 100644
--- a/src/devices/bus/a2bus/a2eramworks3.h
+++ b/src/devices/bus/a2bus/a2eramworks3.h
@@ -24,22 +24,22 @@ class a2eaux_ramworks3_device:
{
public:
// construction/destruction
- a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_auxram(UINT16 offset) override;
- virtual void write_auxram(UINT16 offset, UINT8 data) override;
- virtual UINT8 *get_vram_ptr() override;
- virtual UINT8 *get_auxbank_ptr() override;
+ virtual uint8_t read_auxram(uint16_t offset) override;
+ virtual void write_auxram(uint16_t offset, uint8_t data) override;
+ virtual uint8_t *get_vram_ptr() override;
+ virtual uint8_t *get_auxbank_ptr() override;
virtual bool allow_dhr() override { return true; }
- virtual void write_c07x(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual void write_c07x(address_space &space, uint8_t offset, uint8_t data) override;
private:
- UINT8 m_ram[8*1024*1024];
+ uint8_t m_ram[8*1024*1024];
int m_bank;
};
diff --git a/src/devices/bus/a2bus/a2estd80col.cpp b/src/devices/bus/a2bus/a2estd80col.cpp
index 706f32d6a55..c6982aafa83 100644
--- a/src/devices/bus/a2bus/a2estd80col.cpp
+++ b/src/devices/bus/a2bus/a2estd80col.cpp
@@ -27,13 +27,13 @@ const device_type A2EAUX_STD80COL = &device_creator<a2eaux_std80col_device>;
// LIVE DEVICE
//**************************************************************************
-a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2EAUX_STD80COL, "Apple IIe Standard 80-Column Card", tag, owner, clock, "a2estd80", __FILE__),
device_a2eauxslot_card_interface(mconfig, *this)
{
}
-a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2eauxslot_card_interface(mconfig, *this)
{
@@ -53,7 +53,7 @@ void a2eaux_std80col_device::device_reset()
{
}
-UINT8 a2eaux_std80col_device::read_auxram(UINT16 offset)
+uint8_t a2eaux_std80col_device::read_auxram(uint16_t offset)
{
if (offset < 0x800)
{
@@ -63,7 +63,7 @@ UINT8 a2eaux_std80col_device::read_auxram(UINT16 offset)
return 0xff;
}
-void a2eaux_std80col_device::write_auxram(UINT16 offset, UINT8 data)
+void a2eaux_std80col_device::write_auxram(uint16_t offset, uint8_t data)
{
if (offset < 0x800)
{
@@ -71,12 +71,12 @@ void a2eaux_std80col_device::write_auxram(UINT16 offset, UINT8 data)
}
}
-UINT8 *a2eaux_std80col_device::get_vram_ptr()
+uint8_t *a2eaux_std80col_device::get_vram_ptr()
{
return &m_ram[0];
}
-UINT8 *a2eaux_std80col_device::get_auxbank_ptr()
+uint8_t *a2eaux_std80col_device::get_auxbank_ptr()
{
return &m_ram[0];
}
diff --git a/src/devices/bus/a2bus/a2estd80col.h b/src/devices/bus/a2bus/a2estd80col.h
index 3c76459e951..420b7334a4f 100644
--- a/src/devices/bus/a2bus/a2estd80col.h
+++ b/src/devices/bus/a2bus/a2estd80col.h
@@ -24,21 +24,21 @@ class a2eaux_std80col_device:
{
public:
// construction/destruction
- a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_auxram(UINT16 offset) override;
- virtual void write_auxram(UINT16 offset, UINT8 data) override;
- virtual UINT8 *get_vram_ptr() override;
- virtual UINT8 *get_auxbank_ptr() override;
+ virtual uint8_t read_auxram(uint16_t offset) override;
+ virtual void write_auxram(uint16_t offset, uint8_t data) override;
+ virtual uint8_t *get_vram_ptr() override;
+ virtual uint8_t *get_auxbank_ptr() override;
virtual bool allow_dhr() override { return false; } // we don't allow DHR
private:
- UINT8 m_ram[2*1024];
+ uint8_t m_ram[2*1024];
};
// device type definition
diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp
index a9869d57f4d..e8e5f4b98e4 100644
--- a/src/devices/bus/a2bus/a2hsscsi.cpp
+++ b/src/devices/bus/a2bus/a2hsscsi.cpp
@@ -113,7 +113,7 @@ const tiny_rom_entry *a2bus_hsscsi_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_ncr5380(*this, SCSI_5380_TAG),
@@ -121,7 +121,7 @@ a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, device_t
{
}
-a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_HSSCSI, "Apple II High-Speed SCSI Card", tag, owner, clock, "a2hsscsi", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_ncr5380(*this, SCSI_5380_TAG),
@@ -163,7 +163,7 @@ void a2bus_hsscsi_device::device_reset()
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_hsscsi_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_hsscsi_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset)
{
@@ -200,7 +200,7 @@ UINT8 a2bus_hsscsi_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_hsscsi_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_hsscsi_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset)
{
@@ -263,13 +263,13 @@ void a2bus_hsscsi_device::write_c0nx(address_space &space, UINT8 offset, UINT8 d
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_hsscsi_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_hsscsi_device::read_cnxx(address_space &space, uint8_t offset)
{
// one slot image at the start of the ROM, it appears
return m_rom[offset];
}
-void a2bus_hsscsi_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_hsscsi_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
{
// printf("Write %02x to cn%02x (PC=%x)\n", data, offset, space.device().safe_pc());
}
@@ -278,7 +278,7 @@ void a2bus_hsscsi_device::write_cnxx(address_space &space, UINT8 offset, UINT8 d
read_c800 - called for reads from this card's c800 space
-------------------------------------------------*/
-UINT8 a2bus_hsscsi_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_hsscsi_device::read_c800(address_space &space, uint16_t offset)
{
// bankswitched RAM at c800-cbff
// bankswitched ROM at cc00-cfff
@@ -301,7 +301,7 @@ UINT8 a2bus_hsscsi_device::read_c800(address_space &space, UINT16 offset)
/*-------------------------------------------------
write_c800 - called for writes to this card's c800 space
-------------------------------------------------*/
-void a2bus_hsscsi_device::write_c800(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_hsscsi_device::write_c800(address_space &space, uint16_t offset, uint8_t data)
{
if (offset < 0x400)
{
diff --git a/src/devices/bus/a2bus/a2hsscsi.h b/src/devices/bus/a2bus/a2hsscsi.h
index 11f2ae7a48a..4689c997c86 100644
--- a/src/devices/bus/a2bus/a2hsscsi.h
+++ b/src/devices/bus/a2bus/a2hsscsi.h
@@ -25,8 +25,8 @@ class a2bus_hsscsi_device:
{
public:
// construction/destruction
- a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -42,21 +42,21 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
- virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
- virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+ virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+ virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
private:
- UINT8 *m_rom;
- UINT8 m_ram[8192]; // 8 banks of 1024 bytes
+ uint8_t *m_rom;
+ uint8_t m_ram[8192]; // 8 banks of 1024 bytes
int m_rambank, m_rombank;
- UINT8 m_drq;
- UINT8 m_bank;
+ uint8_t m_drq;
+ uint8_t m_bank;
bool m_816block;
- UINT8 m_c0ne, m_c0nf;
+ uint8_t m_c0ne, m_c0nf;
};
// device type definition
diff --git a/src/devices/bus/a2bus/a2lang.cpp b/src/devices/bus/a2bus/a2lang.cpp
index 9a0b21dca36..3c156fd4c90 100644
--- a/src/devices/bus/a2bus/a2lang.cpp
+++ b/src/devices/bus/a2bus/a2lang.cpp
@@ -34,14 +34,14 @@ const device_type A2BUS_LANG = &device_creator<a2bus_lang_device>;
// LIVE DEVICE
//**************************************************************************
-a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_LANG, "Apple II Language Card", tag, owner, clock, "a2lang", __FILE__),
device_a2bus_card_interface(mconfig, *this)
{
last_offset = -1;
}
-a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_lang_device::a2bus_lang_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this)
{
@@ -70,7 +70,7 @@ void a2bus_lang_device::device_reset()
void a2bus_lang_device::langcard_touch(offs_t offset)
{
- UINT32 val, mask;
+ uint32_t val, mask;
if (LOG_LANGCARD)
logerror("language card bankswitch read, offset: $c08%0x\n", offset);
@@ -104,7 +104,7 @@ void a2bus_lang_device::langcard_touch(offs_t offset)
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_lang_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_lang_device::read_c0nx(address_space &space, uint8_t offset)
{
apple2_state *state = machine().driver_data<apple2_state>();
@@ -138,7 +138,7 @@ UINT8 a2bus_lang_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_lang_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_lang_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
langcard_touch(offset);
last_offset = -1;
diff --git a/src/devices/bus/a2bus/a2lang.h b/src/devices/bus/a2bus/a2lang.h
index 2fd14b5bd86..4d4bdc4aa81 100644
--- a/src/devices/bus/a2bus/a2lang.h
+++ b/src/devices/bus/a2bus/a2lang.h
@@ -24,15 +24,15 @@ class a2bus_lang_device:
{
public:
// construction/destruction
- a2bus_lang_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_lang_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_lang_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_lang_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
private:
void langcard_touch(offs_t offset);
diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp
index ad7f621d6c8..57abe911fd0 100644
--- a/src/devices/bus/a2bus/a2mcms.cpp
+++ b/src/devices/bus/a2bus/a2mcms.cpp
@@ -68,14 +68,14 @@ machine_config_constructor a2bus_mcms1_device::device_mconfig_additions() const
// LIVE DEVICE - Card 1
//**************************************************************************
-a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_mcms(*this, ENGINE_TAG)
{
}
-a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_MCMS1, "Mountain Computer Music System (card 1)", tag, owner, clock, "a2mcms1", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_mcms(*this, ENGINE_TAG)
@@ -99,7 +99,7 @@ void a2bus_mcms1_device::device_reset()
// read once at c0n0 to disable 125 Hz IRQs
// read once at c0n1 to enable 125 Hz IRQs
-UINT8 a2bus_mcms1_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_mcms1_device::read_c0nx(address_space &space, uint8_t offset)
{
if (offset == 0)
{
@@ -114,13 +114,13 @@ UINT8 a2bus_mcms1_device::read_c0nx(address_space &space, UINT8 offset)
}
// read at Cn00: light gun in bit 7, bits 0-5 = 'random' number
-UINT8 a2bus_mcms1_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_mcms1_device::read_cnxx(address_space &space, uint8_t offset)
{
return m_mcms->get_pen_rand();
}
// write 0-255 to Cn00 to set the master volume
-void a2bus_mcms1_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_mcms1_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
{
if (offset == 0)
{
@@ -149,13 +149,13 @@ WRITE_LINE_MEMBER(a2bus_mcms1_device::irq_w)
// LIVE DEVICE - Card 2
//**************************************************************************
-a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this), m_card1(nullptr), m_engine(nullptr)
{
}
-a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_MCMS2, "Mountain Computer Music System (card 2)", tag, owner, clock, "a2mcms2", __FILE__),
device_a2bus_card_interface(mconfig, *this), m_card1(nullptr), m_engine(nullptr)
{
@@ -183,14 +183,14 @@ void a2bus_mcms2_device::device_reset()
}
// here to soak up false reads from indexed accesses
-UINT8 a2bus_mcms2_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_mcms2_device::read_c0nx(address_space &space, uint8_t offset)
{
return 0xff;
}
// write once to c0n0 to disable the card (reset also disables)
// write twice to c0n1 to enable the card (value doesn't matter)
-void a2bus_mcms2_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_mcms2_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
if (offset == 0)
{
@@ -202,7 +202,7 @@ void a2bus_mcms2_device::write_c0nx(address_space &space, UINT8 offset, UINT8 da
}
}
-void a2bus_mcms2_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_mcms2_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
{
m_engine->voiceregs_w(space, offset, data);
}
@@ -212,7 +212,7 @@ void a2bus_mcms2_device::write_cnxx(address_space &space, UINT8 offset, UINT8 da
Sound device implementation
*/
-mcms_device::mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mcms_device::mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MCMS, "Mountain Computer Music System engine", tag, owner, clock, "msmseng", __FILE__),
device_sound_interface(mconfig, *this),
m_write_irq(*this), m_stream(nullptr), m_timer(nullptr), m_clrtimer(nullptr), m_pBusDevice(nullptr), m_enabled(false), m_mastervol(0), m_rand(0)
@@ -272,9 +272,9 @@ void mcms_device::sound_stream_update(sound_stream &stream, stream_sample_t **in
{
stream_sample_t *outL, *outR;
int i, v;
- UINT16 wptr;
- INT8 sample;
- INT32 mixL, mixR;
+ uint16_t wptr;
+ int8_t sample;
+ int32_t mixL, mixR;
outL = outputs[1];
outR = outputs[0];
diff --git a/src/devices/bus/a2bus/a2mcms.h b/src/devices/bus/a2bus/a2mcms.h
index 5f48b165a12..ff40cd9cf0f 100644
--- a/src/devices/bus/a2bus/a2mcms.h
+++ b/src/devices/bus/a2bus/a2mcms.h
@@ -26,11 +26,11 @@ class mcms_device : public device_t, public device_sound_interface
{
public:
// construction/destruction
- mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_WRITE8_MEMBER(voiceregs_w);
DECLARE_WRITE8_MEMBER(control_w);
- UINT8 get_pen_rand(void) { m_stream->update(); return m_rand; }
+ uint8_t get_pen_rand(void) { m_stream->update(); return m_rand; }
void set_bus_device(a2bus_mcms1_device *pDev) { m_pBusDevice = pDev; }
@@ -50,12 +50,12 @@ private:
emu_timer *m_timer, *m_clrtimer;
a2bus_mcms1_device *m_pBusDevice;
bool m_enabled;
- UINT8 m_vols[16];
- UINT8 m_table[16];
- UINT16 m_freq[16];
- UINT16 m_acc[16];
- UINT8 m_mastervol;
- UINT8 m_rand;
+ uint8_t m_vols[16];
+ uint8_t m_table[16];
+ uint16_t m_freq[16];
+ uint16_t m_acc[16];
+ uint8_t m_mastervol;
+ uint8_t m_rand;
};
// card 1
@@ -65,8 +65,8 @@ class a2bus_mcms1_device:
{
public:
// construction/destruction
- a2bus_mcms1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_mcms1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -83,9 +83,9 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
- virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+ virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
virtual bool take_c800() override { return false; }
};
@@ -96,17 +96,17 @@ class a2bus_mcms2_device:
{
public:
// construction/destruction
- a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual void device_start() override;
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
virtual bool take_c800() override { return false; }
private:
diff --git a/src/devices/bus/a2bus/a2memexp.cpp b/src/devices/bus/a2bus/a2memexp.cpp
index d7177d645d1..f34b71e435d 100644
--- a/src/devices/bus/a2bus/a2memexp.cpp
+++ b/src/devices/bus/a2bus/a2memexp.cpp
@@ -73,13 +73,13 @@ const tiny_rom_entry *a2bus_ramfactor_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_memexp_device::a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_memexp_device::a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this), m_isramfactor(false), m_bankhior(0), m_addrmask(0), m_rom(nullptr), m_wptr(0), m_liveptr(0)
{
}
-a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_memexp_device(mconfig, A2BUS_MEMEXP, "Apple II Memory Expansion Card", tag, owner, clock, "a2memexp", __FILE__)
{
m_isramfactor = false;
@@ -87,7 +87,7 @@ a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig
m_addrmask = 0xfffff;
}
-a2bus_ramfactor_device::a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ramfactor_device::a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_memexp_device(mconfig, A2BUS_RAMFACTOR, "Applied Engineering RamFactor", tag, owner, clock, "a2ramfac", __FILE__)
{
m_isramfactor = true;
@@ -106,7 +106,7 @@ void a2bus_memexp_device::device_start()
m_rom = device().machine().root_device().memregion(this->subtag(MEMEXP_ROM_REGION).c_str())->base();
- memset(m_ram, 0xff, 1024*1024*sizeof(UINT8));
+ memset(m_ram, 0xff, 1024*1024*sizeof(uint8_t));
save_item(NAME(m_regs));
save_item(NAME(m_ram));
@@ -116,7 +116,7 @@ void a2bus_memexp_device::device_start()
void a2bus_memexp_device::device_reset()
{
- memset(m_regs, 0, sizeof(UINT8) * 0x10);
+ memset(m_regs, 0, sizeof(uint8_t) * 0x10);
m_wptr = m_liveptr = 0;
}
@@ -125,9 +125,9 @@ void a2bus_memexp_device::device_reset()
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_memexp_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_memexp_device::read_c0nx(address_space &space, uint8_t offset)
{
- UINT8 retval = m_regs[offset];
+ uint8_t retval = m_regs[offset];
if (offset == 3)
{
@@ -149,7 +149,7 @@ UINT8 a2bus_memexp_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_memexp_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_memexp_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
// printf("Write %02x to c0n%x (PC=%x)\n", data, offset, space.device().safe_pc());
@@ -201,7 +201,7 @@ void a2bus_memexp_device::write_c0nx(address_space &space, UINT8 offset, UINT8 d
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_memexp_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_memexp_device::read_cnxx(address_space &space, uint8_t offset)
{
int slotimg = m_slot * 0x100;
@@ -218,7 +218,7 @@ UINT8 a2bus_memexp_device::read_cnxx(address_space &space, UINT8 offset)
read_c800 - called for reads from this card's c800 space
-------------------------------------------------*/
-UINT8 a2bus_memexp_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_memexp_device::read_c800(address_space &space, uint16_t offset)
{
// c70a diags confirm: bit 1 of cn0F banks in the second half of the ROM
if ((m_isramfactor) && (m_regs[0xf] & 0x01))
diff --git a/src/devices/bus/a2bus/a2memexp.h b/src/devices/bus/a2bus/a2memexp.h
index c953e0f7bf8..dc6448323c5 100644
--- a/src/devices/bus/a2bus/a2memexp.h
+++ b/src/devices/bus/a2bus/a2memexp.h
@@ -24,14 +24,14 @@ class a2bus_memexp_device:
{
public:
// construction/destruction
- a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
bool m_isramfactor;
- UINT8 m_bankhior;
+ uint8_t m_bankhior;
int m_addrmask;
protected:
@@ -39,28 +39,28 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
- virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+ virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
private:
- UINT8 *m_rom;
- UINT8 m_regs[0x10];
- UINT8 m_ram[8*1024*1024];
+ uint8_t *m_rom;
+ uint8_t m_regs[0x10];
+ uint8_t m_ram[8*1024*1024];
int m_wptr, m_liveptr;
};
class a2bus_memexpapple_device : public a2bus_memexp_device
{
public:
- a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class a2bus_ramfactor_device : public a2bus_memexp_device
{
public:
- a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
diff --git a/src/devices/bus/a2bus/a2midi.cpp b/src/devices/bus/a2bus/a2midi.cpp
index 79281f85ee2..b7262560fb3 100644
--- a/src/devices/bus/a2bus/a2midi.cpp
+++ b/src/devices/bus/a2bus/a2midi.cpp
@@ -59,7 +59,7 @@ machine_config_constructor a2bus_midi_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_MIDI, "6850 MIDI card", tag, owner, clock, "a2midi", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_ptm(*this, MIDI_PTM_TAG),
@@ -68,7 +68,7 @@ a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, const char *
{
}
-a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_ptm(*this, MIDI_PTM_TAG),
@@ -96,7 +96,7 @@ void a2bus_midi_device::device_reset()
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_midi_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_midi_device::read_c0nx(address_space &space, uint8_t offset)
{
// PTM at C0n0-C0n7, ACIA at C0n8-C0n9, drum sync (?) at C0nA-C0nB
@@ -110,7 +110,7 @@ UINT8 a2bus_midi_device::read_c0nx(address_space &space, UINT8 offset)
}
else if (offset == 9)
{
- UINT8 ret = m_acia->data_r(space, 0);
+ uint8_t ret = m_acia->data_r(space, 0);
return ret;
}
@@ -121,7 +121,7 @@ UINT8 a2bus_midi_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_midi_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_midi_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
if (offset < 8)
{
diff --git a/src/devices/bus/a2bus/a2midi.h b/src/devices/bus/a2bus/a2midi.h
index 9f3abfe0f7f..3442805ed49 100644
--- a/src/devices/bus/a2bus/a2midi.h
+++ b/src/devices/bus/a2bus/a2midi.h
@@ -25,8 +25,8 @@ class a2bus_midi_device:
{
public:
// construction/destruction
- a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -39,8 +39,8 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
required_device<ptm6840_device> m_ptm;
required_device<acia6850_device> m_acia;
diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp
index 749c14621fa..565f1a472f7 100644
--- a/src/devices/bus/a2bus/a2mockingboard.cpp
+++ b/src/devices/bus/a2bus/a2mockingboard.cpp
@@ -120,7 +120,7 @@ machine_config_constructor a2bus_echoplus_device::device_mconfig_additions() con
// LIVE DEVICE
//**************************************************************************
-a2bus_ayboard_device::a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_ayboard_device::a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_via1(*this, VIA1_TAG),
@@ -132,21 +132,21 @@ a2bus_ayboard_device::a2bus_ayboard_device(const machine_config &mconfig, device
{
}
-a2bus_mockingboard_device::a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_mockingboard_device::a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_ayboard_device(mconfig, A2BUS_MOCKINGBOARD, "Sweet Micro Systems Mockingboard", tag, owner, clock, "a2mockbd", __FILE__)
{
m_isPhasor = false;
m_PhasorNative = false;
}
-a2bus_phasor_device::a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_phasor_device::a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_ayboard_device(mconfig, A2BUS_PHASOR, "Applied Engineering Phasor", tag, owner, clock, "a2phasor", __FILE__)
{
m_isPhasor = true;
m_PhasorNative = false;
}
-a2bus_echoplus_device::a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_echoplus_device::a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_ayboard_device(mconfig, A2BUS_ECHOPLUS, "Street Electronics Echo Plus", tag, owner, clock, "a2echop", __FILE__),
m_tms(*this, E2P_TMS_TAG)
{
@@ -176,12 +176,12 @@ void a2bus_ayboard_device::device_reset()
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_ayboard_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_ayboard_device::read_cnxx(address_space &space, uint8_t offset)
{
// printf("Mockingboard(%d): read @ Cn%02X (PC=%x)\n", m_slot, offset, space.device().safe_pc());
if (m_isPhasor)
{
- UINT8 retVal = 0;
+ uint8_t retVal = 0;
int viaSel;
if (m_PhasorNative)
@@ -227,7 +227,7 @@ UINT8 a2bus_ayboard_device::read_cnxx(address_space &space, UINT8 offset)
write_cnxx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_ayboard_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_ayboard_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
{
if (m_isPhasor)
{
@@ -488,7 +488,7 @@ WRITE8_MEMBER( a2bus_ayboard_device::via2_out_b )
}
}
-UINT8 a2bus_ayboard_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_ayboard_device::read_c0nx(address_space &space, uint8_t offset)
{
if (m_isPhasor)
{
@@ -498,7 +498,7 @@ UINT8 a2bus_ayboard_device::read_c0nx(address_space &space, UINT8 offset)
return 0xff;
}
-void a2bus_ayboard_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_ayboard_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
if (m_isPhasor)
{
@@ -506,7 +506,7 @@ void a2bus_ayboard_device::write_c0nx(address_space &space, UINT8 offset, UINT8
}
}
-UINT8 a2bus_echoplus_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_echoplus_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset)
{
@@ -517,7 +517,7 @@ UINT8 a2bus_echoplus_device::read_c0nx(address_space &space, UINT8 offset)
return 0;
}
-void a2bus_echoplus_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_echoplus_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/devices/bus/a2bus/a2mockingboard.h b/src/devices/bus/a2bus/a2mockingboard.h
index 4e7025bbe59..58fc7ac2d96 100644
--- a/src/devices/bus/a2bus/a2mockingboard.h
+++ b/src/devices/bus/a2bus/a2mockingboard.h
@@ -27,7 +27,7 @@ class a2bus_ayboard_device:
{
public:
// construction/destruction
- a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -44,10 +44,10 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
- virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+ virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
required_device<via6522_device> m_via1;
required_device<via6522_device> m_via2;
@@ -59,19 +59,19 @@ protected:
bool m_isPhasor, m_PhasorNative;
private:
- UINT8 m_porta1, m_porta2;
+ uint8_t m_porta1, m_porta2;
};
class a2bus_mockingboard_device : public a2bus_ayboard_device
{
public:
- a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class a2bus_phasor_device : public a2bus_ayboard_device
{
public:
- a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
@@ -79,10 +79,10 @@ public:
class a2bus_echoplus_device : public a2bus_ayboard_device
{
public:
- a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
required_device<tms5220_device> m_tms;
diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp
index 3592b2d582c..4a765febabc 100644
--- a/src/devices/bus/a2bus/a2pic.cpp
+++ b/src/devices/bus/a2bus/a2pic.cpp
@@ -98,7 +98,7 @@ const tiny_rom_entry *a2bus_pic_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_PIC, "Apple Parallel Interface Card", tag, owner, clock, "a2pic", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_dsw1(*this, "DSW1"),
@@ -109,7 +109,7 @@ a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, const char *ta
{
}
-a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_pic_device::a2bus_pic_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_dsw1(*this, "DSW1"),
@@ -163,7 +163,7 @@ void a2bus_pic_device::device_timer(emu_timer &timer, device_timer_id tid, int p
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_pic_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_pic_device::read_cnxx(address_space &space, uint8_t offset)
{
m_autostrobe = true;
@@ -179,9 +179,9 @@ UINT8 a2bus_pic_device::read_cnxx(address_space &space, UINT8 offset)
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_pic_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_pic_device::read_c0nx(address_space &space, uint8_t offset)
{
- UINT8 rv = 0;
+ uint8_t rv = 0;
switch (offset)
{
@@ -222,7 +222,7 @@ UINT8 a2bus_pic_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_pic_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_pic_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset)
{
@@ -255,7 +255,7 @@ WRITE_LINE_MEMBER( a2bus_pic_device::ack_w )
{
if (m_started)
{
- UINT8 dsw1 = m_dsw1->read();
+ uint8_t dsw1 = m_dsw1->read();
if (dsw1 & 0x10) // negative polarity
{
diff --git a/src/devices/bus/a2bus/a2pic.h b/src/devices/bus/a2bus/a2pic.h
index 9e5df928f9b..83ff5bd2fa4 100644
--- a/src/devices/bus/a2bus/a2pic.h
+++ b/src/devices/bus/a2bus/a2pic.h
@@ -24,8 +24,8 @@ class a2bus_pic_device:
{
public:
// construction/destruction
- a2bus_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_pic_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_pic_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,9 +41,9 @@ protected:
virtual void device_reset() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
required_device<centronics_device> m_ctx;
required_device<input_buffer_device> m_ctx_data_in;
@@ -53,9 +53,9 @@ protected:
void clear_strobe();
private:
- UINT8 *m_rom;
+ uint8_t *m_rom;
bool m_started;
- UINT8 m_ack;
+ uint8_t m_ack;
bool m_irqenable;
bool m_autostrobe;
emu_timer *m_timer;
diff --git a/src/devices/bus/a2bus/a2sam.cpp b/src/devices/bus/a2bus/a2sam.cpp
index 4d106f99d98..e8b6f811754 100644
--- a/src/devices/bus/a2bus/a2sam.cpp
+++ b/src/devices/bus/a2bus/a2sam.cpp
@@ -47,7 +47,7 @@ machine_config_constructor a2bus_sam_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-a2bus_sam_device::a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_sam_device::a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_SAM, "Don't Ask Software SAM", tag, owner, clock, "a2sam", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_dac(*this, "dac")
@@ -68,7 +68,7 @@ void a2bus_sam_device::device_reset()
{
}
-void a2bus_sam_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_sam_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
m_dac->write(data);
}
diff --git a/src/devices/bus/a2bus/a2sam.h b/src/devices/bus/a2bus/a2sam.h
index cbf328454bd..2f0d898fb34 100644
--- a/src/devices/bus/a2bus/a2sam.h
+++ b/src/devices/bus/a2bus/a2sam.h
@@ -25,7 +25,7 @@ class a2bus_sam_device:
{
public:
// construction/destruction
- a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -37,7 +37,7 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
virtual bool take_c800() override;
};
diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp
index 7b154901ec5..f1da850482d 100644
--- a/src/devices/bus/a2bus/a2scsi.cpp
+++ b/src/devices/bus/a2bus/a2scsi.cpp
@@ -106,7 +106,7 @@ const tiny_rom_entry *a2bus_scsi_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_ncr5380(*this, SCSI_5380_TAG),
@@ -114,7 +114,7 @@ a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, device_type
{
}
-a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_SCSI, "Apple II SCSI Card", tag, owner, clock, "a2scsi", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_ncr5380(*this, SCSI_5380_TAG),
@@ -154,7 +154,7 @@ void a2bus_scsi_device::device_reset()
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_scsi_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_scsi_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset)
{
@@ -194,7 +194,7 @@ UINT8 a2bus_scsi_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_scsi_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_scsi_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset)
{
@@ -262,13 +262,13 @@ void a2bus_scsi_device::write_c0nx(address_space &space, UINT8 offset, UINT8 dat
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_scsi_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_scsi_device::read_cnxx(address_space &space, uint8_t offset)
{
// one slot image at the start of the ROM, it appears
return m_rom[offset];
}
-void a2bus_scsi_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_scsi_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
{
// there are writes to cn0A, possibly misguided C0nA (bank select?) writes?
// printf("Write %02x to cn%02x (PC=%x)\n", data, offset, space.device().safe_pc());
@@ -278,7 +278,7 @@ void a2bus_scsi_device::write_cnxx(address_space &space, UINT8 offset, UINT8 dat
read_c800 - called for reads from this card's c800 space
-------------------------------------------------*/
-UINT8 a2bus_scsi_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_scsi_device::read_c800(address_space &space, uint16_t offset)
{
// bankswitched RAM at c800-cbff
// bankswitched ROM at cc00-cfff
@@ -301,7 +301,7 @@ UINT8 a2bus_scsi_device::read_c800(address_space &space, UINT16 offset)
/*-------------------------------------------------
write_c800 - called for writes to this card's c800 space
-------------------------------------------------*/
-void a2bus_scsi_device::write_c800(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_scsi_device::write_c800(address_space &space, uint16_t offset, uint8_t data)
{
if (offset < 0x400)
{
diff --git a/src/devices/bus/a2bus/a2scsi.h b/src/devices/bus/a2bus/a2scsi.h
index 09b4ad18fe2..c506dfd94fa 100644
--- a/src/devices/bus/a2bus/a2scsi.h
+++ b/src/devices/bus/a2bus/a2scsi.h
@@ -25,8 +25,8 @@ class a2bus_scsi_device:
{
public:
// construction/destruction
- a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -42,19 +42,19 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
- virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
- virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+ virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+ virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
private:
- UINT8 *m_rom;
- UINT8 m_ram[8192]; // 8 banks of 1024 bytes
+ uint8_t *m_rom;
+ uint8_t m_ram[8192]; // 8 banks of 1024 bytes
int m_rambank, m_rombank;
- UINT8 m_drq;
- UINT8 m_bank;
+ uint8_t m_drq;
+ uint8_t m_bank;
bool m_816block;
};
diff --git a/src/devices/bus/a2bus/a2softcard.cpp b/src/devices/bus/a2bus/a2softcard.cpp
index e7477c468c6..df509e7e079 100644
--- a/src/devices/bus/a2bus/a2softcard.cpp
+++ b/src/devices/bus/a2bus/a2softcard.cpp
@@ -51,14 +51,14 @@ machine_config_constructor a2bus_softcard_device::device_mconfig_additions() con
// LIVE DEVICE
//**************************************************************************
-a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_z80(*this, Z80_TAG), m_bEnabled(false), m_FirstZ80Boot(false)
{
}
-a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_SOFTCARD, "Microsoft SoftCard", tag, owner, clock, "a2softcard", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_z80(*this, Z80_TAG), m_bEnabled(false), m_FirstZ80Boot(false)
@@ -86,7 +86,7 @@ void a2bus_softcard_device::device_reset()
m_z80->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
}
-void a2bus_softcard_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_softcard_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
{
if (!m_bEnabled)
{
diff --git a/src/devices/bus/a2bus/a2softcard.h b/src/devices/bus/a2bus/a2softcard.h
index 906d8e14c12..7df711601a4 100644
--- a/src/devices/bus/a2bus/a2softcard.h
+++ b/src/devices/bus/a2bus/a2softcard.h
@@ -24,8 +24,8 @@ class a2bus_softcard_device:
{
public:
// construction/destruction
- a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -38,7 +38,7 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
virtual bool take_c800() override;
required_device<cpu_device> m_z80;
diff --git a/src/devices/bus/a2bus/a2ssc.cpp b/src/devices/bus/a2bus/a2ssc.cpp
index b7189b77992..59001032362 100644
--- a/src/devices/bus/a2bus/a2ssc.cpp
+++ b/src/devices/bus/a2bus/a2ssc.cpp
@@ -127,7 +127,7 @@ const tiny_rom_entry *a2bus_ssc_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_SSC, "Apple Super Serial Card", tag, owner, clock, "a2ssc", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_dsw1(*this, "DSW1"),
@@ -137,7 +137,7 @@ a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, const char *ta
{
}
-a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_dsw1(*this, "DSW1"),
@@ -168,7 +168,7 @@ void a2bus_ssc_device::device_reset()
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_ssc_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_ssc_device::read_cnxx(address_space &space, uint8_t offset)
{
return m_rom[(offset&0xff)+0x700];
}
@@ -177,7 +177,7 @@ UINT8 a2bus_ssc_device::read_cnxx(address_space &space, UINT8 offset)
read_c800 - called for reads from this card's c800 space
-------------------------------------------------*/
-UINT8 a2bus_ssc_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_ssc_device::read_c800(address_space &space, uint16_t offset)
{
return m_rom[offset];
}
@@ -186,7 +186,7 @@ UINT8 a2bus_ssc_device::read_c800(address_space &space, UINT16 offset)
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_ssc_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_ssc_device::read_c0nx(address_space &space, uint8_t offset)
{
// dips at C0n1/C0n2, ACIA at C0n8/9/A/B
@@ -212,7 +212,7 @@ UINT8 a2bus_ssc_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_ssc_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_ssc_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/devices/bus/a2bus/a2ssc.h b/src/devices/bus/a2bus/a2ssc.h
index bdcaca2e900..b130012c52f 100644
--- a/src/devices/bus/a2bus/a2ssc.h
+++ b/src/devices/bus/a2bus/a2ssc.h
@@ -24,8 +24,8 @@ class a2bus_ssc_device:
{
public:
// construction/destruction
- a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -40,15 +40,15 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
- virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+ virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
required_device<mos6551_device> m_acia;
private:
- UINT8 *m_rom;
+ uint8_t *m_rom;
bool m_started;
};
diff --git a/src/devices/bus/a2bus/a2swyft.cpp b/src/devices/bus/a2bus/a2swyft.cpp
index b5f0d65c60d..975974b849b 100644
--- a/src/devices/bus/a2bus/a2swyft.cpp
+++ b/src/devices/bus/a2bus/a2swyft.cpp
@@ -45,13 +45,13 @@ const tiny_rom_entry *a2bus_swyft_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_SWYFT, "IAI SwyftCard", tag, owner, clock, "a2swyft", __FILE__),
device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_rombank(0), m_inh_state(0)
{
}
-a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_rombank(0), m_inh_state(0)
{
@@ -79,7 +79,7 @@ void a2bus_swyft_device::device_reset()
recalc_slot_inh();
}
-UINT8 a2bus_swyft_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_swyft_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset)
{
@@ -105,7 +105,7 @@ UINT8 a2bus_swyft_device::read_c0nx(address_space &space, UINT8 offset)
return 0xff;
}
-void a2bus_swyft_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_swyft_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset)
{
@@ -129,7 +129,7 @@ void a2bus_swyft_device::write_c0nx(address_space &space, UINT8 offset, UINT8 da
}
}
-UINT8 a2bus_swyft_device::read_inh_rom(address_space &space, UINT16 offset)
+uint8_t a2bus_swyft_device::read_inh_rom(address_space &space, uint16_t offset)
{
offset -= 0xd000;
diff --git a/src/devices/bus/a2bus/a2swyft.h b/src/devices/bus/a2bus/a2swyft.h
index a490d266ac9..7e297ffff8e 100644
--- a/src/devices/bus/a2bus/a2swyft.h
+++ b/src/devices/bus/a2bus/a2swyft.h
@@ -24,8 +24,8 @@ class a2bus_swyft_device:
{
public:
// construction/destruction
- a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -33,15 +33,15 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_inh_rom(address_space &space, UINT16 offset) override;
- virtual UINT16 inh_start() override { return 0xd000; }
- virtual UINT16 inh_end() override { return 0xffff; }
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_inh_rom(address_space &space, uint16_t offset) override;
+ virtual uint16_t inh_start() override { return 0xd000; }
+ virtual uint16_t inh_end() override { return 0xffff; }
virtual int inh_type() override;
private:
- UINT8 *m_rom;
+ uint8_t *m_rom;
int m_rombank;
int m_inh_state;
};
diff --git a/src/devices/bus/a2bus/a2themill.cpp b/src/devices/bus/a2bus/a2themill.cpp
index e8cc3d338c9..71aed47ace9 100644
--- a/src/devices/bus/a2bus/a2themill.cpp
+++ b/src/devices/bus/a2bus/a2themill.cpp
@@ -67,14 +67,14 @@ machine_config_constructor a2bus_themill_device::device_mconfig_additions() cons
// LIVE DEVICE
//**************************************************************************
-a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_6809(*this, M6809_TAG), m_bEnabled(false), m_flipAddrSpace(false), m_6809Mode(false), m_status(0)
{
}
-a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_THEMILL, "Stellation Two The Mill", tag, owner, clock, "a2themill", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_6809(*this, M6809_TAG), m_bEnabled(false), m_flipAddrSpace(false), m_6809Mode(false), m_status(0)
@@ -106,12 +106,12 @@ void a2bus_themill_device::device_reset()
m_6809->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}
-UINT8 a2bus_themill_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_themill_device::read_c0nx(address_space &space, uint8_t offset)
{
return m_status;
}
-void a2bus_themill_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_themill_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/devices/bus/a2bus/a2themill.h b/src/devices/bus/a2bus/a2themill.h
index 763aec5f9df..b37cbbbb25c 100644
--- a/src/devices/bus/a2bus/a2themill.h
+++ b/src/devices/bus/a2bus/a2themill.h
@@ -24,8 +24,8 @@ class a2bus_themill_device:
{
public:
// construction/destruction
- a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_themill_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -38,8 +38,8 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
virtual bool take_c800() override;
required_device<cpu_device> m_6809;
@@ -48,7 +48,7 @@ private:
bool m_bEnabled;
bool m_flipAddrSpace;
bool m_6809Mode;
- UINT8 m_status;
+ uint8_t m_status;
};
// device type definition
diff --git a/src/devices/bus/a2bus/a2thunderclock.cpp b/src/devices/bus/a2bus/a2thunderclock.cpp
index e789b364a51..a2fd9739748 100644
--- a/src/devices/bus/a2bus/a2thunderclock.cpp
+++ b/src/devices/bus/a2bus/a2thunderclock.cpp
@@ -76,14 +76,14 @@ const tiny_rom_entry *a2bus_thunderclock_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_upd1990ac(*this, THUNDERCLOCK_UPD1990_TAG), m_rom(nullptr), m_dataout(0)
{
}
-a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_THUNDERCLOCK, "ThunderWare ThunderClock Plus", tag, owner, clock, "a2thunpl", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_upd1990ac(*this, THUNDERCLOCK_UPD1990_TAG), m_rom(nullptr), m_dataout(0)
@@ -114,7 +114,7 @@ void a2bus_thunderclock_device::device_reset()
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_thunderclock_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_thunderclock_device::read_c0nx(address_space &space, uint8_t offset)
{
return (m_dataout << 7);
}
@@ -124,7 +124,7 @@ UINT8 a2bus_thunderclock_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_thunderclock_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_thunderclock_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
// uPD1990AC hookup:
// bit 0 = DATA IN?
@@ -151,7 +151,7 @@ void a2bus_thunderclock_device::write_c0nx(address_space &space, UINT8 offset, U
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_thunderclock_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_thunderclock_device::read_cnxx(address_space &space, uint8_t offset)
{
// ROM is primarily a c800 image, but the first page is also the CnXX ROM
return m_rom[offset];
@@ -161,7 +161,7 @@ UINT8 a2bus_thunderclock_device::read_cnxx(address_space &space, UINT8 offset)
read_c800 - called for reads from this card's c800 space
-------------------------------------------------*/
-UINT8 a2bus_thunderclock_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_thunderclock_device::read_c800(address_space &space, uint16_t offset)
{
return m_rom[offset];
}
diff --git a/src/devices/bus/a2bus/a2thunderclock.h b/src/devices/bus/a2bus/a2thunderclock.h
index 324b6a30ea0..2f06608534f 100644
--- a/src/devices/bus/a2bus/a2thunderclock.h
+++ b/src/devices/bus/a2bus/a2thunderclock.h
@@ -25,8 +25,8 @@ class a2bus_thunderclock_device:
{
public:
// construction/destruction
- a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -39,15 +39,15 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
- virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+ virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
required_device<upd1990a_device> m_upd1990ac;
private:
- UINT8 *m_rom;
+ uint8_t *m_rom;
int m_dataout;
};
diff --git a/src/devices/bus/a2bus/a2ultraterm.cpp b/src/devices/bus/a2bus/a2ultraterm.cpp
index 3898e4be0c3..5526515ab1d 100644
--- a/src/devices/bus/a2bus/a2ultraterm.cpp
+++ b/src/devices/bus/a2bus/a2ultraterm.cpp
@@ -138,19 +138,19 @@ const tiny_rom_entry *a2bus_ultratermenh_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_videx160_device::a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_videx160_device::a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_chrrom(nullptr), m_framecnt(0), m_ctrl1(0), m_ctrl2(0),
m_crtc(*this, ULTRATERM_MC6845_NAME), m_rambank(0)
{
}
-a2bus_ultraterm_device::a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ultraterm_device::a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_videx160_device(mconfig, A2BUS_ULTRATERM, "Videx UltraTerm (original)", tag, owner, clock, "a2ulttrm", __FILE__)
{
}
-a2bus_ultratermenh_device::a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ultratermenh_device::a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_videx160_device(mconfig, A2BUS_ULTRATERMENH, "Videx UltraTerm (enhanced //e)", tag, owner, clock, "a2ultrme", __FILE__)
{
}
@@ -188,7 +188,7 @@ void a2bus_videx160_device::device_reset()
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_videx160_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_videx160_device::read_c0nx(address_space &space, uint8_t offset)
{
// printf("Read c0n%x (PC=%x)\n", offset, space.device().safe_pc());
@@ -217,7 +217,7 @@ UINT8 a2bus_videx160_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_videx160_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_videx160_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
// printf("Write %02x to c0n%x (PC=%x)\n", data, offset, space.device().safe_pc());
@@ -258,7 +258,7 @@ void a2bus_videx160_device::write_c0nx(address_space &space, UINT8 offset, UINT8
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_videx160_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_videx160_device::read_cnxx(address_space &space, uint8_t offset)
{
return m_rom[offset+(m_slot * 0x100)];
}
@@ -267,7 +267,7 @@ UINT8 a2bus_videx160_device::read_cnxx(address_space &space, UINT8 offset)
write_cnxx - called for writes to this card's cnxx space
the firmware writes here to switch in our $C800 a lot
-------------------------------------------------*/
-void a2bus_videx160_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_videx160_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
{
}
@@ -275,7 +275,7 @@ void a2bus_videx160_device::write_cnxx(address_space &space, UINT8 offset, UINT8
read_c800 - called for reads from this card's c800 space
-------------------------------------------------*/
-UINT8 a2bus_videx160_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_videx160_device::read_c800(address_space &space, uint16_t offset)
{
// ROM at c800-cbff
// bankswitched RAM at cc00-cdff
@@ -298,7 +298,7 @@ UINT8 a2bus_videx160_device::read_c800(address_space &space, UINT16 offset)
/*-------------------------------------------------
write_c800 - called for writes to this card's c800 space
-------------------------------------------------*/
-void a2bus_videx160_device::write_c800(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_videx160_device::write_c800(address_space &space, uint16_t offset, uint8_t data)
{
if (offset >= 0x400)
{
@@ -309,18 +309,18 @@ void a2bus_videx160_device::write_c800(address_space &space, UINT16 offset, UINT
MC6845_UPDATE_ROW( a2bus_videx160_device::crtc_update_row )
{
- UINT32 *p = &bitmap.pix32(y);
- UINT16 chr_base = ra;
+ uint32_t *p = &bitmap.pix32(y);
+ uint16_t chr_base = ra;
int i;
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ma + i );
- UINT8 chr = m_ram[ offset ];
- UINT8 data = m_chrrom[ chr_base + (chr * 16) ];
- UINT8 fg = 2;
- UINT8 bg = 0;
- UINT8 tmp;
+ uint16_t offset = ( ma + i );
+ uint8_t chr = m_ram[ offset ];
+ uint8_t data = m_chrrom[ chr_base + (chr * 16) ];
+ uint8_t fg = 2;
+ uint8_t bg = 0;
+ uint8_t tmp;
// apply attributes
if (!(m_ctrl2 & CT2_USEDIPS))
diff --git a/src/devices/bus/a2bus/a2ultraterm.h b/src/devices/bus/a2bus/a2ultraterm.h
index 3eadec62422..1f473526071 100644
--- a/src/devices/bus/a2bus/a2ultraterm.h
+++ b/src/devices/bus/a2bus/a2ultraterm.h
@@ -25,7 +25,7 @@ class a2bus_videx160_device:
{
public:
// construction/destruction
- a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -33,22 +33,22 @@ public:
DECLARE_WRITE_LINE_MEMBER(vsync_changed);
MC6845_UPDATE_ROW(crtc_update_row);
- UINT8 *m_rom, *m_chrrom;
- UINT8 m_ram[256*16];
+ uint8_t *m_rom, *m_chrrom;
+ uint8_t m_ram[256*16];
int m_framecnt;
- UINT8 m_ctrl1, m_ctrl2;
+ uint8_t m_ctrl1, m_ctrl2;
protected:
virtual void device_start() override;
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
- virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
- virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+ virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+ virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
required_device<mc6845_device> m_crtc;
@@ -59,7 +59,7 @@ private:
class a2bus_ultraterm_device : public a2bus_videx160_device
{
public:
- a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
@@ -67,7 +67,7 @@ public:
class a2bus_ultratermenh_device : public a2bus_videx160_device
{
public:
- a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp
index f6d00066321..53eb6d5d20a 100644
--- a/src/devices/bus/a2bus/a2videoterm.cpp
+++ b/src/devices/bus/a2bus/a2videoterm.cpp
@@ -172,7 +172,7 @@ const tiny_rom_entry *a2bus_aevm80_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_videx80_device::a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_videx80_device::a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_chrrom(nullptr), m_framecnt(0),
m_crtc(*this, VIDEOTERM_MC6845_NAME), m_rambank(0),
@@ -180,32 +180,32 @@ a2bus_videx80_device::a2bus_videx80_device(const machine_config &mconfig, device
{
}
-a2bus_videoterm_device::a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_videoterm_device::a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_videx80_device(mconfig, A2BUS_VIDEOTERM, "Videx VideoTerm", tag, owner, clock, "a2vidtrm", __FILE__)
{
}
-a2bus_ap16_device::a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ap16_device::a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_videx80_device(mconfig, A2BUS_IBSAP16, "IBS AP-16 80 column card", tag, owner, clock, "a2ap16", __FILE__)
{
}
-a2bus_ap16alt_device::a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ap16alt_device::a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_videx80_device(mconfig, A2BUS_IBSAP16ALT, "IBS AP-16 80 column card (alt. version)", tag, owner, clock, "a2ap16a", __FILE__)
{
}
-a2bus_vtc1_device::a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_vtc1_device::a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_videx80_device(mconfig, A2BUS_VTC1, "Unknown VideoTerm clone #1", tag, owner, clock, "a2vtc1", __FILE__)
{
}
-a2bus_vtc2_device::a2bus_vtc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_vtc2_device::a2bus_vtc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_videx80_device(mconfig, A2BUS_VTC2, "Unknown VideoTerm clone #2", tag, owner, clock, "a2vtc2", __FILE__)
{
}
-a2bus_aevm80_device::a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_aevm80_device::a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_videx80_device(mconfig, A2BUS_AEVIEWMASTER80, "Applied Engineering Viewmaster 80", tag, owner, clock, "a2aevm80", __FILE__)
{
}
@@ -241,7 +241,7 @@ void a2bus_videx80_device::device_reset()
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_videx80_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_videx80_device::read_c0nx(address_space &space, uint8_t offset)
{
// printf("Read c0n%x (PC=%x)\n", offset, space.device().safe_pc());
@@ -260,7 +260,7 @@ UINT8 a2bus_videx80_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_videx80_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_videx80_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
// printf("Write %02x to c0n%x (PC=%x)\n", data, offset, space.device().safe_pc());
@@ -280,17 +280,17 @@ void a2bus_videx80_device::write_c0nx(address_space &space, UINT8 offset, UINT8
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_videx80_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_videx80_device::read_cnxx(address_space &space, uint8_t offset)
{
return m_rom[offset+0x300];
}
-UINT8 a2bus_ap16_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_ap16_device::read_cnxx(address_space &space, uint8_t offset)
{
return m_rom[offset+0x1f00];
}
-UINT8 a2bus_ap16alt_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_ap16alt_device::read_cnxx(address_space &space, uint8_t offset)
{
return m_rom[offset+0xb00];
}
@@ -299,7 +299,7 @@ UINT8 a2bus_ap16alt_device::read_cnxx(address_space &space, UINT8 offset)
write_cnxx - called for writes to this card's cnxx space
the firmware writes here to switch in our $C800 a lot
-------------------------------------------------*/
-void a2bus_videx80_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_videx80_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
{
}
@@ -307,7 +307,7 @@ void a2bus_videx80_device::write_cnxx(address_space &space, UINT8 offset, UINT8
read_c800 - called for reads from this card's c800 space
-------------------------------------------------*/
-UINT8 a2bus_videx80_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_videx80_device::read_c800(address_space &space, uint16_t offset)
{
// ROM at c800-cbff
// bankswitched RAM at cc00-cdff
@@ -325,7 +325,7 @@ UINT8 a2bus_videx80_device::read_c800(address_space &space, UINT16 offset)
/*-------------------------------------------------
write_c800 - called for writes to this card's c800 space
-------------------------------------------------*/
-void a2bus_videx80_device::write_c800(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_videx80_device::write_c800(address_space &space, uint16_t offset, uint8_t data)
{
if (offset >= 0x400)
{
@@ -337,17 +337,17 @@ void a2bus_videx80_device::write_c800(address_space &space, UINT16 offset, UINT8
MC6845_UPDATE_ROW( a2bus_videx80_device::crtc_update_row )
{
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT32 *p = &bitmap.pix32(y);
- UINT16 chr_base = ra; //( ra & 0x08 ) ? 0x800 | ( ra & 0x07 ) : ra;
+ uint32_t *p = &bitmap.pix32(y);
+ uint16_t chr_base = ra; //( ra & 0x08 ) ? 0x800 | ( ra & 0x07 ) : ra;
int i;
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ma + i ) & 0x7ff;
- UINT8 chr = m_ram[ offset ];
- UINT8 data = m_chrrom[ chr_base + chr * 16 ];
- UINT8 fg = 15;
- UINT8 bg = 0;
+ uint16_t offset = ( ma + i ) & 0x7ff;
+ uint8_t chr = m_ram[ offset ];
+ uint8_t data = m_chrrom[ chr_base + chr * 16 ];
+ uint8_t fg = 15;
+ uint8_t bg = 0;
if ( i == cursor_x )
{
diff --git a/src/devices/bus/a2bus/a2videoterm.h b/src/devices/bus/a2bus/a2videoterm.h
index 23b29ca86d4..751939cee9b 100644
--- a/src/devices/bus/a2bus/a2videoterm.h
+++ b/src/devices/bus/a2bus/a2videoterm.h
@@ -25,7 +25,7 @@ class a2bus_videx80_device:
{
public:
// construction/destruction
- a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -33,8 +33,8 @@ public:
DECLARE_WRITE_LINE_MEMBER(vsync_changed);
MC6845_UPDATE_ROW(crtc_update_row);
- UINT8 *m_rom, *m_chrrom;
- UINT8 m_ram[512*4];
+ uint8_t *m_rom, *m_chrrom;
+ uint8_t m_ram[512*4];
int m_framecnt;
protected:
@@ -42,12 +42,12 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
- virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
- virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+ virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+ virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
required_device<mc6845_device> m_crtc;
@@ -60,7 +60,7 @@ public:
class a2bus_videoterm_device : public a2bus_videx80_device
{
public:
- a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
@@ -68,28 +68,28 @@ public:
class a2bus_ap16_device : public a2bus_videx80_device
{
public:
- a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
};
class a2bus_ap16alt_device : public a2bus_videx80_device
{
public:
- a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
};
class a2bus_vtc1_device : public a2bus_videx80_device
{
public:
- a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
@@ -97,7 +97,7 @@ public:
class a2bus_vtc2_device : public a2bus_videx80_device
{
public:
- a2bus_vtc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_vtc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
@@ -105,7 +105,7 @@ public:
class a2bus_aevm80_device : public a2bus_videx80_device
{
public:
- a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
diff --git a/src/devices/bus/a2bus/a2vulcan.cpp b/src/devices/bus/a2bus/a2vulcan.cpp
index c17631287c6..216ccc7d043 100644
--- a/src/devices/bus/a2bus/a2vulcan.cpp
+++ b/src/devices/bus/a2bus/a2vulcan.cpp
@@ -114,19 +114,19 @@ const tiny_rom_entry *a2bus_vulcangold_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_vulcanbase_device::a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_vulcanbase_device::a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_ata(*this, VULCAN_ATA_TAG), m_rom(nullptr), m_lastdata(0), m_rombank(0), m_rambank(0), m_last_read_was_0(false)
{
}
-a2bus_vulcan_device::a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_vulcan_device::a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_vulcanbase_device(mconfig, A2BUS_VULCAN, "Applied Engineering Vulcan IDE controller", tag, owner, clock, "a2vulcan", __FILE__)
{
}
-a2bus_vulcangold_device::a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_vulcangold_device::a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_vulcanbase_device(mconfig, A2BUS_VULCAN, "Applied Engineering Vulcan Gold IDE controller", tag, owner, clock, "a2vulgld", __FILE__)
{
}
@@ -169,7 +169,7 @@ void a2bus_vulcanbase_device::device_reset()
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_vulcanbase_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_vulcanbase_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset)
{
@@ -212,7 +212,7 @@ UINT8 a2bus_vulcanbase_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_vulcanbase_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_vulcanbase_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset)
{
@@ -266,7 +266,7 @@ void a2bus_vulcanbase_device::write_c0nx(address_space &space, UINT8 offset, UIN
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_vulcanbase_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_vulcanbase_device::read_cnxx(address_space &space, uint8_t offset)
{
int slotimg = m_slot * 0x100;
@@ -278,7 +278,7 @@ UINT8 a2bus_vulcanbase_device::read_cnxx(address_space &space, UINT8 offset)
read_c800 - called for reads from this card's c800 space
-------------------------------------------------*/
-UINT8 a2bus_vulcanbase_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_vulcanbase_device::read_c800(address_space &space, uint16_t offset)
{
offset &= 0x7ff;
if (offset < 0x400) // c800-cbff is banked RAM window, cc00-cfff is banked ROM window
@@ -291,7 +291,7 @@ UINT8 a2bus_vulcanbase_device::read_c800(address_space &space, UINT16 offset)
return m_rom[offset+m_rombank];
}
-void a2bus_vulcanbase_device::write_c800(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_vulcanbase_device::write_c800(address_space &space, uint16_t offset, uint8_t data)
{
offset &= 0x7ff;
if (offset < 0x400)
diff --git a/src/devices/bus/a2bus/a2vulcan.h b/src/devices/bus/a2bus/a2vulcan.h
index 03facf5dcbf..1b0e0149833 100644
--- a/src/devices/bus/a2bus/a2vulcan.h
+++ b/src/devices/bus/a2bus/a2vulcan.h
@@ -25,7 +25,7 @@ class a2bus_vulcanbase_device:
{
public:
// construction/destruction
- a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -35,19 +35,19 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
- virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
- virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+ virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+ virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
required_device<ata_interface_device> m_ata;
- UINT8 *m_rom;
- UINT8 m_ram[8*1024];
+ uint8_t *m_rom;
+ uint8_t m_ram[8*1024];
private:
- UINT16 m_lastdata;
+ uint16_t m_lastdata;
int m_rombank, m_rambank;
bool m_last_read_was_0;
};
@@ -55,7 +55,7 @@ private:
class a2bus_vulcan_device : public a2bus_vulcanbase_device
{
public:
- a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
protected:
@@ -67,7 +67,7 @@ protected:
class a2bus_vulcangold_device : public a2bus_vulcanbase_device
{
public:
- a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
diff --git a/src/devices/bus/a2bus/a2zipdrive.cpp b/src/devices/bus/a2bus/a2zipdrive.cpp
index f7a78aa4223..369aec79a4d 100644
--- a/src/devices/bus/a2bus/a2zipdrive.cpp
+++ b/src/devices/bus/a2bus/a2zipdrive.cpp
@@ -69,14 +69,14 @@ const tiny_rom_entry *a2bus_zipdrivebase_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_zipdrivebase_device::a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_zipdrivebase_device::a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_ata(*this, ZIPDRIVE_ATA_TAG), m_rom(nullptr), m_lastdata(0)
{
}
-a2bus_zipdrive_device::a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_zipdrive_device::a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a2bus_zipdrivebase_device(mconfig, A2BUS_ZIPDRIVE, "Zip Technologies ZipDrive", tag, owner, clock, "a2zipdrv", __FILE__)
{
}
@@ -105,7 +105,7 @@ void a2bus_zipdrivebase_device::device_reset()
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_zipdrivebase_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_zipdrivebase_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset)
{
@@ -140,7 +140,7 @@ UINT8 a2bus_zipdrivebase_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_zipdrivebase_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_zipdrivebase_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset)
{
@@ -178,7 +178,7 @@ void a2bus_zipdrivebase_device::write_c0nx(address_space &space, UINT8 offset, U
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_zipdrivebase_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_zipdrivebase_device::read_cnxx(address_space &space, uint8_t offset)
{
int slotimg = m_slot * 0x100;
@@ -190,7 +190,7 @@ UINT8 a2bus_zipdrivebase_device::read_cnxx(address_space &space, UINT8 offset)
read_c800 - called for reads from this card's c800 space
-------------------------------------------------*/
-UINT8 a2bus_zipdrivebase_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_zipdrivebase_device::read_c800(address_space &space, uint16_t offset)
{
offset &= 0x7ff;
diff --git a/src/devices/bus/a2bus/a2zipdrive.h b/src/devices/bus/a2bus/a2zipdrive.h
index cdc4a15bca6..39f5f8bae19 100644
--- a/src/devices/bus/a2bus/a2zipdrive.h
+++ b/src/devices/bus/a2bus/a2zipdrive.h
@@ -27,7 +27,7 @@ class a2bus_zipdrivebase_device:
{
public:
// construction/destruction
- a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -38,23 +38,23 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
- virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+ virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
required_device<ata_interface_device> m_ata;
- UINT8 *m_rom;
+ uint8_t *m_rom;
private:
- UINT16 m_lastdata;
+ uint16_t m_lastdata;
};
class a2bus_zipdrive_device : public a2bus_zipdrivebase_device
{
public:
- a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
// device type definition
diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp
index 335315e0022..f9f2f05f945 100644
--- a/src/devices/bus/a2bus/corvfdc01.cpp
+++ b/src/devices/bus/a2bus/corvfdc01.cpp
@@ -110,7 +110,7 @@ const tiny_rom_entry *a2bus_corvfdc01_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_wdfdc(*this, FDC01_FDC_TAG),
@@ -121,7 +121,7 @@ a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, de
{
}
-a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_CORVFDC01, "Corvus Systems Floppy Controller", tag, owner, clock, "crvfdc01", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_wdfdc(*this, FDC01_FDC_TAG),
@@ -158,7 +158,7 @@ void a2bus_corvfdc01_device::device_reset()
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_corvfdc01_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_corvfdc01_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset)
{
@@ -191,7 +191,7 @@ UINT8 a2bus_corvfdc01_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_corvfdc01_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_corvfdc01_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
int current_drive;
floppy_image_device *floppy = nullptr;
@@ -259,7 +259,7 @@ void a2bus_corvfdc01_device::write_c0nx(address_space &space, UINT8 offset, UINT
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_corvfdc01_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_corvfdc01_device::read_cnxx(address_space &space, uint8_t offset)
{
return m_rom[offset & 0x1f];
}
diff --git a/src/devices/bus/a2bus/corvfdc01.h b/src/devices/bus/a2bus/corvfdc01.h
index 626a2ca145d..c21f0839709 100644
--- a/src/devices/bus/a2bus/corvfdc01.h
+++ b/src/devices/bus/a2bus/corvfdc01.h
@@ -26,8 +26,8 @@ class a2bus_corvfdc01_device:
{
public:
// construction/destruction
- a2bus_corvfdc01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_corvfdc01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -43,9 +43,9 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
required_device<fd1793_t> m_wdfdc;
required_device<floppy_connector> m_con1;
@@ -54,8 +54,8 @@ protected:
required_device<floppy_connector> m_con4;
private:
- UINT8 *m_rom;
- UINT8 m_fdc_local_status, m_fdc_local_command;
+ uint8_t *m_rom;
+ uint8_t m_fdc_local_status, m_fdc_local_command;
floppy_image_device *m_curfloppy;
};
diff --git a/src/devices/bus/a2bus/corvfdc02.cpp b/src/devices/bus/a2bus/corvfdc02.cpp
index 89201538f6a..66375cc5580 100644
--- a/src/devices/bus/a2bus/corvfdc02.cpp
+++ b/src/devices/bus/a2bus/corvfdc02.cpp
@@ -80,7 +80,7 @@ const tiny_rom_entry *a2bus_corvfdc02_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_fdc(*this, FDC02_FDC_TAG),
@@ -91,7 +91,7 @@ a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, de
{
}
-a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_CORVFDC02, "Corvus Systems Buffered Floppy Controller", tag, owner, clock, "crvfdc02", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_fdc(*this, FDC02_FDC_TAG),
@@ -140,7 +140,7 @@ void a2bus_corvfdc02_device::device_timer(emu_timer &timer, device_timer_id id,
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_corvfdc02_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_corvfdc02_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset)
{
@@ -176,7 +176,7 @@ UINT8 a2bus_corvfdc02_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_corvfdc02_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_corvfdc02_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
floppy_image_device *floppy = nullptr;
@@ -250,7 +250,7 @@ void a2bus_corvfdc02_device::write_c0nx(address_space &space, UINT8 offset, UINT
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_corvfdc02_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_corvfdc02_device::read_cnxx(address_space &space, uint8_t offset)
{
return m_rom[offset & 0x1f];
}
diff --git a/src/devices/bus/a2bus/corvfdc02.h b/src/devices/bus/a2bus/corvfdc02.h
index d7a1d6a2a1e..5ff6402372e 100644
--- a/src/devices/bus/a2bus/corvfdc02.h
+++ b/src/devices/bus/a2bus/corvfdc02.h
@@ -26,8 +26,8 @@ class a2bus_corvfdc02_device:
{
public:
// construction/destruction
- a2bus_corvfdc02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_corvfdc02_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -44,9 +44,9 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
required_device<upd765a_device> m_fdc;
required_device<floppy_connector> m_con1;
@@ -55,10 +55,10 @@ protected:
required_device<floppy_connector> m_con4;
private:
- UINT8 *m_rom;
- UINT8 m_fdc_local_status, m_fdc_local_command;
- UINT16 m_bufptr;
- UINT8 m_buffer[2048]; // 1x6116 SRAM
+ uint8_t *m_rom;
+ uint8_t m_fdc_local_status, m_fdc_local_command;
+ uint16_t m_bufptr;
+ uint8_t m_buffer[2048]; // 1x6116 SRAM
floppy_image_device *m_curfloppy;
bool m_in_drq;
emu_timer *m_timer;
diff --git a/src/devices/bus/a2bus/ezcgi.cpp b/src/devices/bus/a2bus/ezcgi.cpp
index e85db228ad2..e8dc74df028 100644
--- a/src/devices/bus/a2bus/ezcgi.cpp
+++ b/src/devices/bus/a2bus/ezcgi.cpp
@@ -96,42 +96,42 @@ machine_config_constructor a2bus_ezcgi_9958_device::device_mconfig_additions() c
// LIVE DEVICE
//**************************************************************************
-a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_EZCGI, "E-Z Color Graphics Interface", tag, owner, clock, "a2ezcgi", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
}
-a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
}
-a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_EZCGI_9938, "E-Z Color Graphics Interface (TMS9938)", tag, owner, clock, "a2ezcgi3", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
}
-a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
}
-a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_EZCGI_9958, "E-Z Color Graphics Interface (TMS9958)", tag, owner, clock, "a2ezcgi5", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
}
-a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
@@ -178,7 +178,7 @@ void a2bus_ezcgi_9958_device::device_reset()
1 - TMS write
*/
-UINT8 a2bus_ezcgi_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_ezcgi_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset)
{
@@ -192,7 +192,7 @@ UINT8 a2bus_ezcgi_device::read_c0nx(address_space &space, UINT8 offset)
return 0xff;
}
-void a2bus_ezcgi_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_ezcgi_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset)
{
@@ -206,7 +206,7 @@ void a2bus_ezcgi_device::write_c0nx(address_space &space, UINT8 offset, UINT8 da
}
}
-UINT8 a2bus_ezcgi_9938_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_ezcgi_9938_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset)
{
@@ -220,7 +220,7 @@ UINT8 a2bus_ezcgi_9938_device::read_c0nx(address_space &space, UINT8 offset)
return 0xff;
}
-void a2bus_ezcgi_9938_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_ezcgi_9938_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset)
{
@@ -242,7 +242,7 @@ void a2bus_ezcgi_9938_device::write_c0nx(address_space &space, UINT8 offset, UIN
}
}
-UINT8 a2bus_ezcgi_9958_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_ezcgi_9958_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset)
{
@@ -256,7 +256,7 @@ UINT8 a2bus_ezcgi_9958_device::read_c0nx(address_space &space, UINT8 offset)
return 0xff;
}
-void a2bus_ezcgi_9958_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_ezcgi_9958_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/devices/bus/a2bus/ezcgi.h b/src/devices/bus/a2bus/ezcgi.h
index 275ec0fd77e..8d01f3ac029 100644
--- a/src/devices/bus/a2bus/ezcgi.h
+++ b/src/devices/bus/a2bus/ezcgi.h
@@ -28,8 +28,8 @@ class a2bus_ezcgi_device:
{
public:
// construction/destruction
- a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,8 +41,8 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
required_device<tms9918a_device> m_tms;
};
@@ -53,8 +53,8 @@ class a2bus_ezcgi_9938_device:
{
public:
// construction/destruction
- a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -66,8 +66,8 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
required_device<v9938_device> m_tms;
};
@@ -78,8 +78,8 @@ class a2bus_ezcgi_9958_device:
{
public:
// construction/destruction
- a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -91,8 +91,8 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
required_device<v9958_device> m_tms;
};
diff --git a/src/devices/bus/a2bus/laser128.cpp b/src/devices/bus/a2bus/laser128.cpp
index 5357f3cc31d..3ba434abfa4 100644
--- a/src/devices/bus/a2bus/laser128.cpp
+++ b/src/devices/bus/a2bus/laser128.cpp
@@ -42,14 +42,14 @@ machine_config_constructor a2bus_laser128_device::device_mconfig_additions() con
// LIVE DEVICE
//**************************************************************************
-a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_slot7_bank(0), m_slot7_ram_bank(0)
{
}
-a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_LASER128, "VTech Laser 128 Internal Device", tag, owner, clock, "a2laser128", __FILE__),
device_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_slot7_bank(0), m_slot7_ram_bank(0)
{
@@ -75,21 +75,21 @@ void a2bus_laser128_device::device_reset()
m_slot7_ram_bank = 0;
}
-UINT8 a2bus_laser128_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_laser128_device::read_c0nx(address_space &space, uint8_t offset)
{
return 0x00;
}
-void a2bus_laser128_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_laser128_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
}
-UINT8 a2bus_laser128_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_laser128_device::read_cnxx(address_space &space, uint8_t offset)
{
return m_rom[offset + (m_slot * 0x100) + 0x4000];
}
-UINT8 a2bus_laser128_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_laser128_device::read_c800(address_space &space, uint16_t offset)
{
switch (m_slot)
{
@@ -116,7 +116,7 @@ UINT8 a2bus_laser128_device::read_c800(address_space &space, UINT16 offset)
return 0xff;
}
-void a2bus_laser128_device::write_c800(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_laser128_device::write_c800(address_space &space, uint16_t offset, uint8_t data)
{
if ((m_slot == 7) && (offset < 0x400))
{
diff --git a/src/devices/bus/a2bus/laser128.h b/src/devices/bus/a2bus/laser128.h
index 55c46f63730..2cd7def413b 100644
--- a/src/devices/bus/a2bus/laser128.h
+++ b/src/devices/bus/a2bus/laser128.h
@@ -24,8 +24,8 @@ class a2bus_laser128_device:
{
public:
// construction/destruction
- a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -35,16 +35,16 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
- virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
- virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+ virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+ virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
virtual bool take_c800() override;
private:
- UINT8 *m_rom;
- UINT8 m_slot7_ram[0x800];
+ uint8_t *m_rom;
+ uint8_t m_slot7_ram[0x800];
int m_slot7_bank, m_slot7_ram_bank;
};
diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp
index 02eec429329..fa0f8377007 100644
--- a/src/devices/bus/a2bus/mouse.cpp
+++ b/src/devices/bus/a2bus/mouse.cpp
@@ -172,7 +172,7 @@ const tiny_rom_entry *a2bus_mouse_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_pia(*this, MOUSE_PIA_TAG),
@@ -186,7 +186,7 @@ a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, device_typ
m_rom_bank = 0;
}
-a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_MOUSE, "Apple II Mouse Card", tag, owner, clock, "a2mouse", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_pia(*this, MOUSE_PIA_TAG),
@@ -261,7 +261,7 @@ void a2bus_mouse_device::device_reset()
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_mouse_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_mouse_device::read_c0nx(address_space &space, uint8_t offset)
{
return m_pia->read(space, offset & 3);
}
@@ -271,7 +271,7 @@ UINT8 a2bus_mouse_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_mouse_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_mouse_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
m_pia->write(space, offset & 3, data);
}
@@ -280,7 +280,7 @@ void a2bus_mouse_device::write_c0nx(address_space &space, UINT8 offset, UINT8 da
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_mouse_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_mouse_device::read_cnxx(address_space &space, uint8_t offset)
{
return m_rom[offset+m_rom_bank];
}
@@ -333,7 +333,7 @@ WRITE8_MEMBER(a2bus_mouse_device::mcu_ddr_a_w)
READ8_MEMBER(a2bus_mouse_device::mcu_port_b_r)
{
- UINT8 b_in = m_port_b_in;
+ uint8_t b_in = m_port_b_in;
// clear the gates, leave everything else alone between pulses
m_port_b_in &= 0x85;
@@ -435,7 +435,7 @@ WRITE8_MEMBER(a2bus_mouse_device::mcu_timer_w)
if (recalc)
{
// recalculate the timer now
- UINT32 m_ticks = 2043600 / 4;
+ uint32_t m_ticks = 2043600 / 4;
m_ticks /= prescale[m_timer_ctl & 7];
m_ticks /= (int)(m_timer_cnt + 1);
m_timer->adjust(attotime::from_hz((double)m_ticks), TIMER_68705, attotime::from_hz((double)m_ticks));
diff --git a/src/devices/bus/a2bus/mouse.h b/src/devices/bus/a2bus/mouse.h
index a5bf3a5c831..1592cdab850 100644
--- a/src/devices/bus/a2bus/mouse.h
+++ b/src/devices/bus/a2bus/mouse.h
@@ -26,8 +26,8 @@ class a2bus_mouse_device:
{
public:
// construction/destruction
- a2bus_mouse_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_mouse_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -59,30 +59,30 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
required_device<pia6821_device> m_pia;
required_device<m68705_device> m_mcu;
required_ioport m_mouseb, m_mousex, m_mousey;
private:
- UINT8 *m_rom;
+ uint8_t *m_rom;
bool m_started;
int m_rom_bank;
- UINT8 m_ddr_a;
- UINT8 m_ddr_b;
- UINT8 m_ddr_c;
- UINT8 m_port_a_out;
- UINT8 m_port_b_out;
- UINT8 m_port_c_out;
- UINT8 m_port_a_in;
- UINT8 m_port_b_in;
- UINT8 m_port_c_in;
- UINT8 m_timer_cnt;
- UINT8 m_timer_ctl;
- UINT8 m_mask_option;
+ uint8_t m_ddr_a;
+ uint8_t m_ddr_b;
+ uint8_t m_ddr_c;
+ uint8_t m_port_a_out;
+ uint8_t m_port_b_out;
+ uint8_t m_port_c_out;
+ uint8_t m_port_a_in;
+ uint8_t m_port_b_in;
+ uint8_t m_port_c_in;
+ uint8_t m_timer_cnt;
+ uint8_t m_timer_ctl;
+ uint8_t m_mask_option;
int last_mx, last_my, count_x, count_y;
emu_timer *m_timer, *m_read_timer;
};
diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp
index ec40e08a1aa..08533d22f60 100644
--- a/src/devices/bus/a2bus/pc_xporter.cpp
+++ b/src/devices/bus/a2bus/pc_xporter.cpp
@@ -181,7 +181,7 @@ machine_config_constructor a2bus_pcxporter_device::device_mconfig_additions() co
// LIVE DEVICE
//**************************************************************************
-a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_v30(*this, "v30"),
@@ -194,7 +194,7 @@ a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, de
{
}
-a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_PCXPORTER, "Applied Engineering PC Transporter", tag, owner, clock, "a2pcxport", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_v30(*this, "v30"),
@@ -243,7 +243,7 @@ void a2bus_pcxporter_device::device_reset()
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_pcxporter_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_pcxporter_device::read_c0nx(address_space &space, uint8_t offset)
{
switch (offset)
{
@@ -260,7 +260,7 @@ UINT8 a2bus_pcxporter_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_pcxporter_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_pcxporter_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
switch (offset)
{
@@ -274,13 +274,13 @@ void a2bus_pcxporter_device::write_c0nx(address_space &space, UINT8 offset, UINT
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_pcxporter_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_pcxporter_device::read_cnxx(address_space &space, uint8_t offset)
{
// read only to trigger C800?
return 0xff;
}
-void a2bus_pcxporter_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_pcxporter_device::write_cnxx(address_space &space, uint8_t offset, uint8_t data)
{
printf("Write %02x to cn%02x (PC=%x)\n", data, offset, space.device().safe_pc());
}
@@ -289,7 +289,7 @@ void a2bus_pcxporter_device::write_cnxx(address_space &space, UINT8 offset, UINT
read_c800 - called for reads from this card's c800 space
-------------------------------------------------*/
-UINT8 a2bus_pcxporter_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_pcxporter_device::read_c800(address_space &space, uint16_t offset)
{
// printf("Read C800 at %x\n", offset + 0xc800);
@@ -299,7 +299,7 @@ UINT8 a2bus_pcxporter_device::read_c800(address_space &space, UINT16 offset)
}
else
{
- UINT8 rv;
+ uint8_t rv;
switch (offset)
{
@@ -337,7 +337,7 @@ UINT8 a2bus_pcxporter_device::read_c800(address_space &space, UINT16 offset)
/*-------------------------------------------------
write_c800 - called for writes to this card's c800 space
-------------------------------------------------*/
-void a2bus_pcxporter_device::write_c800(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_pcxporter_device::write_c800(address_space &space, uint16_t offset, uint8_t data)
{
if (offset < 0x400)
{
diff --git a/src/devices/bus/a2bus/pc_xporter.h b/src/devices/bus/a2bus/pc_xporter.h
index cb008a3ec76..048dd210de4 100644
--- a/src/devices/bus/a2bus/pc_xporter.h
+++ b/src/devices/bus/a2bus/pc_xporter.h
@@ -34,8 +34,8 @@ class a2bus_pcxporter_device:
{
public:
// construction/destruction
- a2bus_pcxporter_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_pcxporter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_pcxporter_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_pcxporter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -51,22 +51,22 @@ public:
optional_device<pc_kbdc_device> m_pc_kbdc;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
- virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
- virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override;
-
- UINT8 m_u73_q2;
- UINT8 m_out1;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+ virtual void write_cnxx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
+ virtual void write_c800(address_space &space, uint16_t offset, uint8_t data) override;
+
+ uint8_t m_u73_q2;
+ uint8_t m_out1;
int m_dma_channel;
- UINT8 m_dma_offset[4];
- UINT8 m_pc_spkrdata;
- UINT8 m_pit_out2;
+ uint8_t m_dma_offset[4];
+ uint8_t m_pc_spkrdata;
+ uint8_t m_pit_out2;
bool m_cur_eop;
- UINT8 m_nmi_enabled;
+ uint8_t m_nmi_enabled;
// interface to the keyboard
DECLARE_WRITE_LINE_MEMBER( keyboard_clock_w );
@@ -103,14 +103,14 @@ protected:
virtual void device_reset() override;
private:
- UINT8 m_ram[768*1024];
- UINT8 m_c800_ram[0x400];
- UINT8 m_regs[0x400];
- UINT32 m_offset;
+ uint8_t m_ram[768*1024];
+ uint8_t m_c800_ram[0x400];
+ uint8_t m_regs[0x400];
+ uint32_t m_offset;
address_space *m_pcmem_space, *m_pcio_space;
bool m_reset_during_halt;
- UINT8 m_6845_reg;
+ uint8_t m_6845_reg;
void pc_select_dma_channel(int channel, bool state);
};
diff --git a/src/devices/bus/a2bus/ramcard128k.cpp b/src/devices/bus/a2bus/ramcard128k.cpp
index 4616bf54ecf..27dc0e62b64 100644
--- a/src/devices/bus/a2bus/ramcard128k.cpp
+++ b/src/devices/bus/a2bus/ramcard128k.cpp
@@ -28,13 +28,13 @@ const device_type A2BUS_RAMCARD128K = &device_creator<a2bus_ssramcard_device>;
// LIVE DEVICE
//**************************************************************************
-a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0), m_main_bank(0)
{
}
-a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_RAMCARD128K, "Saturn Systems 128K Extended Language Card", tag, owner, clock, "ssram128", __FILE__),
device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0), m_main_bank(0)
{
@@ -139,7 +139,7 @@ void a2bus_ssramcard_device::do_io(int offset)
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_ssramcard_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_ssramcard_device::read_c0nx(address_space &space, uint8_t offset)
{
do_io(offset & 0xf);
return 0xff;
@@ -150,12 +150,12 @@ UINT8 a2bus_ssramcard_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_ssramcard_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_ssramcard_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
do_io(offset & 0xf);
}
-UINT8 a2bus_ssramcard_device::read_inh_rom(address_space &space, UINT16 offset)
+uint8_t a2bus_ssramcard_device::read_inh_rom(address_space &space, uint16_t offset)
{
assert(m_inh_state & INH_READ); // this should never happen
@@ -167,7 +167,7 @@ UINT8 a2bus_ssramcard_device::read_inh_rom(address_space &space, UINT16 offset)
return m_ram[(offset & 0x1fff) + 0x2000 + m_main_bank];
}
-void a2bus_ssramcard_device::write_inh_rom(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_ssramcard_device::write_inh_rom(address_space &space, uint16_t offset, uint8_t data)
{
// are writes enabled?
if (!(m_inh_state & INH_WRITE))
diff --git a/src/devices/bus/a2bus/ramcard128k.h b/src/devices/bus/a2bus/ramcard128k.h
index c70f188c955..d8dbf33b5bf 100644
--- a/src/devices/bus/a2bus/ramcard128k.h
+++ b/src/devices/bus/a2bus/ramcard128k.h
@@ -24,20 +24,20 @@ class a2bus_ssramcard_device:
{
public:
// construction/destruction
- a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual void device_start() override;
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_inh_rom(address_space &space, UINT16 offset) override;
- virtual void write_inh_rom(address_space &space, UINT16 offset, UINT8 data) override;
- virtual UINT16 inh_start() override { return 0xd000; }
- virtual UINT16 inh_end() override { return 0xffff; }
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_inh_rom(address_space &space, uint16_t offset) override;
+ virtual void write_inh_rom(address_space &space, uint16_t offset, uint8_t data) override;
+ virtual uint16_t inh_start() override { return 0xd000; }
+ virtual uint16_t inh_end() override { return 0xffff; }
virtual int inh_type() override;
private:
@@ -47,7 +47,7 @@ private:
int m_last_offset;
int m_dxxx_bank;
int m_main_bank;
- UINT8 m_ram[128*1024];
+ uint8_t m_ram[128*1024];
};
// device type definition
diff --git a/src/devices/bus/a2bus/ramcard16k.cpp b/src/devices/bus/a2bus/ramcard16k.cpp
index 1d679b2be8c..d0d682deeaa 100644
--- a/src/devices/bus/a2bus/ramcard16k.cpp
+++ b/src/devices/bus/a2bus/ramcard16k.cpp
@@ -28,13 +28,13 @@ const device_type A2BUS_RAMCARD16K = &device_creator<a2bus_ramcard_device>;
// LIVE DEVICE
//**************************************************************************
-a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0)
{
}
-a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_RAMCARD16K, "Apple II 16K Language Card", tag, owner, clock, "a2ram16k", __FILE__),
device_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_last_offset(0), m_dxxx_bank(0)
{
@@ -119,7 +119,7 @@ void a2bus_ramcard_device::do_io(int offset)
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_ramcard_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_ramcard_device::read_c0nx(address_space &space, uint8_t offset)
{
do_io(offset & 0xf);
return 0xff;
@@ -130,12 +130,12 @@ UINT8 a2bus_ramcard_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_ramcard_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_ramcard_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
do_io(offset & 0xf);
}
-UINT8 a2bus_ramcard_device::read_inh_rom(address_space &space, UINT16 offset)
+uint8_t a2bus_ramcard_device::read_inh_rom(address_space &space, uint16_t offset)
{
assert(m_inh_state & INH_READ); // this should never happen
@@ -147,7 +147,7 @@ UINT8 a2bus_ramcard_device::read_inh_rom(address_space &space, UINT16 offset)
return m_ram[(offset & 0x1fff) + 0x2000];
}
-void a2bus_ramcard_device::write_inh_rom(address_space &space, UINT16 offset, UINT8 data)
+void a2bus_ramcard_device::write_inh_rom(address_space &space, uint16_t offset, uint8_t data)
{
// are writes enabled?
if (!(m_inh_state & INH_WRITE))
diff --git a/src/devices/bus/a2bus/ramcard16k.h b/src/devices/bus/a2bus/ramcard16k.h
index b604801a362..f01b6347d81 100644
--- a/src/devices/bus/a2bus/ramcard16k.h
+++ b/src/devices/bus/a2bus/ramcard16k.h
@@ -24,20 +24,20 @@ class a2bus_ramcard_device:
{
public:
// construction/destruction
- a2bus_ramcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_ramcard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual void device_start() override;
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_inh_rom(address_space &space, UINT16 offset) override;
- virtual void write_inh_rom(address_space &space, UINT16 offset, UINT8 data) override;
- virtual UINT16 inh_start() override { return 0xd000; }
- virtual UINT16 inh_end() override { return 0xffff; }
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_inh_rom(address_space &space, uint16_t offset) override;
+ virtual void write_inh_rom(address_space &space, uint16_t offset, uint8_t data) override;
+ virtual uint16_t inh_start() override { return 0xd000; }
+ virtual uint16_t inh_end() override { return 0xffff; }
virtual int inh_type() override;
private:
@@ -46,7 +46,7 @@ private:
int m_inh_state;
int m_last_offset;
int m_dxxx_bank;
- UINT8 m_ram[16*1024];
+ uint8_t m_ram[16*1024];
};
// device type definition
diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp
index 647dc774116..e83aa4f0999 100644
--- a/src/devices/bus/a2bus/timemasterho.cpp
+++ b/src/devices/bus/a2bus/timemasterho.cpp
@@ -121,7 +121,7 @@ const tiny_rom_entry *a2bus_timemasterho_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a2bus_card_interface(mconfig, *this),
m_pia(*this, TIMEMASTER_PIA_TAG),
@@ -131,7 +131,7 @@ a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconf
m_started = false;
}
-a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2BUS_TIMEMASTERHO, "Applied Engineering TimeMaster H.O.", tag, owner, clock, "a2tmstho", __FILE__),
device_a2bus_card_interface(mconfig, *this),
m_pia(*this, TIMEMASTER_PIA_TAG),
@@ -164,7 +164,7 @@ void a2bus_timemasterho_device::device_reset()
read_c0nx - called for reads from this card's c0nx space
-------------------------------------------------*/
-UINT8 a2bus_timemasterho_device::read_c0nx(address_space &space, UINT8 offset)
+uint8_t a2bus_timemasterho_device::read_c0nx(address_space &space, uint8_t offset)
{
if (offset <= 3)
{
@@ -179,7 +179,7 @@ UINT8 a2bus_timemasterho_device::read_c0nx(address_space &space, UINT8 offset)
write_c0nx - called for writes to this card's c0nx space
-------------------------------------------------*/
-void a2bus_timemasterho_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+void a2bus_timemasterho_device::write_c0nx(address_space &space, uint8_t offset, uint8_t data)
{
if (offset <= 3)
{
@@ -191,7 +191,7 @@ void a2bus_timemasterho_device::write_c0nx(address_space &space, UINT8 offset, U
read_cnxx - called for reads from this card's cnxx space
-------------------------------------------------*/
-UINT8 a2bus_timemasterho_device::read_cnxx(address_space &space, UINT8 offset)
+uint8_t a2bus_timemasterho_device::read_cnxx(address_space &space, uint8_t offset)
{
if (m_started)
{
@@ -209,7 +209,7 @@ UINT8 a2bus_timemasterho_device::read_cnxx(address_space &space, UINT8 offset)
read_c800 - called for reads from this card's c800 space
-------------------------------------------------*/
-UINT8 a2bus_timemasterho_device::read_c800(address_space &space, UINT16 offset)
+uint8_t a2bus_timemasterho_device::read_c800(address_space &space, uint16_t offset)
{
return m_rom[offset+0xc00];
}
@@ -242,7 +242,7 @@ WRITE8_MEMBER(a2bus_timemasterho_device::pia_out_b)
void a2bus_timemasterho_device::update_irqs()
{
- UINT8 dip = 0;
+ uint8_t dip = 0;
if (m_started)
{
diff --git a/src/devices/bus/a2bus/timemasterho.h b/src/devices/bus/a2bus/timemasterho.h
index 87fa840bc8f..f366ee838bc 100644
--- a/src/devices/bus/a2bus/timemasterho.h
+++ b/src/devices/bus/a2bus/timemasterho.h
@@ -26,8 +26,8 @@ class a2bus_timemasterho_device:
{
public:
// construction/destruction
- a2bus_timemasterho_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a2bus_timemasterho_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2bus_timemasterho_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a2bus_timemasterho_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -44,10 +44,10 @@ protected:
virtual void device_reset() override;
// overrides of standard a2bus slot functions
- virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
- virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
- virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
- virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
+ virtual uint8_t read_c0nx(address_space &space, uint8_t offset) override;
+ virtual void write_c0nx(address_space &space, uint8_t offset, uint8_t data) override;
+ virtual uint8_t read_cnxx(address_space &space, uint8_t offset) override;
+ virtual uint8_t read_c800(address_space &space, uint16_t offset) override;
required_device<pia6821_device> m_pia;
required_device<msm5832_device> m_msm5832;
@@ -56,7 +56,7 @@ protected:
private:
void update_irqs();
- UINT8 *m_rom;
+ uint8_t *m_rom;
bool m_irqa, m_irqb;
bool m_started;
};
diff --git a/src/devices/bus/a7800/a78_slot.cpp b/src/devices/bus/a7800/a78_slot.cpp
index 93997f3fecd..31c0cf7c514 100644
--- a/src/devices/bus/a7800/a78_slot.cpp
+++ b/src/devices/bus/a7800/a78_slot.cpp
@@ -62,7 +62,7 @@ device_a78_cart_interface::~device_a78_cart_interface ()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_a78_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_a78_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -86,7 +86,7 @@ void device_a78_cart_interface::rom_alloc(UINT32 size, const char *tag)
// ram_alloc - alloc the space for the on-cart RAM
//-------------------------------------------------
-void device_a78_cart_interface::ram_alloc(UINT32 size)
+void device_a78_cart_interface::ram_alloc(uint32_t size)
{
m_ram.resize(size);
device().save_item(NAME(m_ram));
@@ -97,7 +97,7 @@ void device_a78_cart_interface::ram_alloc(UINT32 size)
// ram_alloc - alloc the space for the on-cart RAM
//-------------------------------------------------
-void device_a78_cart_interface::nvram_alloc(UINT32 size)
+void device_a78_cart_interface::nvram_alloc(uint32_t size)
{
m_nvram.resize(size);
device().save_item(NAME(m_nvram));
@@ -112,7 +112,7 @@ void device_a78_cart_interface::nvram_alloc(UINT32 size)
//-------------------------------------------------
// a78_cart_slot_device - constructor
//-------------------------------------------------
-a78_cart_slot_device::a78_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a78_cart_slot_device::a78_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A78_CART_SLOT, "Atari 7800 Cartridge Slot", tag, owner, clock, "a78_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0)
@@ -346,7 +346,7 @@ image_init_result a78_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT32 len;
+ uint32_t len;
if (software_entry() != nullptr)
{
@@ -449,7 +449,7 @@ image_init_result a78_cart_slot_device::call_load()
osd_printf_info("Run it through the expansion to exploit this feature.\n");
}
- internal_header_logging((UINT8 *)head, length());
+ internal_header_logging((uint8_t *)head, length());
m_cart->rom_alloc(len, tag());
fread(m_cart->get_rom_base(), len);
@@ -523,7 +523,7 @@ std::string a78_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- std::vector<UINT8> head(128);
+ std::vector<uint8_t> head(128);
int type = A78_TYPE0, mapper;
// Load and check the header
@@ -714,14 +714,14 @@ WRITE8_MEMBER(a78_cart_slot_device::write_40xx)
-------------------------------------------------*/
-void a78_cart_slot_device::internal_header_logging(UINT8 *header, UINT32 len)
+void a78_cart_slot_device::internal_header_logging(uint8_t *header, uint32_t len)
{
char head_title[35];
- UINT32 head_length = (header[49] << 24) | (header[50] << 16) | (header[51] << 8) | header[52];
- UINT16 head_mapper = (header[53] << 8) | header[54];
- UINT8 head_ctrl1 = header[55];
- UINT8 head_ctrl2 = header[56];
- UINT8 head_ispal = header[57];
+ uint32_t head_length = (header[49] << 24) | (header[50] << 16) | (header[51] << 8) | header[52];
+ uint16_t head_mapper = (header[53] << 8) | header[54];
+ uint8_t head_ctrl1 = header[55];
+ uint8_t head_ctrl2 = header[56];
+ uint8_t head_ispal = header[57];
std::string cart_mapper, ctrl1, ctrl2;
memcpy(head_title, header + 0x11, 0x20);
diff --git a/src/devices/bus/a7800/a78_slot.h b/src/devices/bus/a7800/a78_slot.h
index 7267bce373a..bb9f9645651 100644
--- a/src/devices/bus/a7800/a78_slot.h
+++ b/src/devices/bus/a7800/a78_slot.h
@@ -55,24 +55,24 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_30xx) {}
virtual DECLARE_WRITE8_MEMBER(write_40xx) {}
- void rom_alloc(UINT32 size, const char *tag);
- void ram_alloc(UINT32 size);
- void nvram_alloc(UINT32 size);
- UINT8* get_rom_base() { return m_rom; }
- UINT8* get_ram_base() { return &m_ram[0]; }
- UINT8* get_nvram_base() { return &m_nvram[0]; }
- UINT32 get_rom_size() { return m_rom_size; }
- UINT32 get_ram_size() { return m_ram.size(); }
- UINT32 get_nvram_size() { return m_nvram.size(); }
+ void rom_alloc(uint32_t size, const char *tag);
+ void ram_alloc(uint32_t size);
+ void nvram_alloc(uint32_t size);
+ uint8_t* get_rom_base() { return m_rom; }
+ uint8_t* get_ram_base() { return &m_ram[0]; }
+ uint8_t* get_nvram_base() { return &m_nvram[0]; }
+ uint32_t get_rom_size() { return m_rom_size; }
+ uint32_t get_ram_size() { return m_ram.size(); }
+ uint32_t get_nvram_size() { return m_nvram.size(); }
protected:
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT8> m_ram;
- std::vector<UINT8> m_nvram; // HiScore cart can save scores!
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint8_t> m_ram;
+ std::vector<uint8_t> m_nvram; // HiScore cart can save scores!
// helpers
- UINT32 m_base_rom;
+ uint32_t m_base_rom;
int m_bank_mask;
};
@@ -88,7 +88,7 @@ class a78_cart_slot_device : public device_t,
{
public:
// construction/destruction
- a78_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~a78_cart_slot_device();
// device-level overrides
@@ -132,7 +132,7 @@ private:
image_verify_result verify_header(char *header);
int validate_header(int head, bool log);
- void internal_header_logging(UINT8 *header, UINT32 len);
+ void internal_header_logging(uint8_t *header, uint32_t len);
};
diff --git a/src/devices/bus/a7800/cpuwiz.cpp b/src/devices/bus/a7800/cpuwiz.cpp
index 2ec5b34e0e9..6d044bcc13c 100644
--- a/src/devices/bus/a7800/cpuwiz.cpp
+++ b/src/devices/bus/a7800/cpuwiz.cpp
@@ -40,24 +40,24 @@ const device_type A78_ROM_MEGACART = &device_creator<a78_megacart_device>;
const device_type A78_ROM_P450_VB = &device_creator<a78_rom_p450_vb_device>;
-a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: a78_rom_sg_device(mconfig, type, name, tag, owner, clock, shortname, source), m_ram_bank(0)
{
}
-a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_versaboard_device::a78_versaboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a78_rom_sg_device(mconfig, A78_ROM_VERSABOARD, "Atari 7800 VersaBoard Cart", tag, owner, clock, "a78_versaboard", __FILE__), m_ram_bank(0)
{
}
-a78_megacart_device::a78_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_megacart_device::a78_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a78_versaboard_device(mconfig, A78_ROM_MEGACART, "Atari 7800 MegaCart+", tag, owner, clock, "a78_megacart", __FILE__)
{
}
-a78_rom_p450_vb_device::a78_rom_p450_vb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_p450_vb_device::a78_rom_p450_vb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a78_versaboard_device(mconfig, A78_ROM_P450_VB, "Atari 7800 VersaBoard + POKEY @ 0x0450 Cart", tag, owner, clock, "a78_versapokey", __FILE__),
m_pokey450(*this, "pokey450")
{
diff --git a/src/devices/bus/a7800/cpuwiz.h b/src/devices/bus/a7800/cpuwiz.h
index 1decc581446..7d288055aaa 100644
--- a/src/devices/bus/a7800/cpuwiz.h
+++ b/src/devices/bus/a7800/cpuwiz.h
@@ -13,8 +13,8 @@ class a78_versaboard_device : public a78_rom_sg_device
{
public:
// construction/destruction
- a78_versaboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a78_versaboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_versaboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a78_versaboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -35,7 +35,7 @@ class a78_megacart_device : public a78_versaboard_device
{
public:
// construction/destruction
- a78_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ 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;
@@ -50,7 +50,7 @@ class a78_rom_p450_vb_device : public a78_versaboard_device
{
public:
// construction/destruction
- a78_rom_p450_vb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_p450_vb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a7800/hiscore.cpp b/src/devices/bus/a7800/hiscore.cpp
index 3448fb85808..381e6475d30 100644
--- a/src/devices/bus/a7800/hiscore.cpp
+++ b/src/devices/bus/a7800/hiscore.cpp
@@ -20,7 +20,7 @@
const device_type A78_HISCORE = &device_creator<a78_hiscore_device>;
-a78_hiscore_device::a78_hiscore_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_hiscore_device::a78_hiscore_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a78_rom_device(mconfig, A78_HISCORE, "Atari 7800 High Score Cart", tag, owner, clock, "a78_highscore", __FILE__),
m_hscslot(*this, "hsc_slot")
{
diff --git a/src/devices/bus/a7800/hiscore.h b/src/devices/bus/a7800/hiscore.h
index 3f8d7422d8b..2ce16b319c6 100644
--- a/src/devices/bus/a7800/hiscore.h
+++ b/src/devices/bus/a7800/hiscore.h
@@ -13,7 +13,7 @@ class a78_hiscore_device : public a78_rom_device
{
public:
// construction/destruction
- a78_hiscore_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_hiscore_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a7800/rom.cpp b/src/devices/bus/a7800/rom.cpp
index d7f2f41b7fd..3b230e79e56 100644
--- a/src/devices/bus/a7800/rom.cpp
+++ b/src/devices/bus/a7800/rom.cpp
@@ -42,102 +42,102 @@ const device_type A78_ROM_P450_SG_RAM = &device_creator<a78_rom_p450_sg_ram_devi
const device_type A78_ROM_P450_SG9 = &device_creator<a78_rom_p450_sg9_device>;
-a78_rom_device::a78_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a78_rom_device::a78_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a78_cart_interface( mconfig, *this )
{
}
-a78_rom_device::a78_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_device::a78_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, A78_ROM, "Atari 7800 ROM Carts w/no Bankswitch", tag, owner, clock, "a78_rom", __FILE__),
device_a78_cart_interface( mconfig, *this )
{
}
-a78_rom_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a78_rom_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: a78_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_pokey(*this, "pokey")
{
}
-a78_rom_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_pokey_device::a78_rom_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a78_rom_device(mconfig, A78_ROM_POKEY, "Atari 7800 ROM Carts w/no Bankswitch + POKEY", tag, owner, clock, "a78_rom_pok", __FILE__),
m_pokey(*this, "pokey")
{
}
-a78_rom_sg_device::a78_rom_sg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a78_rom_sg_device::a78_rom_sg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: a78_rom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_bank(0)
{
}
-a78_rom_sg_device::a78_rom_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_sg_device::a78_rom_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a78_rom_device(mconfig, A78_ROM_SG, "Atari 7800 ROM Carts w/SuperGame Bankswitch", tag, owner, clock, "a78_rom_sg", __FILE__), m_bank(0)
{
}
-a78_rom_sg_pokey_device::a78_rom_sg_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_sg_pokey_device::a78_rom_sg_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a78_rom_sg_device(mconfig, A78_ROM_SG_POKEY, "Atari 7800 ROM Carts w/SuperGame Bankswitch + POKEY", tag, owner, clock, "a78_rom_sgp", __FILE__),
m_pokey(*this, "pokey")
{
}
-a78_rom_sg_ram_device::a78_rom_sg_ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a78_rom_sg_ram_device::a78_rom_sg_ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: a78_rom_sg_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-a78_rom_sg_ram_device::a78_rom_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_sg_ram_device::a78_rom_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a78_rom_sg_device(mconfig, A78_ROM_SG_RAM, "Atari 7800 ROM Carts w/SuperGame Bankswitch + RAM", tag, owner, clock, "a78_rom_sgr", __FILE__)
{
}
-a78_rom_sg9_device::a78_rom_sg9_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a78_rom_sg9_device::a78_rom_sg9_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: a78_rom_sg_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-a78_rom_sg9_device::a78_rom_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_sg9_device::a78_rom_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a78_rom_sg_device(mconfig, A78_ROM_SG9, "Atari 7800 ROM Carts w/SuperGame 9Banks", tag, owner, clock, "a78_rom_sg9", __FILE__)
{
}
-a78_rom_abs_device::a78_rom_abs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_abs_device::a78_rom_abs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a78_rom_device(mconfig, A78_ROM_ABSOLUTE, "Atari 7800 ROM Carts w/Absolute Bankswitch", tag, owner, clock, "a78_rom_abs", __FILE__), m_bank(0)
{
}
-a78_rom_act_device::a78_rom_act_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_act_device::a78_rom_act_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a78_rom_device(mconfig, A78_ROM_ACTIVISION, "Atari 7800 ROM Carts w/Activision Bankswitch", tag, owner, clock, "a78_rom_act", __FILE__), m_bank(0)
{
}
-a78_rom_p450_device::a78_rom_p450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_p450_device::a78_rom_p450_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a78_rom_device(mconfig, A78_ROM_P450, "Atari 7800 ROM Carts w/POKEY @ 0x0450", tag, owner, clock, "a78_p450_t0", __FILE__),
m_pokey450(*this, "pokey450")
{
}
-a78_rom_p450_pokey_device::a78_rom_p450_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_p450_pokey_device::a78_rom_p450_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a78_rom_pokey_device(mconfig, A78_ROM_P450_POKEY, "Atari 7800 ROM Carts w/no Bankswitch + POKEY + POKEY @ 0x0450", tag, owner, clock, "a78_p450_t1", __FILE__),
m_pokey450(*this, "pokey450")
{
}
-a78_rom_p450_sg_ram_device::a78_rom_p450_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_p450_sg_ram_device::a78_rom_p450_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a78_rom_sg_ram_device(mconfig, A78_ROM_P450_SG_RAM, "Atari 7800 ROM Carts w/SuperGame Bankswitch + RAM + POKEY @ 0x0450", tag, owner, clock, "a78_p450_t6", __FILE__),
m_pokey450(*this, "pokey450")
{
}
-a78_rom_p450_sg9_device::a78_rom_p450_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_rom_p450_sg9_device::a78_rom_p450_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a78_rom_sg9_device(mconfig, A78_ROM_P450_SG9, "Atari 7800 ROM Carts w/SuperGame 9Banks + POKEY @ 0x0450", tag, owner, clock, "a78_p450_ta", __FILE__),
m_pokey450(*this, "pokey450")
{
@@ -438,8 +438,8 @@ WRITE8_MEMBER(a78_rom_abs_device::write_40xx)
READ8_MEMBER(a78_rom_act_device::read_40xx)
{
- UINT8 data = 0xff;
- UINT16 addr = offset & 0x1fff;
+ uint8_t data = 0xff;
+ uint16_t addr = offset & 0x1fff;
// offset goes from 0 to 0xc000
switch (offset & 0xe000)
diff --git a/src/devices/bus/a7800/rom.h b/src/devices/bus/a7800/rom.h
index 7c7f6507e38..3e64f653e8f 100644
--- a/src/devices/bus/a7800/rom.h
+++ b/src/devices/bus/a7800/rom.h
@@ -14,8 +14,8 @@ class a78_rom_device : public device_t,
{
public:
// construction/destruction
- a78_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a78_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a78_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -32,8 +32,8 @@ class a78_rom_pokey_device : public a78_rom_device
{
public:
// construction/destruction
- a78_rom_pokey_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a78_rom_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_pokey_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a78_rom_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -53,8 +53,8 @@ class a78_rom_sg_device : public a78_rom_device
{
public:
// construction/destruction
- a78_rom_sg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a78_rom_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_sg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a78_rom_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -75,7 +75,7 @@ class a78_rom_sg_pokey_device : public a78_rom_sg_device
{
public:
// construction/destruction
- a78_rom_sg_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_sg_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -95,8 +95,8 @@ class a78_rom_sg_ram_device : public a78_rom_sg_device
{
public:
// construction/destruction
- a78_rom_sg_ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a78_rom_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_sg_ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ 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;
@@ -110,8 +110,8 @@ class a78_rom_sg9_device : public a78_rom_sg_device
{
public:
// construction/destruction
- a78_rom_sg9_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a78_rom_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_sg9_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ 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;
@@ -125,7 +125,7 @@ class a78_rom_abs_device : public a78_rom_device
{
public:
// construction/destruction
- a78_rom_abs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_abs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -146,7 +146,7 @@ class a78_rom_act_device : public a78_rom_device
{
public:
// construction/destruction
- a78_rom_act_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_act_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -169,7 +169,7 @@ class a78_rom_p450_device : public a78_rom_device
{
public:
// construction/destruction
- a78_rom_p450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_p450_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -188,7 +188,7 @@ class a78_rom_p450_pokey_device : public a78_rom_pokey_device
{
public:
// construction/destruction
- a78_rom_p450_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_p450_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -207,7 +207,7 @@ class a78_rom_p450_sg_ram_device : public a78_rom_sg_ram_device
{
public:
// construction/destruction
- a78_rom_p450_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_p450_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -226,7 +226,7 @@ class a78_rom_p450_sg9_device : public a78_rom_sg9_device
{
public:
// construction/destruction
- a78_rom_p450_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_rom_p450_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/a7800/xboard.cpp b/src/devices/bus/a7800/xboard.cpp
index af05c663440..422cd0a740e 100644
--- a/src/devices/bus/a7800/xboard.cpp
+++ b/src/devices/bus/a7800/xboard.cpp
@@ -56,7 +56,7 @@ const device_type A78_XBOARD = &device_creator<a78_xboard_device>;
const device_type A78_XM = &device_creator<a78_xm_device>;
-a78_xboard_device::a78_xboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a78_xboard_device::a78_xboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: a78_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_xbslot(*this, "xb_slot"),
m_pokey(*this, "xb_pokey"), m_reg(0), m_ram_bank(0)
@@ -64,7 +64,7 @@ a78_xboard_device::a78_xboard_device(const machine_config &mconfig, device_type
}
-a78_xboard_device::a78_xboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_xboard_device::a78_xboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a78_rom_device(mconfig, A78_XBOARD, "Atari 7800 XBoarD expansion", tag, owner, clock, "a78_xboard", __FILE__),
m_xbslot(*this, "xb_slot"),
m_pokey(*this, "xb_pokey"), m_reg(0), m_ram_bank(0)
@@ -72,7 +72,7 @@ a78_xboard_device::a78_xboard_device(const machine_config &mconfig, const char *
}
-a78_xm_device::a78_xm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a78_xm_device::a78_xm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a78_xboard_device(mconfig, A78_XM, "Atari 7800 XM expansion module", tag, owner, clock, "a78_xm", __FILE__),
m_ym(*this, "xm_ym2151"), m_ym_enabled(0)
{
diff --git a/src/devices/bus/a7800/xboard.h b/src/devices/bus/a7800/xboard.h
index b9cf77d6adb..0ab9884a957 100644
--- a/src/devices/bus/a7800/xboard.h
+++ b/src/devices/bus/a7800/xboard.h
@@ -15,8 +15,8 @@ class a78_xboard_device : public a78_rom_device
{
public:
// construction/destruction
- a78_xboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a78_xboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_xboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a78_xboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -42,7 +42,7 @@ class a78_xm_device : public a78_xboard_device
{
public:
// construction/destruction
- a78_xm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a78_xm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/a800/a800_slot.cpp b/src/devices/bus/a800/a800_slot.cpp
index 4aafc77f1d3..d5d5d4d9555 100644
--- a/src/devices/bus/a800/a800_slot.cpp
+++ b/src/devices/bus/a800/a800_slot.cpp
@@ -59,7 +59,7 @@ device_a800_cart_interface::~device_a800_cart_interface ()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_a800_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_a800_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -75,7 +75,7 @@ void device_a800_cart_interface::rom_alloc(UINT32 size, const char *tag)
// ram_alloc - alloc the space for the on-cart RAM
//-------------------------------------------------
-void device_a800_cart_interface::ram_alloc(UINT32 size)
+void device_a800_cart_interface::ram_alloc(uint32_t size)
{
m_ram.resize(size);
device().save_item(NAME(m_ram));
@@ -86,7 +86,7 @@ void device_a800_cart_interface::ram_alloc(UINT32 size)
// ram_alloc - alloc the space for the on-cart RAM
//-------------------------------------------------
-void device_a800_cart_interface::nvram_alloc(UINT32 size)
+void device_a800_cart_interface::nvram_alloc(uint32_t size)
{
m_nvram.resize(size);
device().save_item(NAME(m_nvram));
@@ -101,14 +101,14 @@ void device_a800_cart_interface::nvram_alloc(UINT32 size)
//-------------------------------------------------
// ****_cart_slot_device - constructor
//-------------------------------------------------
-a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0)
{
}
-a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A800_CART_SLOT, "Atari 8bit Cartridge Slot", tag, owner, clock, "a800_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0)
@@ -116,13 +116,13 @@ a800_cart_slot_device::a800_cart_slot_device(const machine_config &mconfig, cons
}
-a5200_cart_slot_device::a5200_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a5200_cart_slot_device::a5200_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a800_cart_slot_device(mconfig, A5200_CART_SLOT, "Atari 5200 Cartridge Slot", tag, owner, clock, "a5200_cart_slot", __FILE__)
{
}
-xegs_cart_slot_device::xegs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+xegs_cart_slot_device::xegs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
a800_cart_slot_device(mconfig, XEGS_CART_SLOT, "Atari XEGS Cartridge Slot", tag, owner, clock, "xegs_cart_slot", __FILE__)
{
}
@@ -240,7 +240,7 @@ image_init_result a800_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT32 len;
+ uint32_t len;
if (software_entry() != nullptr)
{
@@ -262,7 +262,7 @@ image_init_result a800_cart_slot_device::call_load()
// check whether there is an header, to identify the cart type
if ((len % 0x1000) == 0x10)
{
- UINT8 header[16];
+ uint8_t header[16];
fread(header, 0x10);
m_type = identify_cart_type(header);
len -= 0x10; // in identify_cart_type the first 0x10 bytes are read, so we need to adjust here
@@ -308,7 +308,7 @@ void a800_cart_slot_device::call_unload()
fullpath
-------------------------------------------------*/
-int a800_cart_slot_device::identify_cart_type(UINT8 *header)
+int a800_cart_slot_device::identify_cart_type(uint8_t *header)
{
int type = A800_8K;
@@ -405,8 +405,8 @@ std::string a800_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- std::vector<UINT8> head(0x10);
- UINT32 len = m_file->size();
+ std::vector<uint8_t> head(0x10);
+ uint32_t len = m_file->size();
int type = A800_8K;
// check whether there is an header, to identify the cart type
@@ -442,8 +442,8 @@ std::string a5200_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- std::vector<UINT8> head(0x10);
- UINT32 len = m_file->size();
+ std::vector<uint8_t> head(0x10);
+ uint32_t len = m_file->size();
int type = A5200_8K;
// check whether there is an header, to identify the cart type
@@ -477,8 +477,8 @@ std::string xegs_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- std::vector<UINT8> head(0x10);
- UINT32 len = m_file->size();
+ std::vector<uint8_t> head(0x10);
+ uint32_t len = m_file->size();
int type = A800_8K;
// check whether there is an header, to identify the cart type
diff --git a/src/devices/bus/a800/a800_slot.h b/src/devices/bus/a800/a800_slot.h
index cc1b6ba275c..5bf4ceeebc2 100644
--- a/src/devices/bus/a800/a800_slot.h
+++ b/src/devices/bus/a800/a800_slot.h
@@ -58,22 +58,22 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_80xx) {}
virtual DECLARE_WRITE8_MEMBER(write_d5xx) {}
- void rom_alloc(UINT32 size, const char *tag);
- void ram_alloc(UINT32 size);
- void nvram_alloc(UINT32 size);
- UINT8* get_rom_base() { return m_rom; }
- UINT8* get_ram_base() { return &m_ram[0]; }
- UINT8* get_nvram_base() { return &m_nvram[0]; }
- UINT32 get_rom_size() { return m_rom_size; }
- UINT32 get_ram_size() { return m_ram.size(); }
- UINT32 get_nvram_size() { return m_nvram.size(); }
+ void rom_alloc(uint32_t size, const char *tag);
+ void ram_alloc(uint32_t size);
+ void nvram_alloc(uint32_t size);
+ uint8_t* get_rom_base() { return m_rom; }
+ uint8_t* get_ram_base() { return &m_ram[0]; }
+ uint8_t* get_nvram_base() { return &m_nvram[0]; }
+ uint32_t get_rom_size() { return m_rom_size; }
+ uint32_t get_ram_size() { return m_ram.size(); }
+ uint32_t get_nvram_size() { return m_nvram.size(); }
protected:
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT8> m_ram;
- std::vector<UINT8> m_nvram; // HiScore cart can save scores!
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint8_t> m_ram;
+ std::vector<uint8_t> m_nvram; // HiScore cart can save scores!
// helpers
int m_bank_mask;
};
@@ -87,8 +87,8 @@ class a800_cart_slot_device : public device_t,
{
public:
// construction/destruction
- a800_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a800_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a800_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~a800_cart_slot_device();
// device-level overrides
@@ -101,7 +101,7 @@ public:
virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
int get_cart_type() { return m_type; };
- int identify_cart_type(UINT8 *header);
+ int identify_cart_type(uint8_t *header);
bool has_cart() { return m_cart != nullptr; }
virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
@@ -137,7 +137,7 @@ class a5200_cart_slot_device : public a800_cart_slot_device
{
public:
// construction/destruction
- a5200_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a5200_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~a5200_cart_slot_device();
virtual const char *file_extensions() const override { return "bin,rom,car,a52"; }
@@ -152,7 +152,7 @@ class xegs_cart_slot_device : public a800_cart_slot_device
{
public:
// construction/destruction
- xegs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ xegs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~xegs_cart_slot_device();
virtual const char *file_extensions() const override { return "bin,rom,car"; }
diff --git a/src/devices/bus/a800/a8sio.cpp b/src/devices/bus/a800/a8sio.cpp
index 54f45ecb208..d6c8dbe7e3f 100644
--- a/src/devices/bus/a800/a8sio.cpp
+++ b/src/devices/bus/a800/a8sio.cpp
@@ -48,13 +48,13 @@ const device_type A8SIO_SLOT = &device_creator<a8sio_slot_device>;
//-------------------------------------------------
// a8sio_slot_device - constructor
//-------------------------------------------------
-a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, A8SIO_SLOT, "Atari 8 bit SIO Slot", tag, owner, clock, "a8sio_slot", __FILE__)
, device_slot_interface(mconfig, *this), m_a8sio_tag(nullptr), m_a8sio_slottag(nullptr)
{
}
-a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+a8sio_slot_device::a8sio_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this), m_a8sio_tag(nullptr), m_a8sio_slottag(nullptr)
{
@@ -98,7 +98,7 @@ const device_type A8SIO = &device_creator<a8sio_device>;
// a8sio_device - constructor
//-------------------------------------------------
-a8sio_device::a8sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a8sio_device::a8sio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, A8SIO, "Atari 8 biot SIO", tag, owner, clock, "a8sio", __FILE__)
, m_out_clock_in_cb(*this)
, m_out_data_in_cb(*this)
@@ -106,7 +106,7 @@ a8sio_device::a8sio_device(const machine_config &mconfig, const char *tag, devic
{
}
-a8sio_device::a8sio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a8sio_device::a8sio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
, m_out_clock_in_cb(*this)
, m_out_data_in_cb(*this)
diff --git a/src/devices/bus/a800/a8sio.h b/src/devices/bus/a800/a8sio.h
index 0a06c0c93b8..2684a3d3c28 100644
--- a/src/devices/bus/a800/a8sio.h
+++ b/src/devices/bus/a800/a8sio.h
@@ -54,8 +54,8 @@ class a8sio_slot_device : public device_t,
{
public:
// construction/destruction
- a8sio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a8sio_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a8sio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a8sio_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -80,8 +80,8 @@ class a8sio_device : public device_t
{
public:
// construction/destruction
- a8sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a8sio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a8sio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a8sio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// inline configuration
template<class _Object> static devcb_base &set_clock_in_callback(device_t &device, _Object object) { return downcast<a8sio_device &>(device).m_out_clock_in_cb.set_callback(object); }
diff --git a/src/devices/bus/a800/cassette.cpp b/src/devices/bus/a800/cassette.cpp
index 3a6406d44a1..7ff511bd0d7 100644
--- a/src/devices/bus/a800/cassette.cpp
+++ b/src/devices/bus/a800/cassette.cpp
@@ -44,7 +44,7 @@ machine_config_constructor a8sio_cassette_device::device_mconfig_additions() con
// LIVE DEVICE
//**************************************************************************
-a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, A8SIO_CASSETTE, "Atari 8 bit cassette", tag, owner, clock, "a8sio_cass", __FILE__)
, device_a8sio_card_interface(mconfig, *this)
, m_cassette(*this, "cassette"), m_read_timer(nullptr)
@@ -53,7 +53,7 @@ a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, cons
{
}
-a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a8sio_cassette_device::a8sio_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
, device_a8sio_card_interface(mconfig, *this)
, m_cassette(*this, "cassette"), m_read_timer(nullptr)
@@ -96,7 +96,7 @@ void a8sio_cassette_device::device_timer(emu_timer &timer, device_timer_id id, i
switch (id)
{
case TIMER_CASSETTE_READ:
- UINT8 cass_signal = m_cassette->input() < 0 ? 0 : 1;
+ uint8_t cass_signal = m_cassette->input() < 0 ? 0 : 1;
if (m_signal_count < 20)
{
diff --git a/src/devices/bus/a800/cassette.h b/src/devices/bus/a800/cassette.h
index d3bb24bbc4f..72d0f749ccc 100644
--- a/src/devices/bus/a800/cassette.h
+++ b/src/devices/bus/a800/cassette.h
@@ -27,8 +27,8 @@ class a8sio_cassette_device
{
public:
// construction/destruction
- a8sio_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- a8sio_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a8sio_cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a8sio_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -43,8 +43,8 @@ protected:
required_device<cassette_image_device> m_cassette;
emu_timer *m_read_timer;
- UINT8 m_old_cass_signal;
- UINT8 m_signal_count;
+ uint8_t m_old_cass_signal;
+ uint8_t m_signal_count;
};
// device type definition
diff --git a/src/devices/bus/a800/oss.cpp b/src/devices/bus/a800/oss.cpp
index 5cdc7e72126..2e2af58c0f0 100644
--- a/src/devices/bus/a800/oss.cpp
+++ b/src/devices/bus/a800/oss.cpp
@@ -21,26 +21,26 @@ const device_type A800_ROM_OSS43 = &device_creator<a800_rom_oss43_device>;
const device_type A800_ROM_OSS91 = &device_creator<a800_rom_oss91_device>;
-a800_rom_oss8k_device::a800_rom_oss8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_oss8k_device::a800_rom_oss8k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a800_rom_device(mconfig, A800_ROM_OSS8K, "Atari 800 ROM Carts OSS 8K", tag, owner, clock, "a800_oss8k", __FILE__),
m_bank(0)
{
}
-a800_rom_oss34_device::a800_rom_oss34_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_oss34_device::a800_rom_oss34_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a800_rom_device(mconfig, A800_ROM_OSS34, "Atari 800 ROM Carts OSS-034M", tag, owner, clock, "a800_034m", __FILE__), m_bank(0)
{
}
-a800_rom_oss43_device::a800_rom_oss43_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_oss43_device::a800_rom_oss43_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a800_rom_device(mconfig, A800_ROM_OSS43, "Atari 800 ROM Carts OSS-043M", tag, owner, clock, "a800_043m", __FILE__), m_bank(0)
{
}
-a800_rom_oss91_device::a800_rom_oss91_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_oss91_device::a800_rom_oss91_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a800_rom_device(mconfig, A800_ROM_OSS91, "Atari 800 ROM Carts OSS-M091", tag, owner, clock, "a800_m091", __FILE__), m_bank(0)
{
}
diff --git a/src/devices/bus/a800/oss.h b/src/devices/bus/a800/oss.h
index 20524eedd64..fef9ab5d939 100644
--- a/src/devices/bus/a800/oss.h
+++ b/src/devices/bus/a800/oss.h
@@ -12,7 +12,7 @@ class a800_rom_oss8k_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_oss8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_oss8k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -32,7 +32,7 @@ class a800_rom_oss34_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_oss34_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_oss34_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -52,7 +52,7 @@ class a800_rom_oss43_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_oss43_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_oss43_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -72,7 +72,7 @@ class a800_rom_oss91_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_oss91_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_oss91_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/a800/rom.cpp b/src/devices/bus/a800/rom.cpp
index 1a21ab92039..a3625fa754c 100644
--- a/src/devices/bus/a800/rom.cpp
+++ b/src/devices/bus/a800/rom.cpp
@@ -30,69 +30,69 @@ const device_type A5200_ROM_2CHIPS = &device_creator<a5200_rom_2chips_device>;
const device_type A5200_ROM_BBSB = &device_creator<a5200_rom_bbsb_device>;
-a800_rom_device::a800_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a800_rom_device::a800_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_a800_cart_interface( mconfig, *this )
{
}
-a800_rom_device::a800_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_device::a800_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, A800_ROM, "Atari 800 ROM Carts", tag, owner, clock, "a800_rom", __FILE__),
device_a800_cart_interface( mconfig, *this )
{
}
-a800_rom_bbsb_device::a800_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_bbsb_device::a800_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a800_rom_device(mconfig, A800_ROM_BBSB, "Atari 800 ROM Cart BBSB", tag, owner, clock, "a800_bbsb", __FILE__)
{
}
-xegs_rom_device::xegs_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+xegs_rom_device::xegs_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a800_rom_device(mconfig, XEGS_ROM, "Atari XEGS 64K ROM Carts", tag, owner, clock, "a800_xegs", __FILE__), m_bank(0)
{
}
-a800_rom_williams_device::a800_rom_williams_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_williams_device::a800_rom_williams_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a800_rom_device(mconfig, A800_ROM_WILLIAMS, "Atari 800 64K ROM Carts Williams", tag, owner, clock, "a800_williams", __FILE__), m_bank(0)
{
}
-a800_rom_express_device::a800_rom_express_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_express_device::a800_rom_express_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a800_rom_device(mconfig, A800_ROM_EXPRESS, "Atari 800 64K ROM Carts Express/Diamond", tag, owner, clock, "a800_express", __FILE__), m_bank(0)
{
}
-a800_rom_turbo_device::a800_rom_turbo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_turbo_device::a800_rom_turbo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a800_rom_device(mconfig, A800_ROM_TURBO, "Atari 800 64K ROM Carts Turbosoft", tag, owner, clock, "a800_turbo", __FILE__), m_bank(0)
{
}
-a800_rom_telelink2_device::a800_rom_telelink2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_telelink2_device::a800_rom_telelink2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a800_rom_device(mconfig, A800_ROM_TELELINK2, "Atari 800 64K ROM Cart Telelink II", tag, owner, clock, "a800_tlink2", __FILE__)
{
}
-a800_rom_microcalc_device::a800_rom_microcalc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_microcalc_device::a800_rom_microcalc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a800_rom_device(mconfig, A800_ROM_MICROCALC, "Atari 800 64K ROM Cart SITSA MicroCalc", tag, owner, clock, "a800_sitsa", __FILE__), m_bank(0)
{
}
-a5200_rom_2chips_device::a5200_rom_2chips_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a5200_rom_2chips_device::a5200_rom_2chips_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a800_rom_device(mconfig, A5200_ROM_2CHIPS, "Atari 5200 ROM Cart 16K in 2 Chips", tag, owner, clock, "a5200_16k2c", __FILE__)
{
}
-a5200_rom_bbsb_device::a5200_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a5200_rom_bbsb_device::a5200_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a800_rom_device(mconfig, A5200_ROM_BBSB, "Atari 5200 ROM Cart BBSB", tag, owner, clock, "a5200_bbsb", __FILE__)
{
}
@@ -234,7 +234,7 @@ READ8_MEMBER(a800_rom_bbsb_device::read_80xx)
WRITE8_MEMBER(a800_rom_bbsb_device::write_80xx)
{
- UINT16 addr = offset & 0xfff;
+ uint16_t addr = offset & 0xfff;
if (addr >= 0xff6 && addr <= 0xff9)
m_banks[BIT(offset, 12)] = (addr - 0xff6);
}
@@ -441,7 +441,7 @@ READ8_MEMBER(a5200_rom_bbsb_device::read_80xx)
WRITE8_MEMBER(a5200_rom_bbsb_device::write_80xx)
{
- UINT16 addr = offset & 0xfff;
+ uint16_t addr = offset & 0xfff;
if (addr >= 0xff6 && addr <= 0xff9)
m_banks[BIT(offset, 12)] = (addr - 0xff6);
}
diff --git a/src/devices/bus/a800/rom.h b/src/devices/bus/a800/rom.h
index f02b5be43ef..e15d5e29a0a 100644
--- a/src/devices/bus/a800/rom.h
+++ b/src/devices/bus/a800/rom.h
@@ -13,8 +13,8 @@ class a800_rom_device : public device_t,
{
public:
// construction/destruction
- a800_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a800_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a800_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -30,7 +30,7 @@ class a800_rom_bbsb_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -50,7 +50,7 @@ class a800_rom_williams_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_williams_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_williams_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -70,7 +70,7 @@ class a800_rom_express_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_express_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_express_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -90,7 +90,7 @@ class a800_rom_blizzard_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_blizzard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_blizzard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -106,7 +106,7 @@ class a800_rom_turbo_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_turbo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_turbo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -126,7 +126,7 @@ class a800_rom_telelink2_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_telelink2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ 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;
@@ -141,7 +141,7 @@ class a800_rom_microcalc_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_microcalc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_microcalc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -161,7 +161,7 @@ class xegs_rom_device : public a800_rom_device
{
public:
// construction/destruction
- xegs_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ xegs_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -181,7 +181,7 @@ class a5200_rom_2chips_device : public a800_rom_device
{
public:
// construction/destruction
- a5200_rom_2chips_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a5200_rom_2chips_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_READ8_MEMBER(read_80xx) override;
};
@@ -193,7 +193,7 @@ class a5200_rom_bbsb_device : public a800_rom_device
{
public:
// construction/destruction
- a5200_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a5200_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/a800/sparta.cpp b/src/devices/bus/a800/sparta.cpp
index 44204cd7fa7..55639200485 100644
--- a/src/devices/bus/a800/sparta.cpp
+++ b/src/devices/bus/a800/sparta.cpp
@@ -18,7 +18,7 @@
const device_type A800_ROM_SPARTADOS = &device_creator<a800_rom_spartados_device>;
-a800_rom_spartados_device::a800_rom_spartados_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a800_rom_spartados_device::a800_rom_spartados_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a800_rom_device(mconfig, A800_ROM_SPARTADOS, "Atari 800 SpartaDOS ROM Carts", tag, owner, clock, "a800_sparta", __FILE__),
m_bank(0),
m_subslot_enabled(0)
diff --git a/src/devices/bus/a800/sparta.h b/src/devices/bus/a800/sparta.h
index 5588cb464fd..f39aa515cde 100644
--- a/src/devices/bus/a800/sparta.h
+++ b/src/devices/bus/a800/sparta.h
@@ -12,7 +12,7 @@ class a800_rom_spartados_device : public a800_rom_device
{
public:
// construction/destruction
- a800_rom_spartados_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a800_rom_spartados_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/abcbus/abc890.cpp b/src/devices/bus/abcbus/abc890.cpp
index b9e7902dfd2..192b113e245 100644
--- a/src/devices/bus/abcbus/abc890.cpp
+++ b/src/devices/bus/abcbus/abc890.cpp
@@ -186,39 +186,39 @@ machine_config_constructor abc856_t::device_mconfig_additions() const
// abc890_t - constructor
//-------------------------------------------------
-abc890_t::abc890_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+abc890_t::abc890_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_abcbus_card_interface(mconfig, *this)
{
}
-abc890_t::abc890_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc890_t::abc890_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ABC890, "ABC 890", tag, owner, clock, "abc890", __FILE__),
device_abcbus_card_interface(mconfig, *this)
{
}
-abc_expansion_unit_t::abc_expansion_unit_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc_expansion_unit_t::abc_expansion_unit_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
abc890_t(mconfig, ABC_EXPANSION_UNIT, "ABC Expansion Unit", tag, owner, clock, "abcexp", __FILE__)
{
}
-abc894_t::abc894_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc894_t::abc894_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
abc890_t(mconfig, ABC894, "ABC 894", tag, owner, clock, "abc894", __FILE__)
{
}
-abc850_t::abc850_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc850_t::abc850_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
abc890_t(mconfig, ABC850, "ABC 850", tag, owner, clock, "abc850", __FILE__)
{
}
-abc852_t::abc852_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc852_t::abc852_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
abc890_t(mconfig, ABC852, "ABC 852", tag, owner, clock, "abc852", __FILE__)
{
}
-abc856_t::abc856_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc856_t::abc856_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
abc890_t(mconfig, ABC856, "ABC 856", tag, owner, clock, "abc856", __FILE__)
{
}
@@ -250,7 +250,7 @@ void abc890_t::device_reset()
// abcbus_cs - card select
//-------------------------------------------------
-void abc890_t::abcbus_cs(UINT8 data)
+void abc890_t::abcbus_cs(uint8_t data)
{
for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
{
@@ -263,9 +263,9 @@ void abc890_t::abcbus_cs(UINT8 data)
// abcbus_inp - input
//-------------------------------------------------
-UINT8 abc890_t::abcbus_inp()
+uint8_t abc890_t::abcbus_inp()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
{
@@ -280,7 +280,7 @@ UINT8 abc890_t::abcbus_inp()
// abcbus_out - output
//-------------------------------------------------
-void abc890_t::abcbus_out(UINT8 data)
+void abc890_t::abcbus_out(uint8_t data)
{
for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
{
@@ -293,9 +293,9 @@ void abc890_t::abcbus_out(UINT8 data)
// abcbus_stat - status
//-------------------------------------------------
-UINT8 abc890_t::abcbus_stat()
+uint8_t abc890_t::abcbus_stat()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
{
@@ -310,7 +310,7 @@ UINT8 abc890_t::abcbus_stat()
// abcbus_c1 - command 1
//-------------------------------------------------
-void abc890_t::abcbus_c1(UINT8 data)
+void abc890_t::abcbus_c1(uint8_t data)
{
for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
{
@@ -323,7 +323,7 @@ void abc890_t::abcbus_c1(UINT8 data)
// abcbus_c2 - command 2
//-------------------------------------------------
-void abc890_t::abcbus_c2(UINT8 data)
+void abc890_t::abcbus_c2(uint8_t data)
{
for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
{
@@ -336,7 +336,7 @@ void abc890_t::abcbus_c2(UINT8 data)
// abcbus_c3 - command 3
//-------------------------------------------------
-void abc890_t::abcbus_c3(UINT8 data)
+void abc890_t::abcbus_c3(uint8_t data)
{
for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
{
@@ -349,7 +349,7 @@ void abc890_t::abcbus_c3(UINT8 data)
// abcbus_c4 - command 4
//-------------------------------------------------
-void abc890_t::abcbus_c4(UINT8 data)
+void abc890_t::abcbus_c4(uint8_t data)
{
for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
{
@@ -362,9 +362,9 @@ void abc890_t::abcbus_c4(UINT8 data)
// abcbus_xmemfl - extended memory read
//-------------------------------------------------
-UINT8 abc890_t::abcbus_xmemfl(offs_t offset)
+uint8_t abc890_t::abcbus_xmemfl(offs_t offset)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
{
@@ -379,7 +379,7 @@ UINT8 abc890_t::abcbus_xmemfl(offs_t offset)
// abcbus_xmemw - extended memory write
//-------------------------------------------------
-void abc890_t::abcbus_xmemw(offs_t offset, UINT8 data)
+void abc890_t::abcbus_xmemw(offs_t offset, uint8_t data)
{
for (abcbus_slot_t &slot : abcbus_slot_device_iterator(*this))
{
diff --git a/src/devices/bus/abcbus/abc890.h b/src/devices/bus/abcbus/abc890.h
index 0cedef00e45..27481a6ca2c 100644
--- a/src/devices/bus/abcbus/abc890.h
+++ b/src/devices/bus/abcbus/abc890.h
@@ -27,8 +27,8 @@ class abc890_t : public device_t,
{
public:
// construction/destruction
- abc890_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- abc890_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc890_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ abc890_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -39,16 +39,16 @@ protected:
virtual void device_reset() override;
// device_abcbus_interface overrides
- virtual void abcbus_cs(UINT8 data) override;
- virtual UINT8 abcbus_inp() override;
- virtual void abcbus_out(UINT8 data) override;
- virtual UINT8 abcbus_stat() override;
- virtual void abcbus_c1(UINT8 data) override;
- virtual void abcbus_c2(UINT8 data) override;
- virtual void abcbus_c3(UINT8 data) override;
- virtual void abcbus_c4(UINT8 data) override;
- virtual UINT8 abcbus_xmemfl(offs_t offset) override;
- virtual void abcbus_xmemw(offs_t offset, UINT8 data) override;
+ virtual void abcbus_cs(uint8_t data) override;
+ virtual uint8_t abcbus_inp() override;
+ virtual void abcbus_out(uint8_t data) override;
+ virtual uint8_t abcbus_stat() override;
+ virtual void abcbus_c1(uint8_t data) override;
+ virtual void abcbus_c2(uint8_t data) override;
+ virtual void abcbus_c3(uint8_t data) override;
+ virtual void abcbus_c4(uint8_t data) override;
+ virtual uint8_t abcbus_xmemfl(offs_t offset) override;
+ virtual void abcbus_xmemw(offs_t offset, uint8_t data) override;
};
@@ -58,7 +58,7 @@ class abc_expansion_unit_t : public abc890_t
{
public:
// construction/destruction
- abc_expansion_unit_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc_expansion_unit_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -71,7 +71,7 @@ class abc894_t : public abc890_t
{
public:
// construction/destruction
- abc894_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc894_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -84,7 +84,7 @@ class abc850_t : public abc890_t
{
public:
// construction/destruction
- abc850_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc850_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -97,7 +97,7 @@ class abc852_t : public abc890_t
{
public:
// construction/destruction
- abc852_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc852_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -110,7 +110,7 @@ class abc856_t : public abc890_t
{
public:
// construction/destruction
- abc856_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc856_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/abcbus/abcbus.cpp b/src/devices/bus/abcbus/abcbus.cpp
index 4bec92bc417..e0335d610f5 100644
--- a/src/devices/bus/abcbus/abcbus.cpp
+++ b/src/devices/bus/abcbus/abcbus.cpp
@@ -37,7 +37,7 @@ device_abcbus_card_interface::device_abcbus_card_interface(const machine_config
// abcbus_slot_t - constructor
//-------------------------------------------------
-abcbus_slot_t::abcbus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abcbus_slot_t::abcbus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ABCBUS_SLOT, "ABCBUS slot", tag, owner, clock, "abcbus_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_write_irq(*this),
diff --git a/src/devices/bus/abcbus/abcbus.h b/src/devices/bus/abcbus/abcbus.h
index 24ecb23b7ff..906d3d1b3d2 100644
--- a/src/devices/bus/abcbus/abcbus.h
+++ b/src/devices/bus/abcbus/abcbus.h
@@ -167,27 +167,27 @@ public:
device_abcbus_card_interface(const machine_config &mconfig, device_t &device);
// required operation overrides
- virtual void abcbus_cs(UINT8 data) = 0;
+ virtual void abcbus_cs(uint8_t data) = 0;
// optional operation overrides
- virtual UINT8 abcbus_inp() { return 0xff; };
- virtual void abcbus_out(UINT8 data) { };
- virtual UINT8 abcbus_stat() { return 0xff; };
- virtual void abcbus_c1(UINT8 data) { };
- virtual void abcbus_c2(UINT8 data) { };
- virtual void abcbus_c3(UINT8 data) { };
- virtual void abcbus_c4(UINT8 data) { };
+ virtual uint8_t abcbus_inp() { return 0xff; };
+ virtual void abcbus_out(uint8_t data) { };
+ virtual uint8_t abcbus_stat() { return 0xff; };
+ virtual void abcbus_c1(uint8_t data) { };
+ virtual void abcbus_c2(uint8_t data) { };
+ virtual void abcbus_c3(uint8_t data) { };
+ virtual void abcbus_c4(uint8_t data) { };
// optional operation overrides for ABC 80
- virtual UINT8 abcbus_xmemfl(offs_t offset) { return 0xff; };
- virtual void abcbus_xmemw(offs_t offset, UINT8 data) { };
+ virtual uint8_t abcbus_xmemfl(offs_t offset) { return 0xff; };
+ virtual void abcbus_xmemw(offs_t offset, uint8_t data) { };
// optional operation overrides for ABC 1600
virtual int abcbus_csb() { return 1; }
- virtual UINT8 abcbus_ops() { return 0xff; };
+ virtual uint8_t abcbus_ops() { return 0xff; };
virtual void abcbus_tren(int state) { };
virtual void abcbus_prac(int state) { };
- virtual UINT8 abcbus_exp() { return 0xff; };
+ virtual uint8_t abcbus_exp() { return 0xff; };
virtual int abcbus_xcsb2() { return 1; };
virtual int abcbus_xcsb3() { return 1; };
virtual int abcbus_xcsb4() { return 1; };
@@ -205,7 +205,7 @@ class abcbus_slot_t : public device_t,
{
public:
// construction/destruction
- abcbus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abcbus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _irq> void set_irq_callback(_irq irq) { m_write_irq.set_callback(irq); }
template<class _nmi> void set_nmi_callback(_nmi nmi) { m_write_nmi.set_callback(nmi); }
@@ -219,20 +219,20 @@ public:
template<class _xint5> void set_xint5_callback(_xint5 xint5) { m_write_xint5.set_callback(xint5); }
// computer interface
- void cs_w(UINT8 data) { if (m_card) m_card->abcbus_cs(data); }
- UINT8 rst_r() { device_reset(); return 0xff; }
- UINT8 inp_r() { return m_card ? m_card->abcbus_inp() : 0xff; }
- void out_w(UINT8 data) { if (m_card) m_card->abcbus_out(data); }
- UINT8 stat_r() { return m_card ? m_card->abcbus_stat() : 0xff; }
- void c1_w(UINT8 data) { if (m_card) m_card->abcbus_c1(data); }
- void c2_w(UINT8 data) { if (m_card) m_card->abcbus_c2(data); }
- void c3_w(UINT8 data) { if (m_card) m_card->abcbus_c3(data); }
- void c4_w(UINT8 data) { if (m_card) m_card->abcbus_c4(data); }
- UINT8 xmemfl_r(offs_t offset) { return m_card ? m_card->abcbus_xmemfl(offset) : 0xff; }
- void xmemw_w(offs_t offset, UINT8 data) { if (m_card) m_card->abcbus_xmemw(offset, data); }
+ void cs_w(uint8_t data) { if (m_card) m_card->abcbus_cs(data); }
+ uint8_t rst_r() { device_reset(); return 0xff; }
+ uint8_t inp_r() { return m_card ? m_card->abcbus_inp() : 0xff; }
+ void out_w(uint8_t data) { if (m_card) m_card->abcbus_out(data); }
+ uint8_t stat_r() { return m_card ? m_card->abcbus_stat() : 0xff; }
+ void c1_w(uint8_t data) { if (m_card) m_card->abcbus_c1(data); }
+ void c2_w(uint8_t data) { if (m_card) m_card->abcbus_c2(data); }
+ void c3_w(uint8_t data) { if (m_card) m_card->abcbus_c3(data); }
+ void c4_w(uint8_t data) { if (m_card) m_card->abcbus_c4(data); }
+ uint8_t xmemfl_r(offs_t offset) { return m_card ? m_card->abcbus_xmemfl(offset) : 0xff; }
+ void xmemw_w(offs_t offset, uint8_t data) { if (m_card) m_card->abcbus_xmemw(offset, data); }
DECLARE_READ_LINE_MEMBER( csb_r ) { return m_card ? m_card->abcbus_csb() : 1; }
- UINT8 ops_r() { return m_card ? m_card->abcbus_ops() : 0xff; }
- UINT8 exp_r() { return m_card ? m_card->abcbus_exp() : 0xff; }
+ uint8_t ops_r() { return m_card ? m_card->abcbus_ops() : 0xff; }
+ uint8_t exp_r() { return m_card ? m_card->abcbus_exp() : 0xff; }
DECLARE_READ_LINE_MEMBER( xcsb2_r ) { return m_card ? m_card->abcbus_xcsb2() : 1; }
DECLARE_READ_LINE_MEMBER( xcsb3_r ) { return m_card ? m_card->abcbus_xcsb3() : 1; }
DECLARE_READ_LINE_MEMBER( xcsb4_r ) { return m_card ? m_card->abcbus_xcsb4() : 1; }
diff --git a/src/devices/bus/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp
index cc906c3e925..eef4ead003d 100644
--- a/src/devices/bus/abcbus/fd2.cpp
+++ b/src/devices/bus/abcbus/fd2.cpp
@@ -162,7 +162,7 @@ READ8_MEMBER( abc_fd2_t::pio_pb_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
data |= m_fdc->drq_r() << 5;
data |= m_fdc->hld_r() << 6;
@@ -276,7 +276,7 @@ machine_config_constructor abc_fd2_t::device_mconfig_additions() const
// abc_fd2_t - constructor
//-------------------------------------------------
-abc_fd2_t::abc_fd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc_fd2_t::abc_fd2_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ABC_FD2, "ABC FD2", tag, owner, clock, "abc_fd2", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
@@ -324,7 +324,7 @@ void abc_fd2_t::device_reset()
// abcbus_cs -
//-------------------------------------------------
-void abc_fd2_t::abcbus_cs(UINT8 data)
+void abc_fd2_t::abcbus_cs(uint8_t data)
{
m_cs = (data == 0x2d);
}
@@ -334,9 +334,9 @@ void abc_fd2_t::abcbus_cs(UINT8 data)
// abcbus_stat -
//-------------------------------------------------
-UINT8 abc_fd2_t::abcbus_stat()
+uint8_t abc_fd2_t::abcbus_stat()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_cs)
{
@@ -351,9 +351,9 @@ UINT8 abc_fd2_t::abcbus_stat()
// abcbus_inp -
//-------------------------------------------------
-UINT8 abc_fd2_t::abcbus_inp()
+uint8_t abc_fd2_t::abcbus_inp()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_cs)
{
@@ -374,7 +374,7 @@ UINT8 abc_fd2_t::abcbus_inp()
// abcbus_out -
//-------------------------------------------------
-void abc_fd2_t::abcbus_out(UINT8 data)
+void abc_fd2_t::abcbus_out(uint8_t data)
{
if (!m_cs) return;
@@ -392,7 +392,7 @@ void abc_fd2_t::abcbus_out(UINT8 data)
// abcbus_c1 -
//-------------------------------------------------
-void abc_fd2_t::abcbus_c1(UINT8 data)
+void abc_fd2_t::abcbus_c1(uint8_t data)
{
if (m_cs)
{
@@ -406,7 +406,7 @@ void abc_fd2_t::abcbus_c1(UINT8 data)
// abcbus_c3 -
//-------------------------------------------------
-void abc_fd2_t::abcbus_c3(UINT8 data)
+void abc_fd2_t::abcbus_c3(uint8_t data)
{
if (m_cs)
{
@@ -419,9 +419,9 @@ void abc_fd2_t::abcbus_c3(UINT8 data)
// abcbus_xmemfl -
//-------------------------------------------------
-UINT8 abc_fd2_t::abcbus_xmemfl(offs_t offset)
+uint8_t abc_fd2_t::abcbus_xmemfl(offs_t offset)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if ((offset & 0xf000) == 0x6000)
{
diff --git a/src/devices/bus/abcbus/fd2.h b/src/devices/bus/abcbus/fd2.h
index 78d5bc0c767..7ec28c10451 100644
--- a/src/devices/bus/abcbus/fd2.h
+++ b/src/devices/bus/abcbus/fd2.h
@@ -32,7 +32,7 @@ class abc_fd2_t : public device_t,
{
public:
// construction/destruction
- abc_fd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc_fd2_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -53,13 +53,13 @@ protected:
virtual void device_reset() override;
// device_abcbus_interface overrides
- virtual void abcbus_cs(UINT8 data) override;
- virtual UINT8 abcbus_inp() override;
- virtual void abcbus_out(UINT8 data) override;
- virtual UINT8 abcbus_stat() override;
- virtual void abcbus_c1(UINT8 data) override;
- virtual void abcbus_c3(UINT8 data) override;
- virtual UINT8 abcbus_xmemfl(offs_t offset) override;
+ virtual void abcbus_cs(uint8_t data) override;
+ virtual uint8_t abcbus_inp() override;
+ virtual void abcbus_out(uint8_t data) override;
+ virtual uint8_t abcbus_stat() override;
+ virtual void abcbus_c1(uint8_t data) override;
+ virtual void abcbus_c3(uint8_t data) override;
+ virtual uint8_t abcbus_xmemfl(offs_t offset) override;
private:
required_device<cpu_device> m_maincpu;
@@ -70,8 +70,8 @@ private:
required_memory_region m_dos_rom;
bool m_cs;
- UINT8 m_status;
- UINT8 m_data;
+ uint8_t m_status;
+ uint8_t m_data;
};
diff --git a/src/devices/bus/abcbus/hdc.cpp b/src/devices/bus/abcbus/hdc.cpp
index 28636376d3e..296948b59ab 100644
--- a/src/devices/bus/abcbus/hdc.cpp
+++ b/src/devices/bus/abcbus/hdc.cpp
@@ -111,7 +111,7 @@ machine_config_constructor abc_hdc_device::device_mconfig_additions() const
// abc_hdc_device - constructor
//-------------------------------------------------
-abc_hdc_device::abc_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc_hdc_device::abc_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ABC_HDC, "ABC HDC", tag, owner, clock, "abc_hdc", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG)
@@ -146,6 +146,6 @@ void abc_hdc_device::device_reset()
// abcbus_cs -
//-------------------------------------------------
-void abc_hdc_device::abcbus_cs(UINT8 data)
+void abc_hdc_device::abcbus_cs(uint8_t data)
{
}
diff --git a/src/devices/bus/abcbus/hdc.h b/src/devices/bus/abcbus/hdc.h
index d0417be0a31..668f19a5625 100644
--- a/src/devices/bus/abcbus/hdc.h
+++ b/src/devices/bus/abcbus/hdc.h
@@ -30,7 +30,7 @@ class abc_hdc_device : public device_t,
{
public:
// construction/destruction
- abc_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -42,7 +42,7 @@ protected:
virtual void device_reset() override;
// device_abcbus_interface overrides
- virtual void abcbus_cs(UINT8 data) override;
+ virtual void abcbus_cs(uint8_t data) override;
private:
required_device<cpu_device> m_maincpu;
diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp
index 7955b3135fd..69300ce8cf9 100644
--- a/src/devices/bus/abcbus/lux10828.cpp
+++ b/src/devices/bus/abcbus/lux10828.cpp
@@ -233,10 +233,10 @@ READ8_MEMBER( luxor_55_10828_device::pio_pb_r )
*/
- UINT8 data = 0x04;
+ uint8_t data = 0x04;
// single/double sided drive
- UINT8 sw1 = m_sw1->read() & 0x0f;
+ uint8_t sw1 = m_sw1->read() & 0x0f;
int ds0 = m_sel0 ? BIT(sw1, 0) : 1;
int ds1 = m_sel1 ? BIT(sw1, 1) : 1;
data |= !(ds0 & ds1);
@@ -403,7 +403,7 @@ ioport_constructor luxor_55_10828_device::device_input_ports() const
// luxor_55_10828_device - constructor
//-------------------------------------------------
-luxor_55_10828_device::luxor_55_10828_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+luxor_55_10828_device::luxor_55_10828_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, LUXOR_55_10828, "Luxor 55 10828", tag, owner, clock, "lux10828", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
@@ -440,7 +440,7 @@ void luxor_55_10828_device::device_start()
save_item(NAME(m_sel1));
// patch out protection checks
- UINT8 *rom = memregion(Z80_TAG)->base();
+ uint8_t *rom = memregion(Z80_TAG)->base();
rom[0x00fa] = 0xff;
rom[0x0336] = 0xff;
rom[0x0718] = 0xff;
@@ -469,9 +469,9 @@ void luxor_55_10828_device::device_reset()
// abcbus_cs -
//-------------------------------------------------
-void luxor_55_10828_device::abcbus_cs(UINT8 data)
+void luxor_55_10828_device::abcbus_cs(uint8_t data)
{
- UINT8 address = 0x2c | BIT(m_s1->read(), 0);
+ uint8_t address = 0x2c | BIT(m_s1->read(), 0);
m_cs = (data == address);
}
@@ -481,9 +481,9 @@ void luxor_55_10828_device::abcbus_cs(UINT8 data)
// abcbus_stat -
//-------------------------------------------------
-UINT8 luxor_55_10828_device::abcbus_stat()
+uint8_t luxor_55_10828_device::abcbus_stat()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_cs)
{
@@ -498,9 +498,9 @@ UINT8 luxor_55_10828_device::abcbus_stat()
// abcbus_inp -
//-------------------------------------------------
-UINT8 luxor_55_10828_device::abcbus_inp()
+uint8_t luxor_55_10828_device::abcbus_inp()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_cs)
{
@@ -521,7 +521,7 @@ UINT8 luxor_55_10828_device::abcbus_inp()
// abcbus_out -
//-------------------------------------------------
-void luxor_55_10828_device::abcbus_out(UINT8 data)
+void luxor_55_10828_device::abcbus_out(uint8_t data)
{
if (!m_cs) return;
@@ -539,7 +539,7 @@ void luxor_55_10828_device::abcbus_out(UINT8 data)
// abcbus_c1 -
//-------------------------------------------------
-void luxor_55_10828_device::abcbus_c1(UINT8 data)
+void luxor_55_10828_device::abcbus_c1(uint8_t data)
{
if (m_cs)
{
@@ -553,7 +553,7 @@ void luxor_55_10828_device::abcbus_c1(UINT8 data)
// abcbus_c3 -
//-------------------------------------------------
-void luxor_55_10828_device::abcbus_c3(UINT8 data)
+void luxor_55_10828_device::abcbus_c3(uint8_t data)
{
if (m_cs)
{
diff --git a/src/devices/bus/abcbus/lux10828.h b/src/devices/bus/abcbus/lux10828.h
index 4be7801b873..fb90ef914c2 100644
--- a/src/devices/bus/abcbus/lux10828.h
+++ b/src/devices/bus/abcbus/lux10828.h
@@ -54,7 +54,7 @@ class luxor_55_10828_device : public device_t,
{
public:
// construction/destruction
- luxor_55_10828_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ luxor_55_10828_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_WRITE8_MEMBER( ctrl_w );
DECLARE_WRITE8_MEMBER( status_w );
@@ -82,12 +82,12 @@ protected:
virtual void device_reset() override;
// device_abcbus_interface overrides
- virtual void abcbus_cs(UINT8 data) override;
- virtual UINT8 abcbus_inp() override;
- virtual void abcbus_out(UINT8 data) override;
- virtual UINT8 abcbus_stat() override;
- virtual void abcbus_c1(UINT8 data) override;
- virtual void abcbus_c3(UINT8 data) override;
+ virtual void abcbus_cs(uint8_t data) override;
+ virtual uint8_t abcbus_inp() override;
+ virtual void abcbus_out(uint8_t data) override;
+ virtual uint8_t abcbus_stat() override;
+ virtual void abcbus_c1(uint8_t data) override;
+ virtual void abcbus_c3(uint8_t data) override;
private:
required_device<cpu_device> m_maincpu;
@@ -99,8 +99,8 @@ private:
required_ioport m_s1;
bool m_cs; // card selected
- UINT8 m_status; // ABC BUS status
- UINT8 m_data; // ABC BUS data
+ uint8_t m_status; // ABC BUS status
+ uint8_t m_data; // ABC BUS data
bool m_fdc_irq; // floppy interrupt
bool m_fdc_drq; // floppy data request
int m_wait_enable; // wait enable
diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp
index a6187c278ed..6286f071487 100644
--- a/src/devices/bus/abcbus/lux21046.cpp
+++ b/src/devices/bus/abcbus/lux21046.cpp
@@ -742,7 +742,7 @@ ioport_constructor abc850_floppy_device::device_input_ports() const
// luxor_55_21046_device - constructor
//-------------------------------------------------
-luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, LUXOR_55_21046, "Luxor 55 21046", tag, owner, clock, "lux21046", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
@@ -762,7 +762,7 @@ luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, cons
{
}
-luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
@@ -782,27 +782,27 @@ luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, devi
{
}
-abc830_device::abc830_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc830_device::abc830_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: luxor_55_21046_device(mconfig, ABC830, "ABC 830", tag, owner, clock, "abc830", __FILE__)
{
}
-abc832_device::abc832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc832_device::abc832_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: luxor_55_21046_device(mconfig, ABC832, "ABC 832", tag, owner, clock, "abc832", __FILE__)
{
}
-abc834_device::abc834_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc834_device::abc834_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: luxor_55_21046_device(mconfig, ABC834, "ABC 834", tag, owner, clock, "abc834", __FILE__)
{
}
-abc838_device::abc838_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc838_device::abc838_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: luxor_55_21046_device(mconfig, ABC838, "ABC 838", tag, owner, clock, "abc838", __FILE__)
{
}
-abc850_floppy_device::abc850_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc850_floppy_device::abc850_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: luxor_55_21046_device(mconfig, ABC850_FLOPPY, "ABC 850 floppy", tag, owner, clock, "lux21046", __FILE__)
{
}
@@ -853,7 +853,7 @@ void luxor_55_21046_device::device_reset()
// abcbus_cs -
//-------------------------------------------------
-void luxor_55_21046_device::abcbus_cs(UINT8 data)
+void luxor_55_21046_device::abcbus_cs(uint8_t data)
{
m_cs = (data == m_sw3->read());
}
@@ -873,7 +873,7 @@ int luxor_55_21046_device::abcbus_csb()
// abcbus_stat -
//-------------------------------------------------
-UINT8 luxor_55_21046_device::abcbus_stat()
+uint8_t luxor_55_21046_device::abcbus_stat()
{
/*
@@ -890,7 +890,7 @@ UINT8 luxor_55_21046_device::abcbus_stat()
*/
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_cs)
{
@@ -906,9 +906,9 @@ UINT8 luxor_55_21046_device::abcbus_stat()
// abcbus_inp -
//-------------------------------------------------
-UINT8 luxor_55_21046_device::abcbus_inp()
+uint8_t luxor_55_21046_device::abcbus_inp()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_cs)
{
@@ -924,7 +924,7 @@ UINT8 luxor_55_21046_device::abcbus_inp()
// abcbus_out -
//-------------------------------------------------
-void luxor_55_21046_device::abcbus_out(UINT8 data)
+void luxor_55_21046_device::abcbus_out(uint8_t data)
{
if (m_cs)
{
@@ -938,7 +938,7 @@ void luxor_55_21046_device::abcbus_out(UINT8 data)
// abcbus_c1 -
//-------------------------------------------------
-void luxor_55_21046_device::abcbus_c1(UINT8 data)
+void luxor_55_21046_device::abcbus_c1(uint8_t data)
{
if (m_cs)
{
@@ -952,7 +952,7 @@ void luxor_55_21046_device::abcbus_c1(UINT8 data)
// abcbus_c3 -
//-------------------------------------------------
-void luxor_55_21046_device::abcbus_c3(UINT8 data)
+void luxor_55_21046_device::abcbus_c3(uint8_t data)
{
if (m_cs)
{
@@ -965,7 +965,7 @@ void luxor_55_21046_device::abcbus_c3(UINT8 data)
// abcbus_c4 -
//-------------------------------------------------
-void luxor_55_21046_device::abcbus_c4(UINT8 data)
+void luxor_55_21046_device::abcbus_c4(uint8_t data)
{
// TODO connected to PAL16R4 pin 2
}
@@ -1138,7 +1138,7 @@ READ8_MEMBER( luxor_55_21046_device::_9a_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// busy
data |= m_busy;
@@ -1148,7 +1148,7 @@ READ8_MEMBER( luxor_55_21046_device::_9a_r )
//data |= (m_floppy ? m_floppy->dskchg_r() : 1) << 4;
// SW2
- UINT8 sw2 = m_sw2->read() & 0x0f;
+ uint8_t sw2 = m_sw2->read() & 0x0f;
int sw2_1 = BIT(sw2, 0) ? 1 : BIT(offset, 8);
int sw2_2 = BIT(sw2, 1) ? 1 : BIT(offset, 9);
diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h
index d63d02d8ebb..aabd9cb5404 100644
--- a/src/devices/bus/abcbus/lux21046.h
+++ b/src/devices/bus/abcbus/lux21046.h
@@ -53,8 +53,8 @@ class luxor_55_21046_device : public device_t,
{
public:
// construction/destruction
- luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -86,14 +86,14 @@ protected:
virtual void device_reset() override;
// device_abcbus_interface overrides
- virtual void abcbus_cs(UINT8 data) override;
+ virtual void abcbus_cs(uint8_t data) override;
virtual int abcbus_csb() override;
- virtual UINT8 abcbus_inp() override;
- virtual void abcbus_out(UINT8 data) override;
- virtual UINT8 abcbus_stat() override;
- virtual void abcbus_c1(UINT8 data) override;
- virtual void abcbus_c3(UINT8 data) override;
- virtual void abcbus_c4(UINT8 data) override;
+ virtual uint8_t abcbus_inp() override;
+ virtual void abcbus_out(uint8_t data) override;
+ virtual uint8_t abcbus_stat() override;
+ virtual void abcbus_c1(uint8_t data) override;
+ virtual void abcbus_c3(uint8_t data) override;
+ virtual void abcbus_c4(uint8_t data) override;
private:
required_device<cpu_device> m_maincpu;
@@ -107,9 +107,9 @@ private:
required_ioport m_sw3;
bool m_cs; // card selected
- UINT8 m_status; // ABC BUS status
- UINT8 m_out; // ABC BUS data in
- UINT8 m_inp; // ABC BUS data out
+ uint8_t m_status; // ABC BUS status
+ uint8_t m_out; // ABC BUS data in
+ uint8_t m_inp; // ABC BUS data out
bool m_fdc_irq; // FDC interrupt
int m_dma_irq; // DMA interrupt
int m_busy; // busy bit
@@ -123,7 +123,7 @@ class abc830_device : public luxor_55_21046_device
{
public:
// construction/destruction
- abc830_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc830_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -137,7 +137,7 @@ class abc832_device : public luxor_55_21046_device
{
public:
// construction/destruction
- abc832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc832_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -151,7 +151,7 @@ class abc834_device : public luxor_55_21046_device
{
public:
// construction/destruction
- abc834_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc834_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -165,7 +165,7 @@ class abc838_device : public luxor_55_21046_device
{
public:
// construction/destruction
- abc838_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc838_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -179,7 +179,7 @@ class abc850_floppy_device : public luxor_55_21046_device
{
public:
// construction/destruction
- abc850_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc850_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp
index f84d5b18414..7b05cbdfff8 100644
--- a/src/devices/bus/abcbus/lux21056.cpp
+++ b/src/devices/bus/abcbus/lux21056.cpp
@@ -337,7 +337,7 @@ ioport_constructor luxor_55_21056_device::device_input_ports() const
// luxor_55_21056_device - constructor
//-------------------------------------------------
-luxor_55_21056_device::luxor_55_21056_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+luxor_55_21056_device::luxor_55_21056_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, LUXOR_55_21056, "Luxor 55 21056", tag, owner, clock, "lux21056", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
@@ -405,7 +405,7 @@ void luxor_55_21056_device::device_reset()
// abcbus_cs -
//-------------------------------------------------
-void luxor_55_21056_device::abcbus_cs(UINT8 data)
+void luxor_55_21056_device::abcbus_cs(uint8_t data)
{
m_cs = (data == m_s1->read());
}
@@ -415,9 +415,9 @@ void luxor_55_21056_device::abcbus_cs(UINT8 data)
// abcbus_stat -
//-------------------------------------------------
-UINT8 luxor_55_21056_device::abcbus_stat()
+uint8_t luxor_55_21056_device::abcbus_stat()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_cs)
{
@@ -433,9 +433,9 @@ UINT8 luxor_55_21056_device::abcbus_stat()
// abcbus_inp -
//-------------------------------------------------
-UINT8 luxor_55_21056_device::abcbus_inp()
+uint8_t luxor_55_21056_device::abcbus_inp()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_cs && !STAT_DIR)
{
@@ -452,7 +452,7 @@ UINT8 luxor_55_21056_device::abcbus_inp()
// abcbus_out -
//-------------------------------------------------
-void luxor_55_21056_device::abcbus_out(UINT8 data)
+void luxor_55_21056_device::abcbus_out(uint8_t data)
{
if (m_cs)
{
@@ -467,7 +467,7 @@ void luxor_55_21056_device::abcbus_out(UINT8 data)
// abcbus_c1 -
//-------------------------------------------------
-void luxor_55_21056_device::abcbus_c1(UINT8 data)
+void luxor_55_21056_device::abcbus_c1(uint8_t data)
{
if (m_cs)
{
@@ -481,7 +481,7 @@ void luxor_55_21056_device::abcbus_c1(UINT8 data)
// abcbus_c3 -
//-------------------------------------------------
-void luxor_55_21056_device::abcbus_c3(UINT8 data)
+void luxor_55_21056_device::abcbus_c3(uint8_t data)
{
if (m_cs)
{
@@ -511,7 +511,7 @@ READ8_MEMBER( luxor_55_21056_device::sasi_status_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
data |= m_rdy ^ STAT_DIR;
@@ -543,7 +543,7 @@ WRITE8_MEMBER( luxor_55_21056_device::stat_w )
READ8_MEMBER( luxor_55_21056_device::out_r )
{
- UINT8 data = m_out;
+ uint8_t data = m_out;
if (STAT_DIR && m_rdy) set_rdy(!m_rdy);
@@ -569,7 +569,7 @@ WRITE8_MEMBER( luxor_55_21056_device::inp_w )
READ8_MEMBER( luxor_55_21056_device::sasi_data_r )
{
- UINT8 data = m_sasi_data_in->read();
+ uint8_t data = m_sasi_data_in->read();
m_sasibus->write_ack(!m_sasi_req);
diff --git a/src/devices/bus/abcbus/lux21056.h b/src/devices/bus/abcbus/lux21056.h
index 769bc9ad93e..0e1d04073b3 100644
--- a/src/devices/bus/abcbus/lux21056.h
+++ b/src/devices/bus/abcbus/lux21056.h
@@ -31,7 +31,7 @@ class luxor_55_21056_device : public device_t,
{
public:
// construction/destruction
- luxor_55_21056_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ luxor_55_21056_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -68,12 +68,12 @@ protected:
virtual void device_reset() override;
// device_abcbus_interface overrides
- virtual void abcbus_cs(UINT8 data) override;
- virtual UINT8 abcbus_inp() override;
- virtual void abcbus_out(UINT8 data) override;
- virtual UINT8 abcbus_stat() override;
- virtual void abcbus_c1(UINT8 data) override;
- virtual void abcbus_c3(UINT8 data) override;
+ virtual void abcbus_cs(uint8_t data) override;
+ virtual uint8_t abcbus_inp() override;
+ virtual void abcbus_out(uint8_t data) override;
+ virtual uint8_t abcbus_stat() override;
+ virtual void abcbus_c1(uint8_t data) override;
+ virtual void abcbus_c3(uint8_t data) override;
private:
void set_rdy(int state);
@@ -93,10 +93,10 @@ private:
int m_sasi_msg;
int m_sasi_bsy;
- UINT8 m_inp;
- UINT8 m_out;
- UINT8 m_stat;
- UINT8 m_sasi_data;
+ uint8_t m_inp;
+ uint8_t m_out;
+ uint8_t m_stat;
+ uint8_t m_sasi_data;
};
diff --git a/src/devices/bus/abcbus/lux4105.cpp b/src/devices/bus/abcbus/lux4105.cpp
index 3f5c5ea76f5..8cc4ffb193d 100644
--- a/src/devices/bus/abcbus/lux4105.cpp
+++ b/src/devices/bus/abcbus/lux4105.cpp
@@ -174,7 +174,7 @@ inline void luxor_4105_device::update_trrq_int()
// luxor_4105_device - constructor
//-------------------------------------------------
-luxor_4105_device::luxor_4105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+luxor_4105_device::luxor_4105_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, LUXOR_4105, "Luxor 4105", tag, owner, clock, "lux4105", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_sasibus(*this, SASIBUS_TAG),
@@ -227,7 +227,7 @@ void luxor_4105_device::device_reset()
// abcbus_cs -
//-------------------------------------------------
-void luxor_4105_device::abcbus_cs(UINT8 data)
+void luxor_4105_device::abcbus_cs(uint8_t data)
{
m_cs = (data == m_5e->read());
}
@@ -247,9 +247,9 @@ int luxor_4105_device::abcbus_csb()
// abcbus_stat -
//-------------------------------------------------
-UINT8 luxor_4105_device::abcbus_stat()
+uint8_t luxor_4105_device::abcbus_stat()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_cs)
{
@@ -282,9 +282,9 @@ UINT8 luxor_4105_device::abcbus_stat()
// abcbus_inp -
//-------------------------------------------------
-UINT8 luxor_4105_device::abcbus_inp()
+uint8_t luxor_4105_device::abcbus_inp()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_cs)
{
@@ -314,7 +314,7 @@ UINT8 luxor_4105_device::abcbus_inp()
// abcbus_utp -
//-------------------------------------------------
-void luxor_4105_device::abcbus_out(UINT8 data)
+void luxor_4105_device::abcbus_out(uint8_t data)
{
if (m_cs)
{
@@ -337,7 +337,7 @@ void luxor_4105_device::abcbus_out(UINT8 data)
// abcbus_c1 -
//-------------------------------------------------
-void luxor_4105_device::abcbus_c1(UINT8 data)
+void luxor_4105_device::abcbus_c1(uint8_t data)
{
if (m_cs)
{
@@ -350,7 +350,7 @@ void luxor_4105_device::abcbus_c1(UINT8 data)
// abcbus_c3 -
//-------------------------------------------------
-void luxor_4105_device::abcbus_c3(UINT8 data)
+void luxor_4105_device::abcbus_c3(uint8_t data)
{
if (m_cs)
{
@@ -367,7 +367,7 @@ void luxor_4105_device::abcbus_c3(UINT8 data)
// abcbus_c4 -
//-------------------------------------------------
-void luxor_4105_device::abcbus_c4(UINT8 data)
+void luxor_4105_device::abcbus_c4(uint8_t data)
{
if (m_cs)
{
diff --git a/src/devices/bus/abcbus/lux4105.h b/src/devices/bus/abcbus/lux4105.h
index b1c2731db8d..657f756d74c 100644
--- a/src/devices/bus/abcbus/lux4105.h
+++ b/src/devices/bus/abcbus/lux4105.h
@@ -37,7 +37,7 @@ class luxor_4105_device : public device_t,
{
public:
// construction/destruction
- luxor_4105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ luxor_4105_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -55,14 +55,14 @@ protected:
virtual void device_reset() override;
// device_abcbus_interface overrides
- virtual void abcbus_cs(UINT8 data) override;
+ virtual void abcbus_cs(uint8_t data) override;
virtual int abcbus_csb() override;
- virtual UINT8 abcbus_inp() override;
- virtual void abcbus_out(UINT8 data) override;
- virtual UINT8 abcbus_stat() override;
- virtual void abcbus_c1(UINT8 data) override;
- virtual void abcbus_c3(UINT8 data) override;
- virtual void abcbus_c4(UINT8 data) override;
+ virtual uint8_t abcbus_inp() override;
+ virtual void abcbus_out(uint8_t data) override;
+ virtual uint8_t abcbus_stat() override;
+ virtual void abcbus_c1(uint8_t data) override;
+ virtual void abcbus_c3(uint8_t data) override;
+ virtual void abcbus_c4(uint8_t data) override;
private:
inline void update_trrq_int();
@@ -74,8 +74,8 @@ private:
required_ioport m_5e;
bool m_cs;
- UINT8 m_data;
- UINT8 m_dma;
+ uint8_t m_data;
+ uint8_t m_dma;
int m_sasi_bsy;
bool m_sasi_req;
diff --git a/src/devices/bus/abcbus/memcard.cpp b/src/devices/bus/abcbus/memcard.cpp
index 9195f3b135b..945dd5382c6 100644
--- a/src/devices/bus/abcbus/memcard.cpp
+++ b/src/devices/bus/abcbus/memcard.cpp
@@ -109,7 +109,7 @@ const tiny_rom_entry *abc_memory_card_t::device_rom_region() const
// abc_memory_card_t - constructor
//-------------------------------------------------
-abc_memory_card_t::abc_memory_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc_memory_card_t::abc_memory_card_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ABC_MEMORY_CARD, "ABC Memory Card", tag, owner, clock, "abc_mem", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_dos_rom(*this, "dos"),
@@ -138,9 +138,9 @@ void abc_memory_card_t::device_start()
// abcbus_xmemfl -
//-------------------------------------------------
-UINT8 abc_memory_card_t::abcbus_xmemfl(offs_t offset)
+uint8_t abc_memory_card_t::abcbus_xmemfl(offs_t offset)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (offset >= 0x6000 && offset < 0x7000)
{
diff --git a/src/devices/bus/abcbus/memcard.h b/src/devices/bus/abcbus/memcard.h
index a9e0e349ca7..f94f484b350 100644
--- a/src/devices/bus/abcbus/memcard.h
+++ b/src/devices/bus/abcbus/memcard.h
@@ -27,7 +27,7 @@ class abc_memory_card_t : public device_t,
{
public:
// construction/destruction
- abc_memory_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc_memory_card_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -37,8 +37,8 @@ protected:
virtual void device_start() override;
// device_abcbus_interface overrides
- virtual void abcbus_cs(UINT8 data) override { };
- virtual UINT8 abcbus_xmemfl(offs_t offset) override;
+ virtual void abcbus_cs(uint8_t data) override { };
+ virtual uint8_t abcbus_xmemfl(offs_t offset) override;
private:
required_memory_region m_dos_rom;
diff --git a/src/devices/bus/abcbus/ram.cpp b/src/devices/bus/abcbus/ram.cpp
index a91e29bd9c7..6ff3935b4f7 100644
--- a/src/devices/bus/abcbus/ram.cpp
+++ b/src/devices/bus/abcbus/ram.cpp
@@ -26,7 +26,7 @@ const device_type ABC80_16KB_RAM_CARD = &device_creator<abc80_16kb_ram_card_t>;
// abc80_16kb_ram_card_t - constructor
//-------------------------------------------------
-abc80_16kb_ram_card_t::abc80_16kb_ram_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc80_16kb_ram_card_t::abc80_16kb_ram_card_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ABC80_16KB_RAM_CARD, "ABC 80 16KB RAM card", tag, owner, clock, "abc80_16kb", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_ram(*this, "ram")
@@ -53,9 +53,9 @@ void abc80_16kb_ram_card_t::device_start()
// abcbus_xmemfl -
//-------------------------------------------------
-UINT8 abc80_16kb_ram_card_t::abcbus_xmemfl(offs_t offset)
+uint8_t abc80_16kb_ram_card_t::abcbus_xmemfl(offs_t offset)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (offset >= 0x8000 && offset < 0xc000)
{
@@ -70,7 +70,7 @@ UINT8 abc80_16kb_ram_card_t::abcbus_xmemfl(offs_t offset)
// abcbus_xmemw -
//-------------------------------------------------
-void abc80_16kb_ram_card_t::abcbus_xmemw(offs_t offset, UINT8 data)
+void abc80_16kb_ram_card_t::abcbus_xmemw(offs_t offset, uint8_t data)
{
if (offset >= 0x8000 && offset < 0xc000)
{
diff --git a/src/devices/bus/abcbus/ram.h b/src/devices/bus/abcbus/ram.h
index 1be225d3008..fa53f5e1e3e 100644
--- a/src/devices/bus/abcbus/ram.h
+++ b/src/devices/bus/abcbus/ram.h
@@ -27,19 +27,19 @@ class abc80_16kb_ram_card_t : public device_t,
{
public:
// construction/destruction
- abc80_16kb_ram_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc80_16kb_ram_card_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_abcbus_interface overrides
- virtual void abcbus_cs(UINT8 data) override { };
- virtual UINT8 abcbus_xmemfl(offs_t offset) override;
- virtual void abcbus_xmemw(offs_t offset, UINT8 data) override;
+ virtual void abcbus_cs(uint8_t data) override { };
+ virtual uint8_t abcbus_xmemfl(offs_t offset) override;
+ virtual void abcbus_xmemw(offs_t offset, uint8_t data) override;
private:
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
};
diff --git a/src/devices/bus/abcbus/sio.cpp b/src/devices/bus/abcbus/sio.cpp
index bf1c733281d..90f543b7e6a 100644
--- a/src/devices/bus/abcbus/sio.cpp
+++ b/src/devices/bus/abcbus/sio.cpp
@@ -101,7 +101,7 @@ machine_config_constructor abc_sio_device::device_mconfig_additions() const
// abc_sio_device - constructor
//-------------------------------------------------
-abc_sio_device::abc_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc_sio_device::abc_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ABC_SIO, "ABC SIO", tag, owner, clock, "abcsio", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_ctc(*this, Z80CTC_TAG),
@@ -138,7 +138,7 @@ void abc_sio_device::device_reset()
// abcbus_cs -
//-------------------------------------------------
-void abc_sio_device::abcbus_cs(UINT8 data)
+void abc_sio_device::abcbus_cs(uint8_t data)
{
}
@@ -147,9 +147,9 @@ void abc_sio_device::abcbus_cs(UINT8 data)
// abcbus_xmemfl -
//-------------------------------------------------
-UINT8 abc_sio_device::abcbus_xmemfl(offs_t offset)
+uint8_t abc_sio_device::abcbus_xmemfl(offs_t offset)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (offset >= 0x4000 && offset < 0x5000) // TODO where is this mapped?
{
diff --git a/src/devices/bus/abcbus/sio.h b/src/devices/bus/abcbus/sio.h
index 991de18f0ed..52f18c4be73 100644
--- a/src/devices/bus/abcbus/sio.h
+++ b/src/devices/bus/abcbus/sio.h
@@ -23,7 +23,7 @@ class abc_sio_device : public device_t,
{
public:
// construction/destruction
- abc_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -35,8 +35,8 @@ protected:
virtual void device_reset() override;
// device_abcbus_interface overrides
- virtual void abcbus_cs(UINT8 data) override;
- virtual UINT8 abcbus_xmemfl(offs_t offset) override;
+ virtual void abcbus_cs(uint8_t data) override;
+ virtual uint8_t abcbus_xmemfl(offs_t offset) override;
private:
required_device<z80ctc_device> m_ctc;
diff --git a/src/devices/bus/abcbus/slutprov.cpp b/src/devices/bus/abcbus/slutprov.cpp
index b10415badca..4497c8827ff 100644
--- a/src/devices/bus/abcbus/slutprov.cpp
+++ b/src/devices/bus/abcbus/slutprov.cpp
@@ -40,7 +40,7 @@ const tiny_rom_entry *abc_slutprov_device::device_rom_region() const
// abc_slutprov_device - constructor
//-------------------------------------------------
-abc_slutprov_device::abc_slutprov_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc_slutprov_device::abc_slutprov_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ABC_SLUTPROV, "Slutprov", tag, owner, clock, "slutprov", __FILE__),
device_abcbus_card_interface(mconfig, *this)
{
@@ -74,6 +74,6 @@ void abc_slutprov_device::device_reset()
// abcbus_cs -
//-------------------------------------------------
-void abc_slutprov_device::abcbus_cs(UINT8 data)
+void abc_slutprov_device::abcbus_cs(uint8_t data)
{
}
diff --git a/src/devices/bus/abcbus/slutprov.h b/src/devices/bus/abcbus/slutprov.h
index bb4c6262c43..710fc730f0c 100644
--- a/src/devices/bus/abcbus/slutprov.h
+++ b/src/devices/bus/abcbus/slutprov.h
@@ -21,7 +21,7 @@ class abc_slutprov_device : public device_t,
{
public:
// construction/destruction
- abc_slutprov_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc_slutprov_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -32,7 +32,7 @@ protected:
virtual void device_reset() override;
// device_abcbus_interface overrides
- virtual void abcbus_cs(UINT8 data) override;
+ virtual void abcbus_cs(uint8_t data) override;
};
diff --git a/src/devices/bus/abcbus/turbo.cpp b/src/devices/bus/abcbus/turbo.cpp
index ecf035d432f..8377b8e9b04 100644
--- a/src/devices/bus/abcbus/turbo.cpp
+++ b/src/devices/bus/abcbus/turbo.cpp
@@ -109,7 +109,7 @@ machine_config_constructor turbo_kontroller_device::device_mconfig_additions() c
// turbo_kontroller_device - constructor
//-------------------------------------------------
-turbo_kontroller_device::turbo_kontroller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+turbo_kontroller_device::turbo_kontroller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TURBO_KONTROLLER, "Turbo-Kontroller", tag, owner, clock, "unidisk", __FILE__),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG)
@@ -144,6 +144,6 @@ void turbo_kontroller_device::device_reset()
// abcbus_cs -
//-------------------------------------------------
-void turbo_kontroller_device::abcbus_cs(UINT8 data)
+void turbo_kontroller_device::abcbus_cs(uint8_t data)
{
}
diff --git a/src/devices/bus/abcbus/turbo.h b/src/devices/bus/abcbus/turbo.h
index 9423f095f9f..192094ac0b9 100644
--- a/src/devices/bus/abcbus/turbo.h
+++ b/src/devices/bus/abcbus/turbo.h
@@ -29,7 +29,7 @@ class turbo_kontroller_device : public device_t,
{
public:
// construction/destruction
- turbo_kontroller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ turbo_kontroller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -41,7 +41,7 @@ protected:
virtual void device_reset() override;
// device_abcbus_interface overrides
- virtual void abcbus_cs(UINT8 data) override;
+ virtual void abcbus_cs(uint8_t data) override;
private:
required_device<cpu_device> m_maincpu;
diff --git a/src/devices/bus/abcbus/uni800.cpp b/src/devices/bus/abcbus/uni800.cpp
index d3657841e90..90dd6dfdb78 100644
--- a/src/devices/bus/abcbus/uni800.cpp
+++ b/src/devices/bus/abcbus/uni800.cpp
@@ -71,7 +71,7 @@ const tiny_rom_entry *abc_uni800_device::device_rom_region() const
// abc_uni800_device - constructor
//-------------------------------------------------
-abc_uni800_device::abc_uni800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+abc_uni800_device::abc_uni800_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ABC_UNI800, "UNI-800", tag, owner, clock, "uni800", __FILE__),
device_abcbus_card_interface(mconfig, *this)
{
@@ -105,6 +105,6 @@ void abc_uni800_device::device_reset()
// abcbus_cs -
//-------------------------------------------------
-void abc_uni800_device::abcbus_cs(UINT8 data)
+void abc_uni800_device::abcbus_cs(uint8_t data)
{
}
diff --git a/src/devices/bus/abcbus/uni800.h b/src/devices/bus/abcbus/uni800.h
index bc298f6d6c0..1c4b0354f69 100644
--- a/src/devices/bus/abcbus/uni800.h
+++ b/src/devices/bus/abcbus/uni800.h
@@ -21,7 +21,7 @@ class abc_uni800_device : public device_t,
{
public:
// construction/destruction
- abc_uni800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc_uni800_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -32,7 +32,7 @@ protected:
virtual void device_reset() override;
// device_abcbus_interface overrides
- virtual void abcbus_cs(UINT8 data) override;
+ virtual void abcbus_cs(uint8_t data) override;
};
diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp
index 1b62094f18e..bb02fb07f9c 100644
--- a/src/devices/bus/abckb/abc77.cpp
+++ b/src/devices/bus/abckb/abc77.cpp
@@ -422,7 +422,7 @@ inline void abc77_device::key_down(int state)
// abc77_device - constructor
//-------------------------------------------------
-abc77_device::abc77_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+abc77_device::abc77_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
abc_keyboard_interface(mconfig, *this),
m_maincpu(*this, I8035_TAG),
@@ -437,10 +437,10 @@ abc77_device::abc77_device(const machine_config &mconfig, device_type type, cons
{
}
-abc55_device::abc55_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc55_device::abc55_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
abc77_device(mconfig, ABC55, "Luxor ABC 55", tag, owner, clock, "abc55", __FILE__) { }
-abc77_device::abc77_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc77_device::abc77_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
abc77_device(mconfig, ABC77, "Luxor ABC 77", tag, owner, clock, "abc77", __FILE__) { }
@@ -527,7 +527,7 @@ READ8_MEMBER( abc77_device::p1_r )
*/
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_stb)
{
diff --git a/src/devices/bus/abckb/abc77.h b/src/devices/bus/abckb/abc77.h
index b3d40b36ac7..63d72fd382b 100644
--- a/src/devices/bus/abckb/abc77.h
+++ b/src/devices/bus/abckb/abc77.h
@@ -31,8 +31,8 @@ class abc77_device : public device_t,
{
public:
// construction/destruction
- abc77_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- abc77_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc77_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ abc77_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -79,7 +79,7 @@ protected:
int m_hys; // hysteresis
int m_reset; // reset
int m_stb; // strobe
- UINT8 m_j3;
+ uint8_t m_j3;
// timers
emu_timer *m_serial_timer;
@@ -91,7 +91,7 @@ class abc55_device : public abc77_device
{
public:
// construction/destruction
- abc55_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc55_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/abckb/abc800kb.cpp b/src/devices/bus/abckb/abc800kb.cpp
index 123843efd05..bf0c3aa4b78 100644
--- a/src/devices/bus/abckb/abc800kb.cpp
+++ b/src/devices/bus/abckb/abc800kb.cpp
@@ -332,7 +332,7 @@ inline void abc800_keyboard_device::key_down(int state)
// abc800_keyboard_device - constructor
//-------------------------------------------------
-abc800_keyboard_device::abc800_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ABC800_KEYBOARD, "ABC-800 Keyboard", tag, owner, clock, "abc800kb", __FILE__),
+abc800_keyboard_device::abc800_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, ABC800_KEYBOARD, "ABC-800 Keyboard", tag, owner, clock, "abc800kb", __FILE__),
abc_keyboard_interface(mconfig, *this),
m_maincpu(*this, I8048_TAG),
m_x(*this, "X%u", 0),
@@ -400,7 +400,7 @@ void abc800_keyboard_device::txd_w(int state)
READ8_MEMBER( abc800_keyboard_device::kb_p1_r )
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_stb)
{
diff --git a/src/devices/bus/abckb/abc800kb.h b/src/devices/bus/abckb/abc800kb.h
index 10332c96a6e..b6290037e4d 100644
--- a/src/devices/bus/abckb/abc800kb.h
+++ b/src/devices/bus/abckb/abc800kb.h
@@ -30,7 +30,7 @@ class abc800_keyboard_device : public device_t,
{
public:
// construction/destruction
- abc800_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc800_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp
index eb3ed258968..d932adce646 100644
--- a/src/devices/bus/abckb/abc99.cpp
+++ b/src/devices/bus/abckb/abc99.cpp
@@ -485,7 +485,7 @@ inline void abc99_device::scan_mouse()
// abc99_device - constructor
//-------------------------------------------------
-abc99_device::abc99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc99_device::abc99_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ABC99, "Luxor ABC 99", tag, owner, clock, "abc99", __FILE__),
abc_keyboard_interface(mconfig, *this), m_serial_timer(nullptr), m_mouse_timer(nullptr),
m_maincpu(*this, I8035_Z2_TAG),
@@ -664,7 +664,7 @@ READ8_MEMBER( abc99_device::z2_p2_r )
*/
- UINT8 data = m_z14->read() << 5;
+ uint8_t data = m_z14->read() << 5;
return data;
}
@@ -711,7 +711,7 @@ READ8_MEMBER( abc99_device::z5_p1_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// mouse buttons
data |= (m_mouseb->read() & 0x07) << 4;
diff --git a/src/devices/bus/abckb/abc99.h b/src/devices/bus/abckb/abc99.h
index 5002039cf93..d6eaf6a43b4 100644
--- a/src/devices/bus/abckb/abc99.h
+++ b/src/devices/bus/abckb/abc99.h
@@ -29,7 +29,7 @@ class abc99_device : public device_t,
{
public:
// construction/destruction
- abc99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc99_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/abckb/abckb.cpp b/src/devices/bus/abckb/abckb.cpp
index 6eeab0fdc67..c489206024a 100644
--- a/src/devices/bus/abckb/abckb.cpp
+++ b/src/devices/bus/abckb/abckb.cpp
@@ -42,7 +42,7 @@ abc_keyboard_interface::abc_keyboard_interface(const machine_config &mconfig, de
// abc_keyboard_port_device - constructor
//-------------------------------------------------
-abc_keyboard_port_device::abc_keyboard_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+abc_keyboard_port_device::abc_keyboard_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ABC_KEYBOARD_PORT, "Luxor ABC keyboard port", tag, owner, clock, "abc_keyboard_port", __FILE__),
device_slot_interface(mconfig, *this),
m_out_rx_handler(*this),
diff --git a/src/devices/bus/abckb/abckb.h b/src/devices/bus/abckb/abckb.h
index 513350acc53..b45131da73d 100644
--- a/src/devices/bus/abckb/abckb.h
+++ b/src/devices/bus/abckb/abckb.h
@@ -45,7 +45,7 @@ class abc_keyboard_port_device : public device_t,
{
public:
// construction/destruction
- abc_keyboard_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ abc_keyboard_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_out_rx_handler(device_t &device, _Object object) { return downcast<abc_keyboard_port_device &>(device).m_out_rx_handler.set_callback(object); }
template<class _Object> static devcb_base &set_out_trxc_handler(device_t &device, _Object object) { return downcast<abc_keyboard_port_device &>(device).m_out_trxc_handler.set_callback(object); }
diff --git a/src/devices/bus/adam/adamlink.cpp b/src/devices/bus/adam/adamlink.cpp
index 1ae12b1156f..b6e0895a806 100644
--- a/src/devices/bus/adam/adamlink.cpp
+++ b/src/devices/bus/adam/adamlink.cpp
@@ -26,7 +26,7 @@ const device_type ADAMLINK = &device_creator<adamlink_device>;
// adamlink_device - constructor
//-------------------------------------------------
-adamlink_device::adamlink_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adamlink_device::adamlink_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ADAMLINK, "AdamLink modem", tag, owner, clock, "adamlink", __FILE__),
device_adam_expansion_slot_card_interface(mconfig, *this)
{
@@ -46,7 +46,7 @@ void adamlink_device::device_start()
// adam_bd_r - buffered data read
//-------------------------------------------------
-UINT8 adamlink_device::adam_bd_r(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
+uint8_t adamlink_device::adam_bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
{
if (!biorq)
{
@@ -68,7 +68,7 @@ UINT8 adamlink_device::adam_bd_r(address_space &space, offs_t offset, UINT8 data
// adam_bd_w - buffered data write
//-------------------------------------------------
-void adamlink_device::adam_bd_w(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
+void adamlink_device::adam_bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
{
if (!biorq)
{
diff --git a/src/devices/bus/adam/adamlink.h b/src/devices/bus/adam/adamlink.h
index 25818966ef6..978d68d0717 100644
--- a/src/devices/bus/adam/adamlink.h
+++ b/src/devices/bus/adam/adamlink.h
@@ -27,15 +27,15 @@ class adamlink_device : public device_t,
{
public:
// construction/destruction
- adamlink_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adamlink_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_adam_expansion_slot_card_interface overrides
- virtual UINT8 adam_bd_r(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override;
- virtual void adam_bd_w(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override;
+ virtual uint8_t adam_bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override;
+ virtual void adam_bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override;
};
diff --git a/src/devices/bus/adam/exp.cpp b/src/devices/bus/adam/exp.cpp
index f82d9b4555f..11879534b55 100644
--- a/src/devices/bus/adam/exp.cpp
+++ b/src/devices/bus/adam/exp.cpp
@@ -51,7 +51,7 @@ device_adam_expansion_slot_card_interface::device_adam_expansion_slot_card_inter
// adam_expansion_slot_device - constructor
//-------------------------------------------------
-adam_expansion_slot_device::adam_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+adam_expansion_slot_device::adam_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ADAM_EXPANSION_SLOT, "ADAM expansion slot", tag, owner, clock, "adam_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this),
@@ -122,7 +122,7 @@ std::string adam_expansion_slot_device::get_default_card_software()
// bd_r - buffered data read
//-------------------------------------------------
-UINT8 adam_expansion_slot_device::bd_r(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
+uint8_t adam_expansion_slot_device::bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
{
if (m_card != nullptr)
{
@@ -137,7 +137,7 @@ UINT8 adam_expansion_slot_device::bd_r(address_space &space, offs_t offset, UINT
// cd_w - cartridge data write
//-------------------------------------------------
-void adam_expansion_slot_device::bd_w(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
+void adam_expansion_slot_device::bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
{
if (m_card != nullptr)
{
diff --git a/src/devices/bus/adam/exp.h b/src/devices/bus/adam/exp.h
index f1b004d67a8..63a17d2c23a 100644
--- a/src/devices/bus/adam/exp.h
+++ b/src/devices/bus/adam/exp.h
@@ -53,14 +53,14 @@ class adam_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- adam_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adam_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~adam_expansion_slot_device() { }
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<adam_expansion_slot_device &>(device).m_write_irq.set_callback(object); }
// computer interface
- UINT8 bd_r(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2);
- void bd_w(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2);
+ uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2);
+ void bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2);
// cartridge interface
DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); }
@@ -107,12 +107,12 @@ public:
protected:
// runtime
- virtual UINT8 adam_bd_r(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { return data; }
- virtual void adam_bd_w(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { }
+ virtual uint8_t adam_bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { return data; }
+ virtual void adam_bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { }
adam_expansion_slot_device *m_slot;
- optional_shared_ptr<UINT8> m_rom;
+ optional_shared_ptr<uint8_t> m_rom;
};
diff --git a/src/devices/bus/adam/ide.cpp b/src/devices/bus/adam/ide.cpp
index ad3f56159e3..a20a7ec59bd 100644
--- a/src/devices/bus/adam/ide.cpp
+++ b/src/devices/bus/adam/ide.cpp
@@ -88,7 +88,7 @@ machine_config_constructor powermate_ide_device::device_mconfig_additions() cons
// powermate_ide_device - constructor
//-------------------------------------------------
-powermate_ide_device::powermate_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+powermate_ide_device::powermate_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ADAM_IDE, "Powermate HP IDE", tag, owner, clock, "adam_ide", __FILE__),
device_adam_expansion_slot_card_interface(mconfig, *this),
m_ata(*this, ATA_TAG),
@@ -110,7 +110,7 @@ void powermate_ide_device::device_start()
// adam_bd_r - buffered data read
//-------------------------------------------------
-UINT8 powermate_ide_device::adam_bd_r(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
+uint8_t powermate_ide_device::adam_bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
{
if (!biorq)
{
@@ -171,7 +171,7 @@ UINT8 powermate_ide_device::adam_bd_r(address_space &space, offs_t offset, UINT8
// adam_bd_w - buffered data write
//-------------------------------------------------
-void powermate_ide_device::adam_bd_w(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
+void powermate_ide_device::adam_bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
{
if (!biorq)
{
diff --git a/src/devices/bus/adam/ide.h b/src/devices/bus/adam/ide.h
index 4f29001b8d9..53eb653380e 100644
--- a/src/devices/bus/adam/ide.h
+++ b/src/devices/bus/adam/ide.h
@@ -29,7 +29,7 @@ class powermate_ide_device : public device_t,
{
public:
// construction/destruction
- powermate_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ powermate_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -40,14 +40,14 @@ protected:
virtual void device_start() override;
// device_adam_expansion_slot_card_interface overrides
- virtual UINT8 adam_bd_r(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override;
- virtual void adam_bd_w(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override;
+ virtual uint8_t adam_bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override;
+ virtual void adam_bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override;
private:
required_device<ata_interface_device> m_ata;
required_device<output_latch_device> m_cent_data_out;
- UINT16 m_ata_data;
+ uint16_t m_ata_data;
};
diff --git a/src/devices/bus/adam/ram.cpp b/src/devices/bus/adam/ram.cpp
index 6852de8959a..544273ee737 100644
--- a/src/devices/bus/adam/ram.cpp
+++ b/src/devices/bus/adam/ram.cpp
@@ -26,7 +26,7 @@ const device_type ADAM_RAM = &device_creator<adam_ram_expansion_device>;
// adam_ram_expansion_device - constructor
//-------------------------------------------------
-adam_ram_expansion_device::adam_ram_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+adam_ram_expansion_device::adam_ram_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ADAM_RAM, "Adam 64KB RAM expansion", tag, owner, clock, "adam_ram", __FILE__),
device_adam_expansion_slot_card_interface(mconfig, *this),
m_ram(*this, "ram")
@@ -48,7 +48,7 @@ void adam_ram_expansion_device::device_start()
// adam_bd_r - buffered data read
//-------------------------------------------------
-UINT8 adam_ram_expansion_device::adam_bd_r(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
+uint8_t adam_ram_expansion_device::adam_bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
{
if (!cas2)
{
@@ -63,7 +63,7 @@ UINT8 adam_ram_expansion_device::adam_bd_r(address_space &space, offs_t offset,
// adam_bd_w - buffered data write
//-------------------------------------------------
-void adam_ram_expansion_device::adam_bd_w(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
+void adam_ram_expansion_device::adam_bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
{
if (!cas2)
{
diff --git a/src/devices/bus/adam/ram.h b/src/devices/bus/adam/ram.h
index 5fabdd7e602..7f535ba80b4 100644
--- a/src/devices/bus/adam/ram.h
+++ b/src/devices/bus/adam/ram.h
@@ -27,18 +27,18 @@ class adam_ram_expansion_device : public device_t,
{
public:
// construction/destruction
- adam_ram_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adam_ram_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_adam_expansion_slot_card_interface overrides
- virtual UINT8 adam_bd_r(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override;
- virtual void adam_bd_w(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override;
+ virtual uint8_t adam_bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override;
+ virtual void adam_bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override;
private:
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
};
diff --git a/src/devices/bus/adamnet/adamnet.cpp b/src/devices/bus/adamnet/adamnet.cpp
index 487ce1b22d9..ac81e1ca614 100644
--- a/src/devices/bus/adamnet/adamnet.cpp
+++ b/src/devices/bus/adamnet/adamnet.cpp
@@ -51,7 +51,7 @@ device_adamnet_card_interface::~device_adamnet_card_interface()
//-------------------------------------------------
// adamnet_slot_device - constructor
//-------------------------------------------------
-adamnet_slot_device::adamnet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+adamnet_slot_device::adamnet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ADAMNET_SLOT, "ADAMnet slot", tag, owner, clock, "adamnet_slot", __FILE__),
device_slot_interface(mconfig, *this), m_bus(nullptr)
{
@@ -79,7 +79,7 @@ void adamnet_slot_device::device_start()
// adamnet_device - constructor
//-------------------------------------------------
-adamnet_device::adamnet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+adamnet_device::adamnet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ADAMNET, "ADAMnet bus", tag, owner, clock, "adamnet", __FILE__),
m_txd(1),
m_reset(CLEAR_LINE)
diff --git a/src/devices/bus/adamnet/adamnet.h b/src/devices/bus/adamnet/adamnet.h
index 5ce906d270d..ae9e58abdb9 100644
--- a/src/devices/bus/adamnet/adamnet.h
+++ b/src/devices/bus/adamnet/adamnet.h
@@ -48,7 +48,7 @@ class adamnet_device : public device_t
{
public:
// construction/destruction
- adamnet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adamnet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void add_device(device_t *target);
@@ -93,7 +93,7 @@ class adamnet_slot_device : public device_t,
{
public:
// construction/destruction
- adamnet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adamnet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/adamnet/ddp.cpp b/src/devices/bus/adamnet/ddp.cpp
index 6e82af0b985..f4b2d84c743 100644
--- a/src/devices/bus/adamnet/ddp.cpp
+++ b/src/devices/bus/adamnet/ddp.cpp
@@ -118,7 +118,7 @@ machine_config_constructor adam_digital_data_pack_device::device_mconfig_additio
// adam_digital_data_pack_device - constructor
//-------------------------------------------------
-adam_digital_data_pack_device::adam_digital_data_pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adam_digital_data_pack_device::adam_digital_data_pack_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ADAM_DDP, "Adam DDP", tag, owner, clock, "adam_ddp", __FILE__),
device_adamnet_card_interface(mconfig, *this),
m_maincpu(*this, M6801_TAG),
@@ -214,7 +214,7 @@ READ8_MEMBER( adam_digital_data_pack_device::p2_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_bus->reset_r())
data |= M6801_MODE_6;
@@ -284,7 +284,7 @@ READ8_MEMBER( adam_digital_data_pack_device::p4_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// drive 0
if (m_ddp0->exists())
diff --git a/src/devices/bus/adamnet/ddp.h b/src/devices/bus/adamnet/ddp.h
index f5255317d6d..7528658f205 100644
--- a/src/devices/bus/adamnet/ddp.h
+++ b/src/devices/bus/adamnet/ddp.h
@@ -30,7 +30,7 @@ class adam_digital_data_pack_device : public device_t,
{
public:
// construction/destruction
- adam_digital_data_pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adam_digital_data_pack_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/adamnet/fdc.cpp b/src/devices/bus/adamnet/fdc.cpp
index cf99e564b78..f04c7af3302 100644
--- a/src/devices/bus/adamnet/fdc.cpp
+++ b/src/devices/bus/adamnet/fdc.cpp
@@ -177,7 +177,7 @@ ioport_constructor adam_fdc_device::device_input_ports() const
// adam_fdc_device - constructor
//-------------------------------------------------
-adam_fdc_device::adam_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adam_fdc_device::adam_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ADAM_FDC, "Adam FDC", tag, owner, clock, "adam_fdc", __FILE__),
device_adamnet_card_interface(mconfig, *this),
m_maincpu(*this, M6801_TAG),
@@ -217,7 +217,7 @@ void adam_fdc_device::adamnet_reset_w(int state)
READ8_MEMBER( adam_fdc_device::data_r )
{
- UINT8 data = m_fdc->data_r();
+ uint8_t data = m_fdc->data_r();
m_ram[offset & 0x3ff] = data;
@@ -246,7 +246,7 @@ READ8_MEMBER( adam_fdc_device::p1_r )
*/
- UINT8 data = 0x00;
+ uint8_t data = 0x00;
// disk in place
data |= m_floppy0->exists() ? 0x00 : 0x01;
@@ -321,7 +321,7 @@ READ8_MEMBER( adam_fdc_device::p2_r )
*/
- UINT8 data = M6801_MODE_2;
+ uint8_t data = M6801_MODE_2;
// NET RXD
data |= m_bus->rxd_r(this) << 3;
diff --git a/src/devices/bus/adamnet/fdc.h b/src/devices/bus/adamnet/fdc.h
index 72838e385a7..e380528ab08 100644
--- a/src/devices/bus/adamnet/fdc.h
+++ b/src/devices/bus/adamnet/fdc.h
@@ -30,7 +30,7 @@ class adam_fdc_device : public device_t,
{
public:
// construction/destruction
- adam_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adam_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -57,7 +57,7 @@ protected:
required_device<wd2793_t> m_fdc;
required_device<floppy_image_device> m_floppy0;
floppy_image_device *m_floppy;
- required_shared_ptr<UINT8> m_ram;
+ required_shared_ptr<uint8_t> m_ram;
required_ioport m_sw3;
};
diff --git a/src/devices/bus/adamnet/kb.cpp b/src/devices/bus/adamnet/kb.cpp
index 3249680e608..9266757c096 100644
--- a/src/devices/bus/adamnet/kb.cpp
+++ b/src/devices/bus/adamnet/kb.cpp
@@ -222,7 +222,7 @@ ioport_constructor adam_keyboard_device::device_input_ports() const
// adam_keyboard_device - constructor
//-------------------------------------------------
-adam_keyboard_device::adam_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+adam_keyboard_device::adam_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ADAM_KB, "Adam keyboard", tag, owner, clock, "adam_kb", __FILE__),
device_adamnet_card_interface(mconfig, *this),
m_maincpu(*this, M6801_TAG),
@@ -274,7 +274,7 @@ READ8_MEMBER( adam_keyboard_device::p1_r )
*/
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
for (int i = 0; i < 13; i++)
{
@@ -303,7 +303,7 @@ READ8_MEMBER( adam_keyboard_device::p2_r )
*/
- UINT8 data = M6801_MODE_7;
+ uint8_t data = M6801_MODE_7;
// NET RXD
data |= m_bus->rxd_r(this) << 3;
diff --git a/src/devices/bus/adamnet/kb.h b/src/devices/bus/adamnet/kb.h
index 9d8e198ef3a..418fdabdcbd 100644
--- a/src/devices/bus/adamnet/kb.h
+++ b/src/devices/bus/adamnet/kb.h
@@ -28,7 +28,7 @@ class adam_keyboard_device : public device_t,
{
public:
// construction/destruction
- adam_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adam_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -54,7 +54,7 @@ protected:
required_device<cpu_device> m_maincpu;
required_ioport_array<13> m_y;
- UINT16 m_key_y;
+ uint16_t m_key_y;
};
diff --git a/src/devices/bus/adamnet/printer.cpp b/src/devices/bus/adamnet/printer.cpp
index 9062b7aec52..7a2c7578102 100644
--- a/src/devices/bus/adamnet/printer.cpp
+++ b/src/devices/bus/adamnet/printer.cpp
@@ -100,7 +100,7 @@ machine_config_constructor adam_printer_device::device_mconfig_additions() const
// adam_printer_device - constructor
//-------------------------------------------------
-adam_printer_device::adam_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adam_printer_device::adam_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ADAM_PRN, "Adam printer", tag, owner, clock, "adam_prn", __FILE__),
device_adamnet_card_interface(mconfig, *this),
m_maincpu(*this, M6801_TAG)
@@ -168,7 +168,7 @@ READ8_MEMBER( adam_printer_device::p2_r )
*/
- UINT8 data = M6801_MODE_7;
+ uint8_t data = M6801_MODE_7;
// NET RXD
data |= m_bus->rxd_r(this) << 3;
diff --git a/src/devices/bus/adamnet/printer.h b/src/devices/bus/adamnet/printer.h
index 1bb657e3d91..0b35091612f 100644
--- a/src/devices/bus/adamnet/printer.h
+++ b/src/devices/bus/adamnet/printer.h
@@ -28,7 +28,7 @@ class adam_printer_device : public device_t,
{
public:
// construction/destruction
- adam_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adam_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/adamnet/spi.cpp b/src/devices/bus/adamnet/spi.cpp
index e15e7dd0d9f..15d8a6157a5 100644
--- a/src/devices/bus/adamnet/spi.cpp
+++ b/src/devices/bus/adamnet/spi.cpp
@@ -109,7 +109,7 @@ machine_config_constructor adam_spi_device::device_mconfig_additions() const
// adam_spi_device - constructor
//-------------------------------------------------
-adam_spi_device::adam_spi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+adam_spi_device::adam_spi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ADAM_SPI, "Adam SPI", tag, owner, clock, "adam_spi", __FILE__),
device_adamnet_card_interface(mconfig, *this),
m_maincpu(*this, M6801_TAG)
@@ -154,7 +154,7 @@ READ8_MEMBER( adam_spi_device::p2_r )
*/
- UINT8 data = M6801_MODE_7;
+ uint8_t data = M6801_MODE_7;
// NET RXD
data |= m_bus->rxd_r(this) << 3;
diff --git a/src/devices/bus/adamnet/spi.h b/src/devices/bus/adamnet/spi.h
index 47a26511a38..185aeaf657a 100644
--- a/src/devices/bus/adamnet/spi.h
+++ b/src/devices/bus/adamnet/spi.h
@@ -31,7 +31,7 @@ class adam_spi_device : public device_t,
{
public:
// construction/destruction
- adam_spi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ adam_spi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/amiga/zorro/a2052.cpp b/src/devices/bus/amiga/zorro/a2052.cpp
index dc2727d2117..ced832c9f3a 100644
--- a/src/devices/bus/amiga/zorro/a2052.cpp
+++ b/src/devices/bus/amiga/zorro/a2052.cpp
@@ -50,7 +50,7 @@ ioport_constructor a2052_device::device_input_ports() const
// a2052_device - constructor
//-------------------------------------------------
-a2052_device::a2052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2052_device::a2052_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2052, "CBM A2052 Fast Memory", tag, owner, clock, "a2052", __FILE__),
device_zorro2_card_interface(mconfig, *this),
m_config(*this, "config")
diff --git a/src/devices/bus/amiga/zorro/a2052.h b/src/devices/bus/amiga/zorro/a2052.h
index 0c06bac9395..02af377bdf3 100644
--- a/src/devices/bus/amiga/zorro/a2052.h
+++ b/src/devices/bus/amiga/zorro/a2052.h
@@ -28,7 +28,7 @@ class a2052_device : public device_t, public device_zorro2_card_interface, publi
{
public:
// construction/destruction
- a2052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2052_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual ioport_constructor device_input_ports() const override;
@@ -42,7 +42,7 @@ protected:
private:
required_ioport m_config;
- std::vector<UINT16> m_ram;
+ std::vector<uint16_t> m_ram;
};
// device type definition
diff --git a/src/devices/bus/amiga/zorro/a2232.cpp b/src/devices/bus/amiga/zorro/a2232.cpp
index 4cf44853c46..f7a0d5f4312 100644
--- a/src/devices/bus/amiga/zorro/a2232.cpp
+++ b/src/devices/bus/amiga/zorro/a2232.cpp
@@ -151,7 +151,7 @@ machine_config_constructor a2232_device::device_mconfig_additions() const
// a2232_device - constructor
//-------------------------------------------------
-a2232_device::a2232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2232_device::a2232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, A2232, "CBM A2232 Serial Card", tag, owner, clock, "a2232", __FILE__),
device_zorro2_card_interface(mconfig, *this),
m_iocpu(*this, "iocpu"),
@@ -311,7 +311,7 @@ WRITE_LINE_MEMBER( a2232_device::cfgin_w )
READ16_MEMBER( a2232_device::shared_ram_r )
{
- UINT16 data = 0;
+ uint16_t data = 0;
if (ACCESSING_BITS_0_7)
data |= m_shared_ram[(offset << 1) + 1];
@@ -381,7 +381,7 @@ WRITE16_MEMBER( a2232_device::irq_w )
READ16_MEMBER( a2232_device::reset_high_r )
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
if (VERBOSE)
logerror("%s('%s'): reset_high_r %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask);
diff --git a/src/devices/bus/amiga/zorro/a2232.h b/src/devices/bus/amiga/zorro/a2232.h
index 2611d243bdb..4132ce5178d 100644
--- a/src/devices/bus/amiga/zorro/a2232.h
+++ b/src/devices/bus/amiga/zorro/a2232.h
@@ -34,7 +34,7 @@ class a2232_device : public device_t, public device_zorro2_card_interface, publi
{
public:
// construction/destruction
- a2232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// cpu
WRITE8_MEMBER( int2_w );
@@ -137,12 +137,12 @@ private:
required_device<mos6551_device> m_acia_5;
required_device<mos6551_device> m_acia_6;
required_device<mos8520_device> m_cia;
- required_shared_ptr<UINT8> m_shared_ram;
+ required_shared_ptr<uint8_t> m_shared_ram;
int m_irqs[IRQ_SOURCE_COUNT];
- UINT8 m_cia_port_a;
- UINT8 m_cia_port_b;
+ uint8_t m_cia_port_a;
+ uint8_t m_cia_port_b;
};
// device type definition
diff --git a/src/devices/bus/amiga/zorro/a590.cpp b/src/devices/bus/amiga/zorro/a590.cpp
index 5cd5c0c9f6b..2a9eeb0c10d 100644
--- a/src/devices/bus/amiga/zorro/a590.cpp
+++ b/src/devices/bus/amiga/zorro/a590.cpp
@@ -192,7 +192,7 @@ const tiny_rom_entry *dmac_hdc_device::device_rom_region() const
//-------------------------------------------------
dmac_hdc_device::dmac_hdc_device(const machine_config &mconfig, device_type type, const char *tag,
- device_t *owner, UINT32 clock, const char *name, const char *shortname) :
+ device_t *owner, uint32_t clock, const char *name, const char *shortname) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
m_int6(false),
m_dmac(*this, "dmac"),
@@ -200,7 +200,7 @@ dmac_hdc_device::dmac_hdc_device(const machine_config &mconfig, device_type type
{
}
-a590_device::a590_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a590_device::a590_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
dmac_hdc_device(mconfig, A590, tag, owner, clock, "CBM A590 HD Controller", "a590"),
device_exp_card_interface(mconfig, *this),
m_dips(*this, "dips"),
@@ -210,7 +210,7 @@ a590_device::a590_device(const machine_config &mconfig, const char *tag, device_
{
}
-a2091_device::a2091_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+a2091_device::a2091_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
dmac_hdc_device(mconfig, A2091, tag, owner, clock, "CBM A2091 HD Controller", "a2091"),
device_zorro2_card_interface(mconfig, *this),
m_jp1(*this, "jp1"),
diff --git a/src/devices/bus/amiga/zorro/a590.h b/src/devices/bus/amiga/zorro/a590.h
index 90dc2cd589e..591ca08063c 100644
--- a/src/devices/bus/amiga/zorro/a590.h
+++ b/src/devices/bus/amiga/zorro/a590.h
@@ -30,7 +30,7 @@ class dmac_hdc_device : public device_t
public:
// construction/destruction
dmac_hdc_device(const machine_config &mconfig, device_type type, const char *tag,
- device_t *owner, UINT32 clock, const char *name, const char *shortname);
+ device_t *owner, uint32_t clock, const char *name, const char *shortname);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -62,7 +62,7 @@ protected:
required_device<dmac_device> m_dmac;
required_device<wd33c93_device> m_wdc;
- std::vector<UINT8> m_ram;
+ std::vector<uint8_t> m_ram;
};
// ======================> a590_device
@@ -71,7 +71,7 @@ class a590_device : public dmac_hdc_device, public device_exp_card_interface
{
public:
// construction/destruction
- a590_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a590_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -102,7 +102,7 @@ class a2091_device : public dmac_hdc_device, public device_zorro2_card_interface
{
public:
// construction/destruction
- a2091_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a2091_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/amiga/zorro/action_replay.cpp b/src/devices/bus/amiga/zorro/action_replay.cpp
index 8fd4f7b0eeb..423ce88f99c 100644
--- a/src/devices/bus/amiga/zorro/action_replay.cpp
+++ b/src/devices/bus/amiga/zorro/action_replay.cpp
@@ -98,24 +98,24 @@ const tiny_rom_entry *action_replay_mk3_device::device_rom_region() const
//-------------------------------------------------
action_replay_device::action_replay_device(const machine_config &mconfig, device_type type, const char *tag,
- device_t *owner, UINT32 clock, const char *name, const char *shortname) :
+ device_t *owner, uint32_t clock, const char *name, const char *shortname) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_exp_card_interface(mconfig, *this),
m_button(*this, "freeze")
{
}
-action_replay_mk1_device::action_replay_mk1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+action_replay_mk1_device::action_replay_mk1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
action_replay_device(mconfig, ACTION_REPLAY_MK1, tag, owner, clock, "Datel Action Replay MK-I", "amiga_ar1")
{
}
-action_replay_mk2_device::action_replay_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+action_replay_mk2_device::action_replay_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
action_replay_device(mconfig, ACTION_REPLAY_MK1, tag, owner, clock, "Datel Action Replay MK-II", "amiga_ar2")
{
}
-action_replay_mk3_device::action_replay_mk3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+action_replay_mk3_device::action_replay_mk3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
action_replay_device(mconfig, ACTION_REPLAY_MK1, tag, owner, clock, "Datel Action Replay MK-III", "amiga_ar3")
{
}
diff --git a/src/devices/bus/amiga/zorro/action_replay.h b/src/devices/bus/amiga/zorro/action_replay.h
index cf73b5c602b..4bb5d6dd242 100644
--- a/src/devices/bus/amiga/zorro/action_replay.h
+++ b/src/devices/bus/amiga/zorro/action_replay.h
@@ -28,7 +28,7 @@ class action_replay_device : public device_t, public device_exp_card_interface
public:
// construction/destruction
action_replay_device(const machine_config &mconfig, device_type type, const char *tag,
- device_t *owner, UINT32 clock, const char *name, const char *shortname);
+ device_t *owner, uint32_t clock, const char *name, const char *shortname);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -48,7 +48,7 @@ class action_replay_mk1_device : public action_replay_device
{
public:
// construction/destruction
- action_replay_mk1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ action_replay_mk1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -58,7 +58,7 @@ class action_replay_mk2_device : public action_replay_device
{
public:
// construction/destruction
- action_replay_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ action_replay_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -68,7 +68,7 @@ class action_replay_mk3_device : public action_replay_device
{
public:
// construction/destruction
- action_replay_mk3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ action_replay_mk3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/amiga/zorro/buddha.cpp b/src/devices/bus/amiga/zorro/buddha.cpp
index 512802f39fc..98a15a11bcd 100644
--- a/src/devices/bus/amiga/zorro/buddha.cpp
+++ b/src/devices/bus/amiga/zorro/buddha.cpp
@@ -67,7 +67,7 @@ const tiny_rom_entry *buddha_device::device_rom_region() const
// buddha_device - constructor
//-------------------------------------------------
-buddha_device::buddha_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+buddha_device::buddha_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, BUDDHA, "Buddha IDE controller", tag, owner, clock, "buddha", __FILE__),
device_zorro2_card_interface(mconfig, *this),
m_ata_0(*this, "ata_0"),
@@ -182,7 +182,7 @@ WRITE_LINE_MEMBER( buddha_device::cfgin_w )
READ16_MEMBER( buddha_device::speed_r )
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
if (VERBOSE)
logerror("%s('%s'): ide_0_interrupt_r %04x [mask = %04x]\n", shortname(), basetag(), data, mem_mask);
@@ -220,7 +220,7 @@ WRITE_LINE_MEMBER( buddha_device::ide_1_interrupt_w)
READ16_MEMBER( buddha_device::ide_0_interrupt_r )
{
- UINT16 data;
+ uint16_t data;
data = m_ide_0_interrupt << 15;
@@ -234,7 +234,7 @@ READ16_MEMBER( buddha_device::ide_0_interrupt_r )
READ16_MEMBER( buddha_device::ide_1_interrupt_r )
{
- UINT16 data;
+ uint16_t data;
data = m_ide_1_interrupt << 15;
@@ -255,7 +255,7 @@ WRITE16_MEMBER( buddha_device::ide_interrupt_enable_w )
READ16_MEMBER( buddha_device::ide_0_cs0_r )
{
- UINT16 data;
+ uint16_t data;
mem_mask = (mem_mask << 8) | (mem_mask >> 8);
data = m_ata_0->read_cs0(space, (offset >> 1) & 0x07, mem_mask);
@@ -279,7 +279,7 @@ WRITE16_MEMBER( buddha_device::ide_0_cs0_w )
READ16_MEMBER( buddha_device::ide_0_cs1_r )
{
- UINT16 data;
+ uint16_t data;
mem_mask = (mem_mask << 8) | (mem_mask >> 8);
data = m_ata_0->read_cs1(space, (offset >> 1) & 0x07, mem_mask);
@@ -303,7 +303,7 @@ WRITE16_MEMBER( buddha_device::ide_0_cs1_w )
READ16_MEMBER( buddha_device::ide_1_cs0_r )
{
- UINT16 data;
+ uint16_t data;
mem_mask = (mem_mask << 8) | (mem_mask >> 8);
data = m_ata_1->read_cs0(space, (offset >> 1) & 0x07, mem_mask);
@@ -327,7 +327,7 @@ WRITE16_MEMBER( buddha_device::ide_1_cs0_w )
READ16_MEMBER( buddha_device::ide_1_cs1_r )
{
- UINT16 data;
+ uint16_t data;
mem_mask = (mem_mask << 8) | (mem_mask >> 8);
data = m_ata_1->read_cs1(space, (offset >> 1) & 0x07, mem_mask);
diff --git a/src/devices/bus/amiga/zorro/buddha.h b/src/devices/bus/amiga/zorro/buddha.h
index be2d569c5de..712cf690cdd 100644
--- a/src/devices/bus/amiga/zorro/buddha.h
+++ b/src/devices/bus/amiga/zorro/buddha.h
@@ -29,7 +29,7 @@ class buddha_device : public device_t, public device_zorro2_card_interface, publ
{
public:
// construction/destruction
- buddha_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ buddha_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// speed register
DECLARE_READ16_MEMBER( speed_r );
diff --git a/src/devices/bus/amiga/zorro/zorro.cpp b/src/devices/bus/amiga/zorro/zorro.cpp
index 72f4eaed43d..15c5fa770c3 100644
--- a/src/devices/bus/amiga/zorro/zorro.cpp
+++ b/src/devices/bus/amiga/zorro/zorro.cpp
@@ -21,7 +21,7 @@ const device_type ZORRO_SLOT = &device_creator<zorro_slot_device>;
// zorro_slot_device - constructor
//-------------------------------------------------
-zorro_slot_device::zorro_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+zorro_slot_device::zorro_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ZORRO_SLOT, "Zorro slot", tag, owner, clock, "zorro_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_zorro_tag(nullptr)
@@ -29,7 +29,7 @@ zorro_slot_device::zorro_slot_device(const machine_config &mconfig, const char *
}
zorro_slot_device::zorro_slot_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this),
m_zorro_tag(nullptr)
@@ -68,7 +68,7 @@ void zorro_slot_device::device_start()
//-------------------------------------------------
zorro_device::zorro_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_space(nullptr),
m_cputag(nullptr),
@@ -120,7 +120,7 @@ const device_type EXP_SLOT = &device_creator<exp_slot_device>;
// exp_slot_device - constructor
//-------------------------------------------------
-exp_slot_device::exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+exp_slot_device::exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
zorro_device(mconfig, EXP_SLOT, "86-pin expansion slot", tag, owner, clock, "exp_slot", __FILE__),
m_ipl_handler(*this),
m_dev(nullptr)
@@ -128,7 +128,7 @@ exp_slot_device::exp_slot_device(const machine_config &mconfig, const char *tag,
}
exp_slot_device::exp_slot_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
zorro_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_ipl_handler(*this),
m_dev(nullptr)
@@ -186,7 +186,7 @@ const device_type ZORRO2 = &device_creator<zorro2_device>;
// zorro2_device - constructor
//-------------------------------------------------
-zorro2_device::zorro2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+zorro2_device::zorro2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
zorro_device(mconfig, ZORRO2, "Zorro-II bus", tag, owner, clock, "zorro2", __FILE__),
m_eint1_handler(*this),
m_eint4_handler(*this),
@@ -197,7 +197,7 @@ zorro2_device::zorro2_device(const machine_config &mconfig, const char *tag, dev
}
zorro2_device::zorro2_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
zorro_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_eint1_handler(*this),
m_eint4_handler(*this),
diff --git a/src/devices/bus/amiga/zorro/zorro.h b/src/devices/bus/amiga/zorro/zorro.h
index 7a37e334ada..9d641d66cc9 100644
--- a/src/devices/bus/amiga/zorro/zorro.h
+++ b/src/devices/bus/amiga/zorro/zorro.h
@@ -230,9 +230,9 @@ class zorro_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- zorro_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ zorro_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
zorro_slot_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -255,7 +255,7 @@ class zorro_device : public device_t
public:
// construction/destruction
zorro_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// static configuration helpers
static void set_cputag(device_t &device, const char *tag);
@@ -300,9 +300,9 @@ class exp_slot_device : public zorro_device
{
public:
// construction/destruction
- exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
exp_slot_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
template<class _Object> static devcb_base &set_ipl_handler(device_t &device, _Object object)
{ return downcast<exp_slot_device &>(device).m_ipl_handler.set_callback(object); }
@@ -336,9 +336,9 @@ class zorro2_device : public zorro_device
{
public:
// construction/destruction
- zorro2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ zorro2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
zorro2_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
~zorro2_device();
template<class _Object> static devcb_base &set_eint1_handler(device_t &device, _Object object)
diff --git a/src/devices/bus/apf/rom.cpp b/src/devices/bus/apf/rom.cpp
index 9eb83e4f12c..041bdad74b3 100644
--- a/src/devices/bus/apf/rom.cpp
+++ b/src/devices/bus/apf/rom.cpp
@@ -22,24 +22,24 @@ const device_type APF_ROM_BASIC = &device_creator<apf_basic_device>;
const device_type APF_ROM_SPACEDST = &device_creator<apf_spacedst_device>;
-apf_rom_device::apf_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+apf_rom_device::apf_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_apf_cart_interface( mconfig, *this )
{
}
-apf_rom_device::apf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+apf_rom_device::apf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, APF_ROM_STD, "APF Standard Carts", tag, owner, clock, "apf_rom", __FILE__),
device_apf_cart_interface( mconfig, *this )
{
}
-apf_basic_device::apf_basic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+apf_basic_device::apf_basic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: apf_rom_device(mconfig, APF_ROM_BASIC, "APF BASIC Carts", tag, owner, clock, "apf_basic", __FILE__)
{
}
-apf_spacedst_device::apf_spacedst_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+apf_spacedst_device::apf_spacedst_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: apf_rom_device(mconfig, APF_ROM_SPACEDST, "APF Space Destroyer Cart", tag, owner, clock, "apf_spacedst", __FILE__)
{
}
diff --git a/src/devices/bus/apf/rom.h b/src/devices/bus/apf/rom.h
index d7c3b748014..68b9c3bdbd3 100644
--- a/src/devices/bus/apf/rom.h
+++ b/src/devices/bus/apf/rom.h
@@ -13,8 +13,8 @@ class apf_rom_device : public device_t,
{
public:
// construction/destruction
- apf_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- apf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apf_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ apf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override {}
@@ -30,7 +30,7 @@ class apf_basic_device : public apf_rom_device
{
public:
// construction/destruction
- apf_basic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ 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;
@@ -42,7 +42,7 @@ class apf_spacedst_device : public apf_rom_device
{
public:
// construction/destruction
- apf_spacedst_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ 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;
diff --git a/src/devices/bus/apf/slot.cpp b/src/devices/bus/apf/slot.cpp
index bcfe2f825b6..8999c523649 100644
--- a/src/devices/bus/apf/slot.cpp
+++ b/src/devices/bus/apf/slot.cpp
@@ -45,7 +45,7 @@ device_apf_cart_interface::~device_apf_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_apf_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_apf_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -59,7 +59,7 @@ void device_apf_cart_interface::rom_alloc(UINT32 size, const char *tag)
// ram_alloc - alloc the space for the ram
//-------------------------------------------------
-void device_apf_cart_interface::ram_alloc(UINT32 size)
+void device_apf_cart_interface::ram_alloc(uint32_t size)
{
m_ram.resize(size);
}
@@ -72,7 +72,7 @@ void device_apf_cart_interface::ram_alloc(UINT32 size)
//-------------------------------------------------
// apf_cart_slot_device - constructor
//-------------------------------------------------
-apf_cart_slot_device::apf_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+apf_cart_slot_device::apf_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, APF_CART_SLOT, "APF Cartridge Slot", tag, owner, clock, "apf_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -160,7 +160,7 @@ image_init_result apf_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT32 size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
+ uint32_t size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
if (size > 0x3800)
{
@@ -215,7 +215,7 @@ std::string apf_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- UINT32 size = m_file->size();
+ uint32_t size = m_file->size();
int type = APF_STD;
// attempt to identify Space Destroyer, which needs 1K of additional RAM
diff --git a/src/devices/bus/apf/slot.h b/src/devices/bus/apf/slot.h
index 709d2f396a0..d50080de59c 100644
--- a/src/devices/bus/apf/slot.h
+++ b/src/devices/bus/apf/slot.h
@@ -34,20 +34,20 @@ public:
virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_ram) {}
- void rom_alloc(UINT32 size, const char *tag);
- void ram_alloc(UINT32 size);
- UINT8* get_rom_base() { return m_rom; }
- UINT8* get_ram_base() { return &m_ram[0]; }
- UINT32 get_rom_size() { return m_rom_size; }
- UINT32 get_ram_size() { return m_ram.size(); }
+ void rom_alloc(uint32_t size, const char *tag);
+ void ram_alloc(uint32_t size);
+ uint8_t* get_rom_base() { return m_rom; }
+ uint8_t* get_ram_base() { return &m_ram[0]; }
+ uint32_t get_rom_size() { return m_rom_size; }
+ uint32_t get_ram_size() { return m_ram.size(); }
void save_ram() { device().save_item(NAME(m_ram)); }
protected:
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT8> m_ram;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint8_t> m_ram;
};
@@ -59,7 +59,7 @@ class apf_cart_slot_device : public device_t,
{
public:
// construction/destruction
- apf_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apf_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~apf_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/apricot/expansion/expansion.cpp b/src/devices/bus/apricot/expansion/expansion.cpp
index 5dd7eb5ae58..cf1152c7ac3 100644
--- a/src/devices/bus/apricot/expansion/expansion.cpp
+++ b/src/devices/bus/apricot/expansion/expansion.cpp
@@ -19,14 +19,14 @@ const device_type APRICOT_EXPANSION_SLOT = &device_creator<apricot_expansion_slo
// apricot_expansion_slot_device - constructor
//-------------------------------------------------
-apricot_expansion_slot_device::apricot_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+apricot_expansion_slot_device::apricot_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, APRICOT_EXPANSION_SLOT, "Apricot Expansion Slot", tag, owner, clock, "apricot_exp_slot", __FILE__),
device_slot_interface(mconfig, *this)
{
}
apricot_expansion_slot_device::apricot_expansion_slot_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this)
{
@@ -58,7 +58,7 @@ const device_type APRICOT_EXPANSION_BUS = &device_creator<apricot_expansion_bus_
// apricot_expansion_bus_device - constructor
//-------------------------------------------------
-apricot_expansion_bus_device::apricot_expansion_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+apricot_expansion_bus_device::apricot_expansion_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, APRICOT_EXPANSION_BUS, "Apricot Expansion Bus", tag, owner, clock, "apricot_exp_bus", __FILE__),
m_program(nullptr),
m_io(nullptr),
diff --git a/src/devices/bus/apricot/expansion/expansion.h b/src/devices/bus/apricot/expansion/expansion.h
index fc581f50fb4..506a13d19b1 100644
--- a/src/devices/bus/apricot/expansion/expansion.h
+++ b/src/devices/bus/apricot/expansion/expansion.h
@@ -97,9 +97,9 @@ class apricot_expansion_slot_device : public device_t, public device_slot_interf
{
public:
// construction/destruction
- apricot_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apricot_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
apricot_expansion_slot_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -115,7 +115,7 @@ class apricot_expansion_bus_device : public device_t
{
public:
// construction/destruction
- apricot_expansion_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apricot_expansion_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~apricot_expansion_bus_device();
template<class _Object> static devcb_base &set_dma1_handler(device_t &device, _Object object)
diff --git a/src/devices/bus/apricot/expansion/ram.cpp b/src/devices/bus/apricot/expansion/ram.cpp
index 2221ae37227..59711b127cd 100644
--- a/src/devices/bus/apricot/expansion/ram.cpp
+++ b/src/devices/bus/apricot/expansion/ram.cpp
@@ -42,7 +42,7 @@ ioport_constructor apricot_256k_ram_device::device_input_ports() const
// apricot_256k_ram_device - constructor
//-------------------------------------------------
-apricot_256k_ram_device::apricot_256k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+apricot_256k_ram_device::apricot_256k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, APRICOT_256K_RAM, "Apricot 256K RAM Expansion Board", tag, owner, clock, "apricot_256k_ram", __FILE__),
device_apricot_expansion_card_interface(mconfig, *this),
m_sw(*this, "sw")
@@ -96,7 +96,7 @@ ioport_constructor apricot_128k_ram_device::device_input_ports() const
// apricot_128_512k_ram_device - constructor
//-------------------------------------------------
-apricot_128k_ram_device::apricot_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+apricot_128k_ram_device::apricot_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, APRICOT_128K_RAM, "Apricot 128/512K RAM Expansion Board (128K)", tag, owner, clock, "apricot_128k_ram", __FILE__),
device_apricot_expansion_card_interface(mconfig, *this),
m_strap(*this, "strap")
@@ -150,7 +150,7 @@ ioport_constructor apricot_512k_ram_device::device_input_ports() const
// apricot_128_512k_ram_device - constructor
//-------------------------------------------------
-apricot_512k_ram_device::apricot_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+apricot_512k_ram_device::apricot_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, APRICOT_512K_RAM, "Apricot 128/512K RAM Expansion Board (512K)", tag, owner, clock, "apricot_512k_ram", __FILE__),
device_apricot_expansion_card_interface(mconfig, *this),
m_strap(*this, "strap")
diff --git a/src/devices/bus/apricot/expansion/ram.h b/src/devices/bus/apricot/expansion/ram.h
index c2b2f771953..719a51cbc4f 100644
--- a/src/devices/bus/apricot/expansion/ram.h
+++ b/src/devices/bus/apricot/expansion/ram.h
@@ -26,7 +26,7 @@ class apricot_256k_ram_device : public device_t, public device_apricot_expansion
{
public:
// construction/destruction
- apricot_256k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apricot_256k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual ioport_constructor device_input_ports() const override;
@@ -36,7 +36,7 @@ protected:
private:
required_ioport m_sw;
- std::vector<UINT16> m_ram;
+ std::vector<uint16_t> m_ram;
};
@@ -46,7 +46,7 @@ class apricot_128k_ram_device : public device_t, public device_apricot_expansion
{
public:
// construction/destruction
- apricot_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apricot_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual ioport_constructor device_input_ports() const override;
@@ -56,7 +56,7 @@ protected:
private:
required_ioport m_strap;
- std::vector<UINT16> m_ram;
+ std::vector<uint16_t> m_ram;
};
@@ -66,7 +66,7 @@ class apricot_512k_ram_device : public device_t, public device_apricot_expansion
{
public:
// construction/destruction
- apricot_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apricot_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual ioport_constructor device_input_ports() const override;
@@ -76,7 +76,7 @@ protected:
private:
required_ioport m_strap;
- std::vector<UINT16> m_ram;
+ std::vector<uint16_t> m_ram;
};
diff --git a/src/devices/bus/apricot/keyboard/hle.cpp b/src/devices/bus/apricot/keyboard/hle.cpp
index 5315cb6e31a..8fbbb796ef1 100644
--- a/src/devices/bus/apricot/keyboard/hle.cpp
+++ b/src/devices/bus/apricot/keyboard/hle.cpp
@@ -207,7 +207,7 @@ machine_config_constructor apricot_keyboard_hle_device::device_mconfig_additions
// apricot_keyboard_hle_device - constructor
//-------------------------------------------------
-apricot_keyboard_hle_device::apricot_keyboard_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+apricot_keyboard_hle_device::apricot_keyboard_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, APRICOT_KEYBOARD_HLE, "Apricot Keyboard (HLE)", tag, owner, clock, "apricotkb_hle", __FILE__),
device_apricot_keyboard_interface(mconfig, *this),
device_buffered_serial_interface(mconfig, *this),
@@ -258,7 +258,7 @@ void apricot_keyboard_hle_device::tra_callback()
// received_byte - handle received byte
//-------------------------------------------------
-void apricot_keyboard_hle_device::received_byte(UINT8 byte)
+void apricot_keyboard_hle_device::received_byte(uint8_t byte)
{
if ((byte & 0xf0) == 0xf0)
{
@@ -317,7 +317,7 @@ void apricot_keyboard_hle_device::received_byte(UINT8 byte)
// key_make - handle a key being pressed
//-------------------------------------------------
-void apricot_keyboard_hle_device::key_make(UINT8 row, UINT8 column)
+void apricot_keyboard_hle_device::key_make(uint8_t row, uint8_t column)
{
// send the make code
transmit_byte((row << 3) | column);
@@ -327,7 +327,7 @@ void apricot_keyboard_hle_device::key_make(UINT8 row, UINT8 column)
// key_break - handle a key being released
//-------------------------------------------------
-void apricot_keyboard_hle_device::key_break(UINT8 row, UINT8 column)
+void apricot_keyboard_hle_device::key_break(uint8_t row, uint8_t column)
{
// send the break code
transmit_byte(0x80 | (row << 3) | column);
diff --git a/src/devices/bus/apricot/keyboard/hle.h b/src/devices/bus/apricot/keyboard/hle.h
index 8ef520824a8..e1cef569472 100644
--- a/src/devices/bus/apricot/keyboard/hle.h
+++ b/src/devices/bus/apricot/keyboard/hle.h
@@ -30,7 +30,7 @@ class apricot_keyboard_hle_device : public device_t,
{
public:
// construction/destruction
- apricot_keyboard_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apricot_keyboard_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// from host
virtual void out_w(int state) override;
@@ -44,11 +44,11 @@ protected:
// device_buffered_serial_interface overrides
virtual void tra_callback() override;
- virtual void received_byte(UINT8 byte) override;
+ virtual void received_byte(uint8_t byte) override;
// device_matrix_keyboard_interface overrides
- virtual void key_make(UINT8 row, UINT8 column) override;
- virtual void key_break(UINT8 row, UINT8 column) override;
+ virtual void key_make(uint8_t row, uint8_t column) override;
+ virtual void key_break(uint8_t row, uint8_t column) override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
diff --git a/src/devices/bus/apricot/keyboard/keyboard.cpp b/src/devices/bus/apricot/keyboard/keyboard.cpp
index e045b319e4f..8d53eac72b5 100644
--- a/src/devices/bus/apricot/keyboard/keyboard.cpp
+++ b/src/devices/bus/apricot/keyboard/keyboard.cpp
@@ -25,7 +25,7 @@ const device_type APRICOT_KEYBOARD_INTERFACE = &device_creator<apricot_keyboard_
// apricot_keyboard_bus_device - constructor
//-------------------------------------------------
-apricot_keyboard_bus_device::apricot_keyboard_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+apricot_keyboard_bus_device::apricot_keyboard_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, APRICOT_KEYBOARD_INTERFACE, "Apricot Keyboard Interface", tag, owner, clock, "apricot_kbd", __FILE__),
device_slot_interface(mconfig, *this),
m_kbd(nullptr),
diff --git a/src/devices/bus/apricot/keyboard/keyboard.h b/src/devices/bus/apricot/keyboard/keyboard.h
index 46398f30a3d..ae37e7d7897 100644
--- a/src/devices/bus/apricot/keyboard/keyboard.h
+++ b/src/devices/bus/apricot/keyboard/keyboard.h
@@ -59,7 +59,7 @@ class apricot_keyboard_bus_device : public device_t, public device_slot_interfac
{
public:
// construction/destruction
- apricot_keyboard_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ apricot_keyboard_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~apricot_keyboard_bus_device();
// callbacks
diff --git a/src/devices/bus/arcadia/rom.cpp b/src/devices/bus/arcadia/rom.cpp
index 5a6186aa8de..8009b229a68 100644
--- a/src/devices/bus/arcadia/rom.cpp
+++ b/src/devices/bus/arcadia/rom.cpp
@@ -22,19 +22,19 @@ const device_type ARCADIA_ROM_STD = &device_creator<arcadia_rom_device>;
const device_type ARCADIA_ROM_GOLF = &device_creator<arcadia_golf_device>;
-arcadia_rom_device::arcadia_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+arcadia_rom_device::arcadia_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_arcadia_cart_interface( mconfig, *this )
{
}
-arcadia_rom_device::arcadia_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+arcadia_rom_device::arcadia_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ARCADIA_ROM_STD, "Emerson Arcadia Standard Carts", tag, owner, clock, "arcadia_rom", __FILE__),
device_arcadia_cart_interface( mconfig, *this )
{
}
-arcadia_golf_device::arcadia_golf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+arcadia_golf_device::arcadia_golf_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: arcadia_rom_device(mconfig, ARCADIA_ROM_GOLF, "Emerson Arcadia Golf Cart", tag, owner, clock, "arcadia_golf", __FILE__)
{
}
diff --git a/src/devices/bus/arcadia/rom.h b/src/devices/bus/arcadia/rom.h
index 3e1c55e60c0..ad77caa1bc3 100644
--- a/src/devices/bus/arcadia/rom.h
+++ b/src/devices/bus/arcadia/rom.h
@@ -13,8 +13,8 @@ class arcadia_rom_device : public device_t,
{
public:
// construction/destruction
- arcadia_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- arcadia_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ arcadia_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ arcadia_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override {}
@@ -31,7 +31,7 @@ class arcadia_golf_device : public arcadia_rom_device
{
public:
// construction/destruction
- arcadia_golf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ arcadia_golf_device(const machine_config &mconfig, 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 2c9a55fff91..a2d3eed9b5c 100644
--- a/src/devices/bus/arcadia/slot.cpp
+++ b/src/devices/bus/arcadia/slot.cpp
@@ -45,7 +45,7 @@ device_arcadia_cart_interface::~device_arcadia_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_arcadia_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_arcadia_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -62,7 +62,7 @@ void device_arcadia_cart_interface::rom_alloc(UINT32 size, const char *tag)
//-------------------------------------------------
// arcadia_cart_slot_device - constructor
//-------------------------------------------------
-arcadia_cart_slot_device::arcadia_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+arcadia_cart_slot_device::arcadia_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, EA2001_CART_SLOT, "Emerson Arcadia Cartridge Slot", tag, owner, clock, "arcadia_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -150,7 +150,7 @@ image_init_result arcadia_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT32 len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
+ uint32_t len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
m_cart->rom_alloc(len, tag());
diff --git a/src/devices/bus/arcadia/slot.h b/src/devices/bus/arcadia/slot.h
index 2f7f2dbc67a..e052f1ff1f5 100644
--- a/src/devices/bus/arcadia/slot.h
+++ b/src/devices/bus/arcadia/slot.h
@@ -32,14 +32,14 @@ public:
virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; }
virtual DECLARE_READ8_MEMBER(extra_rom) { return 0xff; }
- void rom_alloc(UINT32 size, const char *tag);
- UINT8* get_rom_base() { return m_rom; }
- UINT32 get_rom_size() { return m_rom_size; }
+ void rom_alloc(uint32_t size, const char *tag);
+ uint8_t* get_rom_base() { return m_rom; }
+ uint32_t get_rom_size() { return m_rom_size; }
protected:
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
};
@@ -51,7 +51,7 @@ class arcadia_cart_slot_device : public device_t,
{
public:
// construction/destruction
- arcadia_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ arcadia_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~arcadia_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/astrocde/exp.cpp b/src/devices/bus/astrocde/exp.cpp
index 2d6e7eb51b3..cf57dcee23d 100644
--- a/src/devices/bus/astrocde/exp.cpp
+++ b/src/devices/bus/astrocde/exp.cpp
@@ -35,7 +35,7 @@ device_astrocade_card_interface::~device_astrocade_card_interface()
//-------------------------------------------------
// astrocade_exp_device - constructor
//-------------------------------------------------
-astrocade_exp_device::astrocade_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+astrocade_exp_device::astrocade_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ASTROCADE_EXP_SLOT, "Bally Astrocade expansion", tag, owner, clock, "astrocde_exp", __FILE__),
device_slot_interface(mconfig, *this),
m_card_mounted(false), m_card(nullptr)
diff --git a/src/devices/bus/astrocde/exp.h b/src/devices/bus/astrocde/exp.h
index b2d6e3643ea..110bdaf0367 100644
--- a/src/devices/bus/astrocde/exp.h
+++ b/src/devices/bus/astrocde/exp.h
@@ -25,7 +25,7 @@ class astrocade_exp_device : public device_t,
{
public:
// construction/destruction
- astrocade_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~astrocade_exp_device();
// device-level overrides
diff --git a/src/devices/bus/astrocde/ram.cpp b/src/devices/bus/astrocde/ram.cpp
index 95ebb6816aa..d10b006c224 100644
--- a/src/devices/bus/astrocde/ram.cpp
+++ b/src/devices/bus/astrocde/ram.cpp
@@ -68,45 +68,45 @@ const device_type ASTROCADE_WHITERAM = &device_creator<astrocade_whiteram_dev
const device_type ASTROCADE_RL64RAM = &device_creator<astrocade_rl64ram_device>;
-astrocade_blueram_4k_device::astrocade_blueram_4k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+astrocade_blueram_4k_device::astrocade_blueram_4k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_astrocade_card_interface(mconfig, *this),
m_write_prot(*this, "RAM_PROTECT")
{
}
-astrocade_blueram_4k_device::astrocade_blueram_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_blueram_4k_device::astrocade_blueram_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ASTROCADE_BLUERAM_4K, "Bally Astrocade Blue RAM 4K", tag, owner, clock, "astrocade_br4", __FILE__),
device_astrocade_card_interface(mconfig, *this),
m_write_prot(*this, "RAM_PROTECT")
{
}
-astrocade_blueram_16k_device::astrocade_blueram_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_blueram_16k_device::astrocade_blueram_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: astrocade_blueram_4k_device(mconfig, ASTROCADE_BLUERAM_16K, "Bally Astrocade Blue RAM 16K", tag, owner, clock, "astrocade_br16", __FILE__)
{
}
-astrocade_blueram_32k_device::astrocade_blueram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_blueram_32k_device::astrocade_blueram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: astrocade_blueram_4k_device(mconfig, ASTROCADE_BLUERAM_32K, "Bally Astrocade Blue RAM 32K", tag, owner, clock, "astrocade_br32", __FILE__)
{
}
-astrocade_viper_sys1_device::astrocade_viper_sys1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_viper_sys1_device::astrocade_viper_sys1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ASTROCADE_VIPER_SYS1, "Bally Astrocade Viper System 1", tag, owner, clock, "astrocade_vs1", __FILE__),
device_astrocade_card_interface(mconfig, *this),
m_write_prot(*this, "RAM_PROTECT")
{
}
-astrocade_whiteram_device::astrocade_whiteram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_whiteram_device::astrocade_whiteram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ASTROCADE_WHITERAM, "Bally Astrocade Lil' White RAM 32K", tag, owner, clock, "astrocade_lwr", __FILE__),
device_astrocade_card_interface(mconfig, *this),
m_write_prot(*this, "RAM_PROTECT")
{
}
-astrocade_rl64ram_device::astrocade_rl64ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_rl64ram_device::astrocade_rl64ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ASTROCADE_RL64RAM, "Bally Astrocade R&L RAM 64K", tag, owner, clock, "astrocade_rl64", __FILE__),
device_astrocade_card_interface(mconfig, *this),
m_write_prot(*this, "RAM_PROTECT")
diff --git a/src/devices/bus/astrocde/ram.h b/src/devices/bus/astrocde/ram.h
index 39d854827ac..d714c14e3b3 100644
--- a/src/devices/bus/astrocde/ram.h
+++ b/src/devices/bus/astrocde/ram.h
@@ -13,8 +13,8 @@ class astrocade_blueram_4k_device : public device_t,
{
public:
// construction/destruction
- astrocade_blueram_4k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- astrocade_blueram_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_blueram_4k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ astrocade_blueram_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { m_ram.resize(0x1000); save_item(NAME(m_ram)); }
@@ -26,7 +26,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write) override;
protected:
- std::vector<UINT8> m_ram;
+ std::vector<uint8_t> m_ram;
required_ioport m_write_prot;
};
@@ -36,7 +36,7 @@ class astrocade_blueram_16k_device : public astrocade_blueram_4k_device
{
public:
// construction/destruction
- astrocade_blueram_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_blueram_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void device_start() override { m_ram.resize(0x4000); save_item(NAME(m_ram)); }
};
@@ -47,7 +47,7 @@ class astrocade_blueram_32k_device : public astrocade_blueram_4k_device
{
public:
// construction/destruction
- astrocade_blueram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_blueram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void device_start() override { m_ram.resize(0x8000); save_item(NAME(m_ram)); }
};
@@ -59,7 +59,7 @@ class astrocade_viper_sys1_device : public device_t,
{
public:
// construction/destruction
- astrocade_viper_sys1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_viper_sys1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { m_ram.resize(0x4000); save_item(NAME(m_ram)); }
@@ -71,7 +71,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write) override;
private:
- std::vector<UINT8> m_ram;
+ std::vector<uint8_t> m_ram;
required_ioport m_write_prot;
};
@@ -82,7 +82,7 @@ class astrocade_whiteram_device : public device_t,
{
public:
// construction/destruction
- astrocade_whiteram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_whiteram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { m_ram.resize(0x8000); save_item(NAME(m_ram)); }
@@ -94,7 +94,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write) override;
private:
- std::vector<UINT8> m_ram;
+ std::vector<uint8_t> m_ram;
required_ioport m_write_prot;
};
@@ -105,7 +105,7 @@ class astrocade_rl64ram_device : public device_t,
{
public:
// construction/destruction
- astrocade_rl64ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_rl64ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { m_ram.resize(0xb000); save_item(NAME(m_ram)); }
@@ -117,7 +117,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write) override;
private:
- std::vector<UINT8> m_ram;
+ std::vector<uint8_t> m_ram;
required_ioport m_write_prot;
};
diff --git a/src/devices/bus/astrocde/rom.cpp b/src/devices/bus/astrocde/rom.cpp
index 201a4d1afe6..335b45338ea 100644
--- a/src/devices/bus/astrocde/rom.cpp
+++ b/src/devices/bus/astrocde/rom.cpp
@@ -22,24 +22,24 @@ const device_type ASTROCADE_ROM_256K = &device_creator<astrocade_rom_256k_device
const device_type ASTROCADE_ROM_512K = &device_creator<astrocade_rom_512k_device>;
-astrocade_rom_device::astrocade_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+astrocade_rom_device::astrocade_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_astrocade_cart_interface(mconfig, *this)
{
}
-astrocade_rom_device::astrocade_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_rom_device::astrocade_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ASTROCADE_ROM_STD, "Bally Astrocade Standard Carts", tag, owner, clock, "astrocade_rom", __FILE__),
device_astrocade_cart_interface(mconfig, *this)
{
}
-astrocade_rom_256k_device::astrocade_rom_256k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_rom_256k_device::astrocade_rom_256k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: astrocade_rom_device(mconfig, ASTROCADE_ROM_256K, "Bally Astrocade 256K Carts", tag, owner, clock, "astrocade_256k", __FILE__), m_base_bank(0)
{
}
-astrocade_rom_512k_device::astrocade_rom_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+astrocade_rom_512k_device::astrocade_rom_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: astrocade_rom_device(mconfig, ASTROCADE_ROM_512K, "Bally Astrocade 512K Carts", tag, owner, clock, "astrocade_512k", __FILE__), m_base_bank(0)
{
}
diff --git a/src/devices/bus/astrocde/rom.h b/src/devices/bus/astrocde/rom.h
index 28fcb0d43bb..9fa0b20e5fe 100644
--- a/src/devices/bus/astrocde/rom.h
+++ b/src/devices/bus/astrocde/rom.h
@@ -13,8 +13,8 @@ class astrocade_rom_device : public device_t,
{
public:
// construction/destruction
- astrocade_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- astrocade_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ astrocade_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override {}
@@ -30,7 +30,7 @@ class astrocade_rom_256k_device : public astrocade_rom_device
{
public:
// construction/destruction
- astrocade_rom_256k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_rom_256k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -39,7 +39,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_rom) override;
private:
- UINT8 m_base_bank;
+ uint8_t m_base_bank;
};
// ======================> astrocade_rom_512k_device
@@ -48,7 +48,7 @@ class astrocade_rom_512k_device : public astrocade_rom_device
{
public:
// construction/destruction
- astrocade_rom_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_rom_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -57,7 +57,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_rom) override;
private:
- UINT8 m_base_bank;
+ uint8_t m_base_bank;
};
diff --git a/src/devices/bus/astrocde/slot.cpp b/src/devices/bus/astrocde/slot.cpp
index 477caa61029..09cbf27e2e6 100644
--- a/src/devices/bus/astrocde/slot.cpp
+++ b/src/devices/bus/astrocde/slot.cpp
@@ -45,7 +45,7 @@ device_astrocade_cart_interface::~device_astrocade_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_astrocade_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_astrocade_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -62,7 +62,7 @@ void device_astrocade_cart_interface::rom_alloc(UINT32 size, const char *tag)
//-------------------------------------------------
// astrocade_cart_slot_device - constructor
//-------------------------------------------------
-astrocade_cart_slot_device::astrocade_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+astrocade_cart_slot_device::astrocade_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ASTROCADE_CART_SLOT, "Bally Astrocade Cartridge Slot", tag, owner, clock, "astrocade_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -150,7 +150,7 @@ image_init_result astrocade_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT32 size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
+ uint32_t size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
m_cart->rom_alloc(size, tag());
if (software_entry() == nullptr)
@@ -192,7 +192,7 @@ std::string astrocade_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- UINT32 size = m_file->size();
+ uint32_t size = m_file->size();
int type = ASTROCADE_STD;
if (size == 0x40000)
diff --git a/src/devices/bus/astrocde/slot.h b/src/devices/bus/astrocde/slot.h
index edd94af5ca1..b18a896a3a1 100644
--- a/src/devices/bus/astrocde/slot.h
+++ b/src/devices/bus/astrocde/slot.h
@@ -32,14 +32,14 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; }
- void rom_alloc(UINT32 size, const char *tag);
- UINT8* get_rom_base() { return m_rom; }
- UINT32 get_rom_size() { return m_rom_size; }
+ void rom_alloc(uint32_t size, const char *tag);
+ uint8_t* get_rom_base() { return m_rom; }
+ uint32_t get_rom_size() { return m_rom_size; }
protected:
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
};
@@ -51,7 +51,7 @@ class astrocade_cart_slot_device : public device_t,
{
public:
// construction/destruction
- astrocade_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ astrocade_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~astrocade_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp b/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp
index bec28f963ea..72fbe7f04c3 100644
--- a/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp
+++ b/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp
@@ -50,7 +50,7 @@ device_bbc_1mhzbus_interface::~device_bbc_1mhzbus_interface()
// bbc_1mhzbus_slot_device - constructor
//-------------------------------------------------
-bbc_1mhzbus_slot_device::bbc_1mhzbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bbc_1mhzbus_slot_device::bbc_1mhzbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, BBC_1MHZBUS_SLOT, "BBC Micro 1MHz Bus port", tag, owner, clock, "bbc_1mhzbus_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_card(nullptr),
diff --git a/src/devices/bus/bbc/1mhzbus/1mhzbus.h b/src/devices/bus/bbc/1mhzbus/1mhzbus.h
index 827447656a4..e2f96580c1c 100644
--- a/src/devices/bus/bbc/1mhzbus/1mhzbus.h
+++ b/src/devices/bus/bbc/1mhzbus/1mhzbus.h
@@ -119,7 +119,7 @@ class bbc_1mhzbus_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- bbc_1mhzbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_1mhzbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~bbc_1mhzbus_slot_device();
// callbacks
diff --git a/src/devices/bus/bbc/1mhzbus/opus3.cpp b/src/devices/bus/bbc/1mhzbus/opus3.cpp
index b5d4e992940..75bb8700cfd 100644
--- a/src/devices/bus/bbc/1mhzbus/opus3.cpp
+++ b/src/devices/bus/bbc/1mhzbus/opus3.cpp
@@ -114,7 +114,7 @@ const tiny_rom_entry *bbc_opus3_device::device_rom_region() const
// bbc_opus3_device - constructor
//-------------------------------------------------
-bbc_opus3_device::bbc_opus3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+bbc_opus3_device::bbc_opus3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, BBC_OPUS3, "Opus Challenger 3-in-1", tag, owner, clock, "bbc_opus3", __FILE__),
device_bbc_1mhzbus_interface(mconfig, *this),
m_dfs_rom(*this, "dfs_rom"),
diff --git a/src/devices/bus/bbc/1mhzbus/opus3.h b/src/devices/bus/bbc/1mhzbus/opus3.h
index a1e1451ac69..0e08608d42e 100644
--- a/src/devices/bus/bbc/1mhzbus/opus3.h
+++ b/src/devices/bus/bbc/1mhzbus/opus3.h
@@ -27,7 +27,7 @@ class bbc_opus3_device:
{
public:
// construction/destruction
- bbc_opus3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_opus3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_FLOPPY_FORMATS(floppy_formats);
@@ -55,7 +55,7 @@ private:
int m_fdc_ie;
int m_fdc_drq;
- UINT16 m_ramdisk_page;
+ uint16_t m_ramdisk_page;
};
diff --git a/src/devices/bus/bbc/analogue/analogue.cpp b/src/devices/bus/bbc/analogue/analogue.cpp
index d0e01ce34cb..2b8fcd110b4 100644
--- a/src/devices/bus/bbc/analogue/analogue.cpp
+++ b/src/devices/bus/bbc/analogue/analogue.cpp
@@ -49,7 +49,7 @@ device_bbc_analogue_interface::~device_bbc_analogue_interface()
// bbc_analogue_slot_device - constructor
//-------------------------------------------------
-bbc_analogue_slot_device::bbc_analogue_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bbc_analogue_slot_device::bbc_analogue_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, BBC_ANALOGUE_SLOT, "BBC Micro Analogue port", tag, owner, clock, "bbc_analogue_slot", __FILE__),
device_slot_interface(mconfig, *this)
{
@@ -65,7 +65,7 @@ void bbc_analogue_slot_device::device_start()
m_card = dynamic_cast<device_bbc_analogue_interface *>(get_card_device());
}
-UINT8 bbc_analogue_slot_device::ch_r(int channel)
+uint8_t bbc_analogue_slot_device::ch_r(int channel)
{
if (m_card)
return m_card->ch_r(channel);
@@ -73,7 +73,7 @@ UINT8 bbc_analogue_slot_device::ch_r(int channel)
return 0x00;
}
-UINT8 bbc_analogue_slot_device::pb_r()
+uint8_t bbc_analogue_slot_device::pb_r()
{
if (m_card)
return m_card->pb_r();
diff --git a/src/devices/bus/bbc/analogue/analogue.h b/src/devices/bus/bbc/analogue/analogue.h
index 36ac229c21f..3558f20fdf1 100644
--- a/src/devices/bus/bbc/analogue/analogue.h
+++ b/src/devices/bus/bbc/analogue/analogue.h
@@ -61,11 +61,11 @@ class bbc_analogue_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- bbc_analogue_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_analogue_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~bbc_analogue_slot_device() {}
- UINT8 ch_r(int channel);
- UINT8 pb_r();
+ uint8_t ch_r(int channel);
+ uint8_t pb_r();
protected:
// device-level overrides
@@ -85,8 +85,8 @@ public:
device_bbc_analogue_interface(const machine_config &mconfig, device_t &device);
virtual ~device_bbc_analogue_interface();
- virtual UINT8 ch_r(int channel) { return 0x00; };
- virtual UINT8 pb_r() { return 0x30; };
+ virtual uint8_t ch_r(int channel) { return 0x00; };
+ virtual uint8_t pb_r() { return 0x30; };
protected:
bbc_analogue_slot_device *m_slot;
diff --git a/src/devices/bus/bbc/analogue/joystick.cpp b/src/devices/bus/bbc/analogue/joystick.cpp
index 6dfd56c111b..b72a46c5b60 100644
--- a/src/devices/bus/bbc/analogue/joystick.cpp
+++ b/src/devices/bus/bbc/analogue/joystick.cpp
@@ -81,7 +81,7 @@ ioport_constructor bbc_voltmace3b_device::device_input_ports() const
// bbc_joystick_device - constructor
//-------------------------------------------------
-bbc_joystick_device::bbc_joystick_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+bbc_joystick_device::bbc_joystick_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_bbc_analogue_interface(mconfig, *this),
m_joy(*this, "JOY%u", 0),
@@ -89,12 +89,12 @@ bbc_joystick_device::bbc_joystick_device(const machine_config &mconfig, device_t
{
}
-bbc_acornjoy_device::bbc_acornjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bbc_acornjoy_device::bbc_acornjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
bbc_joystick_device(mconfig, BBC_ACORNJOY, "Acorn Analogue Joysticks", tag, owner, clock, "bbc_acornjoy", __FILE__)
{
}
-bbc_voltmace3b_device::bbc_voltmace3b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bbc_voltmace3b_device::bbc_voltmace3b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
bbc_joystick_device(mconfig, BBC_VOLTMACE3B, "Voltmace Delta 3b Twin Joysticks", tag, owner, clock, "bbc_voltmace3b", __FILE__)
{
}
@@ -122,12 +122,12 @@ void bbc_joystick_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-UINT8 bbc_joystick_device::ch_r(int channel)
+uint8_t bbc_joystick_device::ch_r(int channel)
{
return m_joy[channel]->read();
}
-UINT8 bbc_joystick_device::pb_r()
+uint8_t bbc_joystick_device::pb_r()
{
return m_buttons->read();
}
diff --git a/src/devices/bus/bbc/analogue/joystick.h b/src/devices/bus/bbc/analogue/joystick.h
index c5812105c4c..3222c3f8565 100644
--- a/src/devices/bus/bbc/analogue/joystick.h
+++ b/src/devices/bus/bbc/analogue/joystick.h
@@ -27,15 +27,15 @@ class bbc_joystick_device :
{
public:
// construction/destruction
- bbc_joystick_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ bbc_joystick_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 ch_r(int channel) override;
- virtual UINT8 pb_r() override;
+ virtual uint8_t ch_r(int channel) override;
+ virtual uint8_t pb_r() override;
private:
required_ioport_array<4> m_joy;
@@ -45,7 +45,7 @@ private:
class bbc_acornjoy_device : public bbc_joystick_device
{
public:
- bbc_acornjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_acornjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
};
@@ -53,7 +53,7 @@ public:
class bbc_voltmace3b_device : public bbc_joystick_device
{
public:
- bbc_voltmace3b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_voltmace3b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
};
diff --git a/src/devices/bus/bbc/fdc/acorn.cpp b/src/devices/bus/bbc/fdc/acorn.cpp
index 3f86b2d0a37..b0a159470a0 100644
--- a/src/devices/bus/bbc/fdc/acorn.cpp
+++ b/src/devices/bus/bbc/fdc/acorn.cpp
@@ -155,7 +155,7 @@ const tiny_rom_entry *bbc_acorn1770_device::device_rom_region() const
// bbc_acornfdc_device - constructor
//-------------------------------------------------
-bbc_acorn8271_device::bbc_acorn8271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+bbc_acorn8271_device::bbc_acorn8271_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, BBC_ACORN8271, "Acorn 8271 FDC", tag, owner, clock, "bbc_acorn8271", __FILE__),
device_bbc_fdc_interface(mconfig, *this),
m_dfs_rom(*this, "dfs_rom"),
@@ -165,7 +165,7 @@ bbc_acorn8271_device::bbc_acorn8271_device(const machine_config &mconfig, const
{
}
-bbc_acorn1770_device::bbc_acorn1770_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+bbc_acorn1770_device::bbc_acorn1770_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, BBC_ACORN1770, "Acorn 1770 FDC", tag, owner, clock, "bbc_acorn1770", __FILE__),
device_bbc_fdc_interface(mconfig, *this),
m_dfs_rom(*this, "dfs_rom"),
diff --git a/src/devices/bus/bbc/fdc/acorn.h b/src/devices/bus/bbc/fdc/acorn.h
index 19054de50dd..6d3cdcd5260 100644
--- a/src/devices/bus/bbc/fdc/acorn.h
+++ b/src/devices/bus/bbc/fdc/acorn.h
@@ -28,7 +28,7 @@ class bbc_acorn8271_device :
{
public:
// construction/destruction
- bbc_acorn8271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_acorn8271_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_FLOPPY_FORMATS(floppy_formats);
@@ -59,7 +59,7 @@ class bbc_acorn1770_device :
{
public:
// construction/destruction
- bbc_acorn1770_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_acorn1770_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_FLOPPY_FORMATS(floppy_formats);
diff --git a/src/devices/bus/bbc/fdc/cumana.cpp b/src/devices/bus/bbc/fdc/cumana.cpp
index a41fdf694f0..2d615ce9fb4 100644
--- a/src/devices/bus/bbc/fdc/cumana.cpp
+++ b/src/devices/bus/bbc/fdc/cumana.cpp
@@ -98,7 +98,7 @@ const tiny_rom_entry *bbc_cumana2_device::device_rom_region() const
// bbc_cumanafdc_device - constructor
//-------------------------------------------------
-bbc_cumanafdc_device::bbc_cumanafdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+bbc_cumanafdc_device::bbc_cumanafdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_bbc_fdc_interface(mconfig, *this),
m_dfs_rom(*this, "dfs_rom"),
@@ -108,13 +108,13 @@ bbc_cumanafdc_device::bbc_cumanafdc_device(const machine_config &mconfig, device
{
}
-bbc_cumana1_device::bbc_cumana1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bbc_cumana1_device::bbc_cumana1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
bbc_cumanafdc_device(mconfig, BBC_CUMANA1, "Cumana QFS 8877A FDC", tag, owner, clock, "bbc_cumana1", __FILE__)
{
m_invert = true;
}
-bbc_cumana2_device::bbc_cumana2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bbc_cumana2_device::bbc_cumana2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
bbc_cumanafdc_device(mconfig, BBC_CUMANA2, "Cumana QFS Issue 2 8877A FDC", tag, owner, clock, "bbc_cumana2", __FILE__)
{
m_invert = false;
diff --git a/src/devices/bus/bbc/fdc/cumana.h b/src/devices/bus/bbc/fdc/cumana.h
index 9c3dab2b3c8..c721966d670 100644
--- a/src/devices/bus/bbc/fdc/cumana.h
+++ b/src/devices/bus/bbc/fdc/cumana.h
@@ -27,7 +27,7 @@ class bbc_cumanafdc_device :
{
public:
// construction/destruction
- bbc_cumanafdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ bbc_cumanafdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
DECLARE_FLOPPY_FORMATS(floppy_formats);
@@ -57,7 +57,7 @@ private:
class bbc_cumana1_device : public bbc_cumanafdc_device
{
public:
- bbc_cumana1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_cumana1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -66,7 +66,7 @@ public:
class bbc_cumana2_device : public bbc_cumanafdc_device
{
public:
- bbc_cumana2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_cumana2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/bbc/fdc/fdc.cpp b/src/devices/bus/bbc/fdc/fdc.cpp
index b7f108ef01b..7452047b148 100644
--- a/src/devices/bus/bbc/fdc/fdc.cpp
+++ b/src/devices/bus/bbc/fdc/fdc.cpp
@@ -48,7 +48,7 @@ device_bbc_fdc_interface::~device_bbc_fdc_interface()
// bbc_fdc_slot_device - constructor
//-------------------------------------------------
-bbc_fdc_slot_device::bbc_fdc_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bbc_fdc_slot_device::bbc_fdc_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, BBC_FDC_SLOT, "BBC Micro FDC slot", tag, owner, clock, "bbc_fdc_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_card(nullptr),
diff --git a/src/devices/bus/bbc/fdc/fdc.h b/src/devices/bus/bbc/fdc/fdc.h
index c161ce84624..7a6006c6a74 100644
--- a/src/devices/bus/bbc/fdc/fdc.h
+++ b/src/devices/bus/bbc/fdc/fdc.h
@@ -41,7 +41,7 @@ class bbc_fdc_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- bbc_fdc_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_fdc_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~bbc_fdc_slot_device();
// callbacks
diff --git a/src/devices/bus/bbc/fdc/opus.cpp b/src/devices/bus/bbc/fdc/opus.cpp
index c2d1b7321c3..32edee27527 100644
--- a/src/devices/bus/bbc/fdc/opus.cpp
+++ b/src/devices/bus/bbc/fdc/opus.cpp
@@ -143,7 +143,7 @@ const tiny_rom_entry *bbc_opus1770_device::device_rom_region() const
// bbc_opusfdc_device - constructor
//-------------------------------------------------
-bbc_opusfdc_device::bbc_opusfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+bbc_opusfdc_device::bbc_opusfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_bbc_fdc_interface(mconfig, *this),
m_dfs_rom(*this, "dfs_rom"),
@@ -153,17 +153,17 @@ bbc_opusfdc_device::bbc_opusfdc_device(const machine_config &mconfig, device_typ
{
}
-bbc_opus2791_device::bbc_opus2791_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+bbc_opus2791_device::bbc_opus2791_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: bbc_opusfdc_device(mconfig, BBC_OPUS2791, "Opus 2791 FDC", tag, owner, clock, "bbc_opus2791", __FILE__)
{
}
-bbc_opus2793_device::bbc_opus2793_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+bbc_opus2793_device::bbc_opus2793_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: bbc_opusfdc_device(mconfig, BBC_OPUS2793, "Opus 2793 FDC", tag, owner, clock, "bbc_opus2793", __FILE__)
{
}
-bbc_opus1770_device::bbc_opus1770_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+bbc_opus1770_device::bbc_opus1770_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: bbc_opusfdc_device(mconfig, BBC_OPUS1770, "Opus D-DOS(B) 1770 FDC", tag, owner, clock, "bbc_opus1770", __FILE__)
{
}
diff --git a/src/devices/bus/bbc/fdc/opus.h b/src/devices/bus/bbc/fdc/opus.h
index 93cedaa8954..f134a649a6c 100644
--- a/src/devices/bus/bbc/fdc/opus.h
+++ b/src/devices/bus/bbc/fdc/opus.h
@@ -27,7 +27,7 @@ class bbc_opusfdc_device:
{
public:
// construction/destruction
- bbc_opusfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ bbc_opusfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
DECLARE_FLOPPY_FORMATS(floppy_formats);
@@ -54,7 +54,7 @@ private:
class bbc_opus2791_device : public bbc_opusfdc_device
{
public:
- bbc_opus2791_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_opus2791_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -63,7 +63,7 @@ public:
class bbc_opus2793_device : public bbc_opusfdc_device
{
public:
- bbc_opus2793_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_opus2793_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -72,7 +72,7 @@ public:
class bbc_opus1770_device : public bbc_opusfdc_device
{
public:
- bbc_opus1770_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_opus1770_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/bbc/fdc/watford.cpp b/src/devices/bus/bbc/fdc/watford.cpp
index 0cbd2ee16a0..8a5a95551d7 100644
--- a/src/devices/bus/bbc/fdc/watford.cpp
+++ b/src/devices/bus/bbc/fdc/watford.cpp
@@ -113,13 +113,13 @@ const tiny_rom_entry *bbc_weddb3_device::device_rom_region() const
// bbc_watfordfdc_device - constructor
//-------------------------------------------------
-bbc_watfordfdc_device::bbc_watfordfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+bbc_watfordfdc_device::bbc_watfordfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_bbc_fdc_interface(mconfig, *this)
{
}
-bbc_weddb2_device::bbc_weddb2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+bbc_weddb2_device::bbc_weddb2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: bbc_watfordfdc_device(mconfig, BBC_WEDDB2, "Watford Electronics DDB2 1772 FDC", tag, owner, clock, "bbc_weddb2", __FILE__),
m_dfs_rom(*this, "dfs_rom"),
m_fdc(*this, "wd1772"),
@@ -128,7 +128,7 @@ bbc_weddb2_device::bbc_weddb2_device(const machine_config &mconfig, const char *
{
}
-bbc_weddb3_device::bbc_weddb3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+bbc_weddb3_device::bbc_weddb3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: bbc_watfordfdc_device(mconfig, BBC_WEDDB3, "Watford Electronics DDB3 1770 FDC", tag, owner, clock, "bbc_weddb3", __FILE__),
m_dfs_rom(*this, "dfs_rom"),
m_fdc(*this, "wd1770"),
diff --git a/src/devices/bus/bbc/fdc/watford.h b/src/devices/bus/bbc/fdc/watford.h
index 9b5dd1e947b..aea965dca6d 100644
--- a/src/devices/bus/bbc/fdc/watford.h
+++ b/src/devices/bus/bbc/fdc/watford.h
@@ -27,7 +27,7 @@ class bbc_watfordfdc_device :
{
public:
// construction/destruction
- bbc_watfordfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ bbc_watfordfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
DECLARE_FLOPPY_FORMATS(floppy_formats);
@@ -38,7 +38,7 @@ public:
class bbc_weddb2_device : public bbc_watfordfdc_device
{
public:
- bbc_weddb2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_weddb2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -63,7 +63,7 @@ private:
class bbc_weddb3_device : public bbc_watfordfdc_device
{
public:
- bbc_weddb3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_weddb3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/bbc/joyport/joyport.cpp b/src/devices/bus/bbc/joyport/joyport.cpp
index 4d1dcbb017f..4c6f1aefe2f 100644
--- a/src/devices/bus/bbc/joyport/joyport.cpp
+++ b/src/devices/bus/bbc/joyport/joyport.cpp
@@ -48,7 +48,7 @@ device_bbc_joyport_interface::~device_bbc_joyport_interface()
// bbcmc_joyport_slot_device - constructor
//-------------------------------------------------
-bbc_joyport_slot_device::bbc_joyport_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bbc_joyport_slot_device::bbc_joyport_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, BBC_JOYPORT_SLOT, "BBC Master Compact Joystick/Mouse port", tag, owner, clock, "bbc_joyport_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_device(nullptr)
@@ -65,7 +65,7 @@ void bbc_joyport_slot_device::device_start()
m_device = dynamic_cast<device_bbc_joyport_interface *>(get_card_device());
}
-UINT8 bbc_joyport_slot_device::cb_r()
+uint8_t bbc_joyport_slot_device::cb_r()
{
if (m_device)
return m_device->cb_r();
@@ -73,7 +73,7 @@ UINT8 bbc_joyport_slot_device::cb_r()
return 0xff;
}
-UINT8 bbc_joyport_slot_device::pb_r()
+uint8_t bbc_joyport_slot_device::pb_r()
{
if (m_device)
return m_device->pb_r();
diff --git a/src/devices/bus/bbc/joyport/joyport.h b/src/devices/bus/bbc/joyport/joyport.h
index 10251235993..cd37d4b7937 100644
--- a/src/devices/bus/bbc/joyport/joyport.h
+++ b/src/devices/bus/bbc/joyport/joyport.h
@@ -54,11 +54,11 @@ class bbc_joyport_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- bbc_joyport_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_joyport_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~bbc_joyport_slot_device() {}
- UINT8 cb_r();
- UINT8 pb_r();
+ uint8_t cb_r();
+ uint8_t pb_r();
protected:
// device-level overrides
@@ -78,8 +78,8 @@ public:
device_bbc_joyport_interface(const machine_config &mconfig, device_t &device);
virtual ~device_bbc_joyport_interface();
- virtual UINT8 cb_r() { return 0xff; }
- virtual UINT8 pb_r() { return 0x1f; }
+ virtual uint8_t cb_r() { return 0xff; }
+ virtual uint8_t pb_r() { return 0x1f; }
protected:
bbc_joyport_slot_device *m_slot;
diff --git a/src/devices/bus/bbc/joyport/joystick.cpp b/src/devices/bus/bbc/joyport/joystick.cpp
index 70f1820049a..74eb3a67d29 100644
--- a/src/devices/bus/bbc/joyport/joystick.cpp
+++ b/src/devices/bus/bbc/joyport/joystick.cpp
@@ -43,7 +43,7 @@ ioport_constructor bbcmc_joystick_device::device_input_ports() const
// bbcmc_joystick_device - constructor
//-------------------------------------------------
-bbcmc_joystick_device::bbcmc_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+bbcmc_joystick_device::bbcmc_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, BBCMC_JOYSTICK, "Master Compact Joystick", tag, owner, clock, "bbcmc_joystick", __FILE__),
device_bbc_joyport_interface(mconfig, *this),
m_joy(*this, "JOY")
@@ -73,12 +73,12 @@ void bbcmc_joystick_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-UINT8 bbcmc_joystick_device::cb_r()
+uint8_t bbcmc_joystick_device::cb_r()
{
return 0xff;
}
-UINT8 bbcmc_joystick_device::pb_r()
+uint8_t bbcmc_joystick_device::pb_r()
{
return m_joy->read();
}
diff --git a/src/devices/bus/bbc/joyport/joystick.h b/src/devices/bus/bbc/joyport/joystick.h
index c94ce632e75..d5b1a163301 100644
--- a/src/devices/bus/bbc/joyport/joystick.h
+++ b/src/devices/bus/bbc/joyport/joystick.h
@@ -27,7 +27,7 @@ class bbcmc_joystick_device :
{
public:
// construction/destruction
- bbcmc_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbcmc_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,8 +37,8 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 cb_r() override;
- virtual UINT8 pb_r() override;
+ virtual uint8_t cb_r() override;
+ virtual uint8_t pb_r() override;
private:
required_ioport m_joy;
diff --git a/src/devices/bus/bbc/tube/tube.cpp b/src/devices/bus/bbc/tube/tube.cpp
index 8ce07531fcc..c67b8dd96e9 100644
--- a/src/devices/bus/bbc/tube/tube.cpp
+++ b/src/devices/bus/bbc/tube/tube.cpp
@@ -51,7 +51,7 @@ device_bbc_tube_interface::~device_bbc_tube_interface()
// bbc_tube_slot_device - constructor
//-------------------------------------------------
-bbc_tube_slot_device::bbc_tube_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bbc_tube_slot_device::bbc_tube_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, BBC_TUBE_SLOT, "BBC Micro Tube port", tag, owner, clock, "bbc_tube_slot", __FILE__),
device_slot_interface(mconfig, *this)
{
diff --git a/src/devices/bus/bbc/tube/tube.h b/src/devices/bus/bbc/tube/tube.h
index 16314bee603..707bfba5fab 100644
--- a/src/devices/bus/bbc/tube/tube.h
+++ b/src/devices/bus/bbc/tube/tube.h
@@ -72,7 +72,7 @@ class bbc_tube_slot_device : public device_t,
{
public:
// construction/destruction
- bbc_tube_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_tube_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~bbc_tube_slot_device() {}
diff --git a/src/devices/bus/bbc/userport/userport.cpp b/src/devices/bus/bbc/userport/userport.cpp
index e044e0177d4..5a08fc836ed 100644
--- a/src/devices/bus/bbc/userport/userport.cpp
+++ b/src/devices/bus/bbc/userport/userport.cpp
@@ -50,7 +50,7 @@ device_bbc_userport_interface::~device_bbc_userport_interface()
// bbc_userport_slot_device - constructor
//-------------------------------------------------
-bbc_userport_device::bbc_userport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bbc_userport_device::bbc_userport_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, BBC_USERPORT_SLOT, "BBC Micro User port", tag, owner, clock, "bbc_userport_slot", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr)
{
@@ -76,9 +76,9 @@ void bbc_userport_device::device_start()
}
-UINT8 bbc_userport_device::read_portb()
+uint8_t bbc_userport_device::read_portb()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_device)
data |= m_device->read_portb();
return data;
diff --git a/src/devices/bus/bbc/userport/userport.h b/src/devices/bus/bbc/userport/userport.h
index 0a9de358dda..89593d125f9 100644
--- a/src/devices/bus/bbc/userport/userport.h
+++ b/src/devices/bus/bbc/userport/userport.h
@@ -47,9 +47,9 @@ public:
device_bbc_userport_interface(const machine_config &mconfig, device_t &device);
virtual ~device_bbc_userport_interface();
- virtual UINT8 read_portb() { return 0xff; };
- virtual UINT8 read_cb1() { return 0xff; };
- virtual UINT8 read_cb2() { return 0xff; };
+ virtual uint8_t read_portb() { return 0xff; };
+ virtual uint8_t read_cb1() { return 0xff; };
+ virtual uint8_t read_cb2() { return 0xff; };
protected:
bbc_userport_device *m_slot;
@@ -62,12 +62,12 @@ class bbc_userport_device : public device_t,
{
public:
// construction/destruction
- bbc_userport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bbc_userport_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~bbc_userport_device() {}
- UINT8 read_portb();
- UINT8 read_cb1();
- UINT8 read_cb2();
+ uint8_t read_portb();
+ uint8_t read_cb1();
+ uint8_t read_cb2();
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/bml3/bml3bus.cpp b/src/devices/bus/bml3/bml3bus.cpp
index 620743dbe68..200d1fc63b5 100644
--- a/src/devices/bus/bml3/bml3bus.cpp
+++ b/src/devices/bus/bml3/bml3bus.cpp
@@ -59,13 +59,13 @@ const device_type BML3BUS_SLOT = &device_creator<bml3bus_slot_device>;
//-------------------------------------------------
// bml3bus_slot_device - constructor
//-------------------------------------------------
-bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, BML3BUS_SLOT, "Hitachi MB-6890 Slot", tag, owner, clock, "bml3bus_slot", __FILE__),
device_slot_interface(mconfig, *this), m_bml3bus_tag(nullptr), m_bml3bus_slottag(nullptr)
{
}
-bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+bml3bus_slot_device::bml3bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this), m_bml3bus_tag(nullptr), m_bml3bus_slottag(nullptr)
{
@@ -109,7 +109,7 @@ void bml3bus_device::static_set_cputag(device_t &device, const char *tag)
// bml3bus_device - constructor
//-------------------------------------------------
-bml3bus_device::bml3bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bml3bus_device::bml3bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, BML3BUS, "Hitachi MB-6890 Bus", tag, owner, clock, "bml3bus", __FILE__), m_maincpu(nullptr),
m_out_nmi_cb(*this),
m_out_irq_cb(*this),
@@ -117,7 +117,7 @@ bml3bus_device::bml3bus_device(const machine_config &mconfig, const char *tag, d
{
}
-bml3bus_device::bml3bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+bml3bus_device::bml3bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr),
m_out_nmi_cb(*this),
m_out_irq_cb(*this),
diff --git a/src/devices/bus/bml3/bml3bus.h b/src/devices/bus/bml3/bml3bus.h
index 36c20f4159e..c244b329539 100644
--- a/src/devices/bus/bml3/bml3bus.h
+++ b/src/devices/bus/bml3/bml3bus.h
@@ -56,8 +56,8 @@ class bml3bus_slot_device : public device_t,
{
public:
// construction/destruction
- bml3bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- bml3bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ bml3bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bml3bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -79,8 +79,8 @@ class bml3bus_device : public device_t
{
public:
// construction/destruction
- bml3bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- bml3bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ bml3bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bml3bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
diff --git a/src/devices/bus/bml3/bml3kanji.cpp b/src/devices/bus/bml3/bml3kanji.cpp
index c2af2911e65..b426dc664da 100644
--- a/src/devices/bus/bml3/bml3kanji.cpp
+++ b/src/devices/bus/bml3/bml3kanji.cpp
@@ -58,7 +58,7 @@ const tiny_rom_entry *bml3bus_kanji_device::device_rom_region() const
READ8_MEMBER( bml3bus_kanji_device::bml3_kanji_r )
{
- return m_rom[((UINT32)m_kanji_addr << 1) + offset];
+ return m_rom[((uint32_t)m_kanji_addr << 1) + offset];
}
WRITE8_MEMBER( bml3bus_kanji_device::bml3_kanji_w )
@@ -72,7 +72,7 @@ WRITE8_MEMBER( bml3bus_kanji_device::bml3_kanji_w )
// LIVE DEVICE
//**************************************************************************
-bml3bus_kanji_device::bml3bus_kanji_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bml3bus_kanji_device::bml3bus_kanji_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, BML3BUS_KANJI, "Hitachi MP-9740 Kanji Character ROM Card", tag, owner, clock, "bml3kanji", __FILE__),
device_bml3bus_card_interface(mconfig, *this), m_kanji_addr(0), m_rom(nullptr)
{
diff --git a/src/devices/bus/bml3/bml3kanji.h b/src/devices/bus/bml3/bml3kanji.h
index c91ba3cca2e..cf04c6a8fc2 100644
--- a/src/devices/bus/bml3/bml3kanji.h
+++ b/src/devices/bus/bml3/bml3kanji.h
@@ -24,7 +24,7 @@ class bml3bus_kanji_device:
{
public:
// construction/destruction
- bml3bus_kanji_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bml3bus_kanji_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -37,10 +37,10 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- UINT16 m_kanji_addr;
+ uint16_t m_kanji_addr;
private:
- UINT8 *m_rom;
+ uint8_t *m_rom;
};
// device type definition
diff --git a/src/devices/bus/bml3/bml3mp1802.cpp b/src/devices/bus/bml3/bml3mp1802.cpp
index d8d22c1467b..595d3b97a9f 100644
--- a/src/devices/bus/bml3/bml3mp1802.cpp
+++ b/src/devices/bus/bml3/bml3mp1802.cpp
@@ -106,7 +106,7 @@ WRITE8_MEMBER( bml3bus_mp1802_device::bml3_mp1802_w)
// LIVE DEVICE
//**************************************************************************
-bml3bus_mp1802_device::bml3bus_mp1802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bml3bus_mp1802_device::bml3bus_mp1802_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, BML3BUS_MP1802, "Hitachi MP-1802 Floppy Controller Card", tag, owner, clock, "bml3mp1802", __FILE__),
device_bml3bus_card_interface(mconfig, *this),
m_fdc(*this, "fdc"),
@@ -134,7 +134,7 @@ void bml3bus_mp1802_device::device_start()
space_prg.install_readwrite_handler(0xff00, 0xff03, read8_delegate(FUNC(mb8866_t::read),(mb8866_t*)m_fdc), write8_delegate(FUNC(mb8866_t::write),(mb8866_t*)m_fdc));
space_prg.install_readwrite_handler(0xff04, 0xff04, read8_delegate(FUNC(bml3bus_mp1802_device::bml3_mp1802_r), this), write8_delegate(FUNC(bml3bus_mp1802_device::bml3_mp1802_w), this));
// overwriting the main ROM (rather than using e.g. install_rom) should mean that bank switches for RAM expansion still work...
- UINT8 *mainrom = device().machine().root_device().memregion("maincpu")->base();
+ 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 60191295d36..2047e3146d2 100644
--- a/src/devices/bus/bml3/bml3mp1802.h
+++ b/src/devices/bus/bml3/bml3mp1802.h
@@ -28,7 +28,7 @@ class bml3bus_mp1802_device:
{
public:
// construction/destruction
- bml3bus_mp1802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bml3bus_mp1802_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -49,7 +49,7 @@ private:
required_device<floppy_connector> m_floppy2;
required_device<floppy_connector> m_floppy3;
- UINT8 *m_rom;
+ uint8_t *m_rom;
};
// device type definition
diff --git a/src/devices/bus/bml3/bml3mp1805.cpp b/src/devices/bus/bml3/bml3mp1805.cpp
index 23027eeffd0..b4358c60fe7 100644
--- a/src/devices/bus/bml3/bml3mp1805.cpp
+++ b/src/devices/bus/bml3/bml3mp1805.cpp
@@ -137,7 +137,7 @@ WRITE8_MEMBER( bml3bus_mp1805_device::bml3_mp1805_w)
// LIVE DEVICE
//**************************************************************************
-bml3bus_mp1805_device::bml3bus_mp1805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bml3bus_mp1805_device::bml3bus_mp1805_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, BML3BUS_MP1805, "Hitachi MP-1805 Floppy Controller Card", tag, owner, clock, "bml3mp1805", __FILE__),
device_bml3bus_card_interface(mconfig, *this),
m_mc6843(*this, "mc6843"), m_rom(nullptr)
@@ -161,7 +161,7 @@ void bml3bus_mp1805_device::device_start()
space_prg.install_readwrite_handler(0xff18, 0xff1f, read8_delegate( FUNC(mc6843_device::read), (mc6843_device*)m_mc6843), write8_delegate(FUNC(mc6843_device::write), (mc6843_device*)m_mc6843) );
space_prg.install_readwrite_handler(0xff20, 0xff20, read8_delegate( FUNC(bml3bus_mp1805_device::bml3_mp1805_r), this), write8_delegate(FUNC(bml3bus_mp1805_device::bml3_mp1805_w), this) );
// overwriting the main ROM (rather than using e.g. install_rom) should mean that bank switches for RAM expansion still work...
- UINT8 *mainrom = device().machine().root_device().memregion("maincpu")->base();
+ 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 662eecfff6a..98b22f0c790 100644
--- a/src/devices/bus/bml3/bml3mp1805.h
+++ b/src/devices/bus/bml3/bml3mp1805.h
@@ -27,7 +27,7 @@ class bml3bus_mp1805_device:
{
public:
// construction/destruction
- bml3bus_mp1805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bml3bus_mp1805_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -45,7 +45,7 @@ protected:
required_device<mc6843_device> m_mc6843;
private:
- UINT8 *m_rom;
+ uint8_t *m_rom;
};
// device type definition
diff --git a/src/devices/bus/bw2/exp.cpp b/src/devices/bus/bw2/exp.cpp
index c79e85fa90a..9ece8a6f071 100644
--- a/src/devices/bus/bw2/exp.cpp
+++ b/src/devices/bus/bw2/exp.cpp
@@ -51,7 +51,7 @@ device_bw2_expansion_slot_interface::~device_bw2_expansion_slot_interface()
// bw2_expansion_slot_device - constructor
//-------------------------------------------------
-bw2_expansion_slot_device::bw2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+bw2_expansion_slot_device::bw2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, BW2_EXPANSION_SLOT, "Bondwell 2 expansion port", tag, owner, clock, "bw2_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this), m_cart(nullptr)
{
@@ -94,7 +94,7 @@ void bw2_expansion_slot_device::device_reset()
// cd_r - cartridge data read
//-------------------------------------------------
-UINT8 bw2_expansion_slot_device::cd_r(address_space &space, offs_t offset, UINT8 data, int ram2, int ram3, int ram4, int ram5, int ram6)
+uint8_t bw2_expansion_slot_device::cd_r(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6)
{
if (m_cart != nullptr)
{
@@ -109,7 +109,7 @@ UINT8 bw2_expansion_slot_device::cd_r(address_space &space, offs_t offset, UINT8
// cd_w - cartridge data write
//-------------------------------------------------
-void bw2_expansion_slot_device::cd_w(address_space &space, offs_t offset, UINT8 data, int ram2, int ram3, int ram4, int ram5, int ram6)
+void bw2_expansion_slot_device::cd_w(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6)
{
if (m_cart != nullptr)
{
@@ -124,7 +124,7 @@ void bw2_expansion_slot_device::cd_w(address_space &space, offs_t offset, UINT8
READ8_MEMBER( bw2_expansion_slot_device::slot_r )
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_cart != nullptr)
{
@@ -154,7 +154,7 @@ WRITE8_MEMBER( bw2_expansion_slot_device::slot_w )
READ8_MEMBER( bw2_expansion_slot_device::modsel_r )
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_cart != nullptr)
{
diff --git a/src/devices/bus/bw2/exp.h b/src/devices/bus/bw2/exp.h
index b9d4fbcc0d8..c91c828c6d2 100644
--- a/src/devices/bus/bw2/exp.h
+++ b/src/devices/bus/bw2/exp.h
@@ -74,12 +74,12 @@ class bw2_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- bw2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bw2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~bw2_expansion_slot_device();
// computer interface
- UINT8 cd_r(address_space &space, offs_t offset, UINT8 data, int ram2, int ram3, int ram4, int ram5, int ram6);
- void cd_w(address_space &space, offs_t offset, UINT8 data, int ram2, int ram3, int ram4, int ram5, int ram6);
+ uint8_t cd_r(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6);
+ void cd_w(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6);
DECLARE_READ8_MEMBER( slot_r );
DECLARE_WRITE8_MEMBER( slot_w );
@@ -106,14 +106,14 @@ public:
device_bw2_expansion_slot_interface(const machine_config &mconfig, device_t &device);
virtual ~device_bw2_expansion_slot_interface();
- virtual UINT8 bw2_cd_r(address_space &space, offs_t offset, UINT8 data, int ram2, int ram3, int ram4, int ram5, int ram6) { return data; };
- virtual void bw2_cd_w(address_space &space, offs_t offset, UINT8 data, int ram2, int ram3, int ram4, int ram5, int ram6) { };
+ virtual uint8_t bw2_cd_r(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) { return data; };
+ virtual void bw2_cd_w(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) { };
- virtual UINT8 bw2_slot_r(address_space &space, offs_t offset) { return 0xff; }
- virtual void bw2_slot_w(address_space &space, offs_t offset, UINT8 data) { }
+ virtual uint8_t bw2_slot_r(address_space &space, offs_t offset) { return 0xff; }
+ virtual void bw2_slot_w(address_space &space, offs_t offset, uint8_t data) { }
- virtual UINT8 bw2_modsel_r(address_space &space, offs_t offset) { return 0xff; }
- virtual void bw2_modsel_w(address_space &space, offs_t offset, UINT8 data) { }
+ virtual uint8_t bw2_modsel_r(address_space &space, offs_t offset) { return 0xff; }
+ virtual void bw2_modsel_w(address_space &space, offs_t offset, uint8_t data) { }
protected:
bw2_expansion_slot_device *m_slot;
diff --git a/src/devices/bus/bw2/ramcard.cpp b/src/devices/bus/bw2/ramcard.cpp
index bd8e6e76261..17ed1397a4b 100644
--- a/src/devices/bus/bw2/ramcard.cpp
+++ b/src/devices/bus/bw2/ramcard.cpp
@@ -46,7 +46,7 @@ const tiny_rom_entry *bw2_ramcard_device::device_rom_region() const
// bw2_ramcard_device - constructor
//-------------------------------------------------
-bw2_ramcard_device::bw2_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+bw2_ramcard_device::bw2_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, BW2_RAMCARD, "RAMCARD", tag, owner, clock, "bw2_ramcard", __FILE__),
device_bw2_expansion_slot_interface(mconfig, *this),
m_rom(*this, "ramcard"),
@@ -87,7 +87,7 @@ void bw2_ramcard_device::device_reset()
// bw2_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 bw2_ramcard_device::bw2_cd_r(address_space &space, offs_t offset, UINT8 data, int ram2, int ram3, int ram4, int ram5, int ram6)
+uint8_t bw2_ramcard_device::bw2_cd_r(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6)
{
if (!ram2)
{
@@ -106,7 +106,7 @@ UINT8 bw2_ramcard_device::bw2_cd_r(address_space &space, offs_t offset, UINT8 da
// bw2_cd_r - cartridge data write
//-------------------------------------------------
-void bw2_ramcard_device::bw2_cd_w(address_space &space, offs_t offset, UINT8 data, int ram2, int ram3, int ram4, int ram5, int ram6)
+void bw2_ramcard_device::bw2_cd_w(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6)
{
if (m_en && !ram5)
{
@@ -119,7 +119,7 @@ void bw2_ramcard_device::bw2_cd_w(address_space &space, offs_t offset, UINT8 dat
// bw2_slot_w - slot write
//-------------------------------------------------
-void bw2_ramcard_device::bw2_slot_w(address_space &space, offs_t offset, UINT8 data)
+void bw2_ramcard_device::bw2_slot_w(address_space &space, offs_t offset, uint8_t data)
{
m_en = 1;
m_bank = data & 0x0f;
diff --git a/src/devices/bus/bw2/ramcard.h b/src/devices/bus/bw2/ramcard.h
index de510eddb96..2e9707a69c6 100644
--- a/src/devices/bus/bw2/ramcard.h
+++ b/src/devices/bus/bw2/ramcard.h
@@ -27,7 +27,7 @@ class bw2_ramcard_device : public device_t,
{
public:
// construction/destruction
- bw2_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ bw2_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -38,16 +38,16 @@ protected:
virtual void device_reset() override;
// device_bw2_expansion_slot_interface overrides
- virtual UINT8 bw2_cd_r(address_space &space, offs_t offset, UINT8 data, int ram2, int ram3, int ram4, int ram5, int ram6) override;
- virtual void bw2_cd_w(address_space &space, offs_t offset, UINT8 data, int ram2, int ram3, int ram4, int ram5, int ram6) override;
- virtual void bw2_slot_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t bw2_cd_r(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) override;
+ virtual void bw2_cd_w(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) override;
+ virtual void bw2_slot_w(address_space &space, offs_t offset, uint8_t data) override;
private:
required_memory_region m_rom;
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
int m_en;
- UINT8 m_bank;
+ uint8_t m_bank;
};
diff --git a/src/devices/bus/c64/16kb.cpp b/src/devices/bus/c64/16kb.cpp
index 2964073aa1a..b261b6bd2af 100644
--- a/src/devices/bus/c64/16kb.cpp
+++ b/src/devices/bus/c64/16kb.cpp
@@ -73,7 +73,7 @@ ioport_constructor c64_16kb_cartridge_device::device_input_ports() const
// c64_16kb_cartridge_device - constructor
//-------------------------------------------------
-c64_16kb_cartridge_device::c64_16kb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_16kb_cartridge_device::c64_16kb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_16KB, "C64 16KB EPROM cartridge", tag, owner, clock, "c64_16kb", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_sw1(*this, "SW1"),
@@ -98,7 +98,7 @@ void c64_16kb_cartridge_device::device_start()
void c64_16kb_cartridge_device::device_reset()
{
- UINT8 mode = m_sw1->read();
+ uint8_t mode = m_sw1->read();
m_exrom = BIT(mode, 0);
m_game = BIT(mode, 1);
@@ -109,7 +109,7 @@ void c64_16kb_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_16kb_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_16kb_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
diff --git a/src/devices/bus/c64/16kb.h b/src/devices/bus/c64/16kb.h
index fd4b7a50fcb..3b3a72db8d8 100644
--- a/src/devices/bus/c64/16kb.h
+++ b/src/devices/bus/c64/16kb.h
@@ -30,7 +30,7 @@ class c64_16kb_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_16kb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_16kb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -42,7 +42,7 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
required_ioport m_sw1;
diff --git a/src/devices/bus/c64/4dxh.cpp b/src/devices/bus/c64/4dxh.cpp
index 2dd54543203..af86120b97f 100644
--- a/src/devices/bus/c64/4dxh.cpp
+++ b/src/devices/bus/c64/4dxh.cpp
@@ -61,7 +61,7 @@ ioport_constructor c64_4dxh_device::device_input_ports() const
// c64_4dxh_device - constructor
//-------------------------------------------------
-c64_4dxh_device::c64_4dxh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_4dxh_device::c64_4dxh_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_4DXH, "C64 DXH 4-Player Adapter", tag, owner, clock, "c64_4dxh", __FILE__),
device_pet_user_port_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/4dxh.h b/src/devices/bus/c64/4dxh.h
index a8a0a684fe5..25558b6ac3c 100644
--- a/src/devices/bus/c64/4dxh.h
+++ b/src/devices/bus/c64/4dxh.h
@@ -28,7 +28,7 @@ class c64_4dxh_device : public device_t,
{
public:
// construction/destruction
- c64_4dxh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_4dxh_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/c64/4ksa.cpp b/src/devices/bus/c64/4ksa.cpp
index 749053fde32..78c98279fd0 100644
--- a/src/devices/bus/c64/4ksa.cpp
+++ b/src/devices/bus/c64/4ksa.cpp
@@ -61,7 +61,7 @@ ioport_constructor c64_4ksa_device::device_input_ports() const
// c64_4ksa_device - constructor
//-------------------------------------------------
-c64_4ksa_device::c64_4ksa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_4ksa_device::c64_4ksa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_4KSA, "C64 Kingsoft 4-Player Adapter", tag, owner, clock, "c64_4ksa", __FILE__),
device_pet_user_port_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/4ksa.h b/src/devices/bus/c64/4ksa.h
index bbb61e0bf73..96ce1c1e704 100644
--- a/src/devices/bus/c64/4ksa.h
+++ b/src/devices/bus/c64/4ksa.h
@@ -28,7 +28,7 @@ class c64_4ksa_device : public device_t,
{
public:
// construction/destruction
- c64_4ksa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_4ksa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/c64/4tba.cpp b/src/devices/bus/c64/4tba.cpp
index 56266f5d916..b68672871d3 100644
--- a/src/devices/bus/c64/4tba.cpp
+++ b/src/devices/bus/c64/4tba.cpp
@@ -61,7 +61,7 @@ ioport_constructor c64_4tba_device::device_input_ports() const
// c64_4tba_device - constructor
//-------------------------------------------------
-c64_4tba_device::c64_4tba_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_4tba_device::c64_4tba_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_4TBA, "C64 Tie Break Adapter", tag, owner, clock, "c64_4tba", __FILE__),
device_pet_user_port_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/4tba.h b/src/devices/bus/c64/4tba.h
index c7505d0d49a..ec28657c06e 100644
--- a/src/devices/bus/c64/4tba.h
+++ b/src/devices/bus/c64/4tba.h
@@ -28,7 +28,7 @@ class c64_4tba_device : public device_t,
{
public:
// construction/destruction
- c64_4tba_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_4tba_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/c64/bn1541.cpp b/src/devices/bus/c64/bn1541.cpp
index fb24b459d1b..7b88d78f4f1 100644
--- a/src/devices/bus/c64/bn1541.cpp
+++ b/src/devices/bus/c64/bn1541.cpp
@@ -60,7 +60,7 @@ device_c64_floppy_parallel_interface::~device_c64_floppy_parallel_interface()
// c64_bn1541_device - constructor
//-------------------------------------------------
-c64_bn1541_device::c64_bn1541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_bn1541_device::c64_bn1541_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_BN1541, "C64 Burst Nibbler 1541/1571 Parallel Cable", tag, owner, clock, "c64_bn1541", __FILE__),
device_pet_user_port_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this), m_parallel_output(0)
@@ -95,7 +95,7 @@ void c64_bn1541_device::device_start()
// parallel_data_w -
//-------------------------------------------------
-void c64_bn1541_device::parallel_data_w(UINT8 data)
+void c64_bn1541_device::parallel_data_w(uint8_t data)
{
if (LOG) logerror("1541 parallel data %02x\n", data);
diff --git a/src/devices/bus/c64/bn1541.h b/src/devices/bus/c64/bn1541.h
index a3f0a1834b6..7578145fc67 100644
--- a/src/devices/bus/c64/bn1541.h
+++ b/src/devices/bus/c64/bn1541.h
@@ -30,13 +30,13 @@ public:
device_c64_floppy_parallel_interface(const machine_config &mconfig, device_t &device);
virtual ~device_c64_floppy_parallel_interface();
- virtual void parallel_data_w(UINT8 data) = 0;
+ virtual void parallel_data_w(uint8_t data) = 0;
virtual void parallel_strobe_w(int state) = 0;
device_c64_floppy_parallel_interface *m_other;
protected:
- UINT8 m_parallel_data;
+ uint8_t m_parallel_data;
};
@@ -48,14 +48,14 @@ class c64_bn1541_device : public device_t,
{
public:
// construction/destruction
- c64_bn1541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_bn1541_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_c64_floppy_parallel_interface overrides
- virtual void parallel_data_w(UINT8 data) override;
+ virtual void parallel_data_w(uint8_t data) override;
virtual void parallel_strobe_w(int state) override;
// device_pet_user_port_interface overrides
@@ -71,7 +71,7 @@ protected:
private:
void update_output();
- UINT8 m_parallel_output;
+ uint8_t m_parallel_output;
};
diff --git a/src/devices/bus/c64/c128_comal80.cpp b/src/devices/bus/c64/c128_comal80.cpp
index 25accd52fa0..b092a996cbb 100644
--- a/src/devices/bus/c64/c128_comal80.cpp
+++ b/src/devices/bus/c64/c128_comal80.cpp
@@ -26,7 +26,7 @@ const device_type C128_COMAL80 = &device_creator<c128_comal80_cartridge_device>;
// c128_comal80_cartridge_device - constructor
//-------------------------------------------------
-c128_comal80_cartridge_device::c128_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c128_comal80_cartridge_device::c128_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C128_COMAL80, "C128 COMAL 80 cartridge", tag, owner, clock, "c128_comal80", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
@@ -59,7 +59,7 @@ void c128_comal80_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c128_comal80_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c128_comal80_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!romh)
{
@@ -79,7 +79,7 @@ UINT8 c128_comal80_cartridge_device::c64_cd_r(address_space &space, offs_t offse
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c128_comal80_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c128_comal80_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/c128_comal80.h b/src/devices/bus/c64/c128_comal80.h
index e403cd8b10f..42709121173 100644
--- a/src/devices/bus/c64/c128_comal80.h
+++ b/src/devices/bus/c64/c128_comal80.h
@@ -28,7 +28,7 @@ class c128_comal80_cartridge_device : public device_t,
{
public:
// construction/destruction
- c128_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c128_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,11 +36,11 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
};
diff --git a/src/devices/bus/c64/c128_partner.cpp b/src/devices/bus/c64/c128_partner.cpp
index fe751585099..3002a6e6edd 100644
--- a/src/devices/bus/c64/c128_partner.cpp
+++ b/src/devices/bus/c64/c128_partner.cpp
@@ -76,7 +76,7 @@ ioport_constructor partner128_t::device_input_ports() const
// partner128_t - constructor
//-------------------------------------------------
-partner128_t::partner128_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+partner128_t::partner128_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C128_PARTNER, "PARTNER 128", tag, owner, clock, "c128_partner", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
//device_vcs_control_port_interface(mconfig, *this),
@@ -147,7 +147,7 @@ void partner128_t::device_timer(emu_timer &timer, device_timer_id id, int param,
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 partner128_t::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t partner128_t::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -185,7 +185,7 @@ UINT8 partner128_t::c64_cd_r(address_space &space, offs_t offset, UINT8 data, in
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void partner128_t::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void partner128_t::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
@@ -235,7 +235,7 @@ void partner128_t::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int
// vcs_joy_w - joystick write
//-------------------------------------------------
-void partner128_t::vcs_joy_w(UINT8 data)
+void partner128_t::vcs_joy_w(uint8_t data)
{
int joyb2 = BIT(data, 2);
diff --git a/src/devices/bus/c64/c128_partner.h b/src/devices/bus/c64/c128_partner.h
index 1ba872ca121..cc70bc459fa 100644
--- a/src/devices/bus/c64/c128_partner.h
+++ b/src/devices/bus/c64/c128_partner.h
@@ -29,7 +29,7 @@ class partner128_t : public device_t,
{
public:
// construction/destruction
- partner128_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ partner128_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -43,14 +43,14 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
// device_vcs_control_port_interface overrides
- virtual void vcs_joy_w(UINT8 data);
+ virtual void vcs_joy_w(uint8_t data);
private:
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
emu_timer *t_joyb2;
int m_ram_a12_a7;
diff --git a/src/devices/bus/c64/comal80.cpp b/src/devices/bus/c64/comal80.cpp
index b72c9182b7c..cab19fe118f 100644
--- a/src/devices/bus/c64/comal80.cpp
+++ b/src/devices/bus/c64/comal80.cpp
@@ -26,7 +26,7 @@ const device_type C64_COMAL80 = &device_creator<c64_comal80_cartridge_device>;
// c64_comal80_cartridge_device - constructor
//-------------------------------------------------
-c64_comal80_cartridge_device::c64_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_comal80_cartridge_device::c64_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_COMAL80, "C64 COMAL 80 cartridge", tag, owner, clock, "c64_comal80", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
@@ -59,7 +59,7 @@ void c64_comal80_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_comal80_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_comal80_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml || !romh)
{
@@ -75,7 +75,7 @@ UINT8 c64_comal80_cartridge_device::c64_cd_r(address_space &space, offs_t offset
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_comal80_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_comal80_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/comal80.h b/src/devices/bus/c64/comal80.h
index b77adf1a8bd..3c38c774e1d 100644
--- a/src/devices/bus/c64/comal80.h
+++ b/src/devices/bus/c64/comal80.h
@@ -28,7 +28,7 @@ class c64_comal80_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,11 +36,11 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
};
diff --git a/src/devices/bus/c64/cpm.cpp b/src/devices/bus/c64/cpm.cpp
index 33659b4e977..926eda0a15e 100644
--- a/src/devices/bus/c64/cpm.cpp
+++ b/src/devices/bus/c64/cpm.cpp
@@ -129,7 +129,7 @@ inline void c64_cpm_cartridge_device::update_signals()
// c64_cpm_cartridge_device - constructor
//-------------------------------------------------
-c64_cpm_cartridge_device::c64_cpm_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_cpm_cartridge_device::c64_cpm_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_CPM, "C64 CP/M cartridge", tag, owner, clock, "c64_cpm", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
@@ -168,7 +168,7 @@ void c64_cpm_cartridge_device::device_reset()
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_cpm_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_cpm_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
@@ -202,7 +202,7 @@ int c64_cpm_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, int r
READ8_MEMBER( c64_cpm_cartridge_device::dma_r )
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_enabled)
{
diff --git a/src/devices/bus/c64/cpm.h b/src/devices/bus/c64/cpm.h
index 1e10bc810ce..95ba8e9ea57 100644
--- a/src/devices/bus/c64/cpm.h
+++ b/src/devices/bus/c64/cpm.h
@@ -28,7 +28,7 @@ class c64_cpm_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_cpm_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_cpm_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -43,7 +43,7 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override;
private:
diff --git a/src/devices/bus/c64/currah_speech.cpp b/src/devices/bus/c64/currah_speech.cpp
index 1285730416c..ffee35fc9c0 100644
--- a/src/devices/bus/c64/currah_speech.cpp
+++ b/src/devices/bus/c64/currah_speech.cpp
@@ -154,7 +154,7 @@ void c64_currah_speech_cartridge_device::set_osc1(int voice, int intonation)
// c64_currah_speech_cartridge_device - constructor
//-------------------------------------------------
-c64_currah_speech_cartridge_device::c64_currah_speech_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_currah_speech_cartridge_device::c64_currah_speech_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_CURRAH_SPEECH, "C64 Currah Speech", tag, owner, clock, "c64_cs", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_nsp(*this, SP0256_TAG)
@@ -186,7 +186,7 @@ void c64_currah_speech_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_currah_speech_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_currah_speech_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!romh)
{
@@ -226,7 +226,7 @@ UINT8 c64_currah_speech_cartridge_device::c64_cd_r(address_space &space, offs_t
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_currah_speech_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_currah_speech_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/currah_speech.h b/src/devices/bus/c64/currah_speech.h
index 03f684275d2..2dfd9d519eb 100644
--- a/src/devices/bus/c64/currah_speech.h
+++ b/src/devices/bus/c64/currah_speech.h
@@ -29,7 +29,7 @@ class c64_currah_speech_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_currah_speech_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_currah_speech_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -41,8 +41,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
inline void set_osc1(int voice, int intonation);
diff --git a/src/devices/bus/c64/dela_ep256.cpp b/src/devices/bus/c64/dela_ep256.cpp
index f4c86f20db5..3706c16deff 100644
--- a/src/devices/bus/c64/dela_ep256.cpp
+++ b/src/devices/bus/c64/dela_ep256.cpp
@@ -61,7 +61,7 @@ machine_config_constructor c64_dela_ep256_cartridge_device::device_mconfig_addit
// c64_dela_ep256_cartridge_device - constructor
//-------------------------------------------------
-c64_dela_ep256_cartridge_device::c64_dela_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_dela_ep256_cartridge_device::c64_dela_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_DELA_EP256, "C64 Dela 256KB EPROM cartridge", tag, owner, clock, "delep256", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
@@ -104,7 +104,7 @@ void c64_dela_ep256_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_dela_ep256_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_dela_ep256_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -127,7 +127,7 @@ UINT8 c64_dela_ep256_cartridge_device::c64_cd_r(address_space &space, offs_t off
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_dela_ep256_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_dela_ep256_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io2 && ((offset & 0xf0) == 0xa0))
{
diff --git a/src/devices/bus/c64/dela_ep256.h b/src/devices/bus/c64/dela_ep256.h
index df5ce8580e5..d2822633000 100644
--- a/src/devices/bus/c64/dela_ep256.h
+++ b/src/devices/bus/c64/dela_ep256.h
@@ -30,7 +30,7 @@ class c64_dela_ep256_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_dela_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_dela_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,13 +41,13 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
generic_slot_device *m_eproms[8];
- UINT8 m_bank, m_socket;
+ uint8_t m_bank, m_socket;
int m_reset;
};
diff --git a/src/devices/bus/c64/dela_ep64.cpp b/src/devices/bus/c64/dela_ep64.cpp
index 25aeb844deb..9acdf42969c 100644
--- a/src/devices/bus/c64/dela_ep64.cpp
+++ b/src/devices/bus/c64/dela_ep64.cpp
@@ -48,7 +48,7 @@ machine_config_constructor c64_dela_ep64_cartridge_device::device_mconfig_additi
// c64_dela_ep64_cartridge_device - constructor
//-------------------------------------------------
-c64_dela_ep64_cartridge_device::c64_dela_ep64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_dela_ep64_cartridge_device::c64_dela_ep64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_DELA_EP64, "C64 Rex 64KB EPROM cartridge", tag, owner, clock, "c64_dela_ep64", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_eprom1(*this, "eprom1"),
@@ -88,7 +88,7 @@ void c64_dela_ep64_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_dela_ep64_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_dela_ep64_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -114,7 +114,7 @@ UINT8 c64_dela_ep64_cartridge_device::c64_cd_r(address_space &space, offs_t offs
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_dela_ep64_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_dela_ep64_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/dela_ep64.h b/src/devices/bus/c64/dela_ep64.h
index db1da8feca0..edda0ad2824 100644
--- a/src/devices/bus/c64/dela_ep64.h
+++ b/src/devices/bus/c64/dela_ep64.h
@@ -30,7 +30,7 @@ class c64_dela_ep64_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_dela_ep64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_dela_ep64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,14 +41,14 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
required_device<generic_slot_device> m_eprom1;
required_device<generic_slot_device> m_eprom2;
- UINT8 m_bank;
+ uint8_t m_bank;
int m_reset;
int m_rom0_ce;
int m_rom1_ce;
diff --git a/src/devices/bus/c64/dela_ep7x8.cpp b/src/devices/bus/c64/dela_ep7x8.cpp
index dc3a036cb14..3100d048436 100644
--- a/src/devices/bus/c64/dela_ep7x8.cpp
+++ b/src/devices/bus/c64/dela_ep7x8.cpp
@@ -58,7 +58,7 @@ machine_config_constructor c64_dela_ep7x8_cartridge_device::device_mconfig_addit
// c64_dela_ep7x8_cartridge_device - constructor
//-------------------------------------------------
-c64_dela_ep7x8_cartridge_device::c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_dela_ep7x8_cartridge_device::c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_DELA_EP7X8, "C64 Dela 7x8KB EPROM cartridge", tag, owner, clock, "ep7x8", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_eprom1(*this, "rom1"),
@@ -98,7 +98,7 @@ void c64_dela_ep7x8_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_dela_ep7x8_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_dela_ep7x8_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -122,7 +122,7 @@ UINT8 c64_dela_ep7x8_cartridge_device::c64_cd_r(address_space &space, offs_t off
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_dela_ep7x8_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_dela_ep7x8_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/dela_ep7x8.h b/src/devices/bus/c64/dela_ep7x8.h
index 904eda891e2..56b8e12f62c 100644
--- a/src/devices/bus/c64/dela_ep7x8.h
+++ b/src/devices/bus/c64/dela_ep7x8.h
@@ -30,7 +30,7 @@ class c64_dela_ep7x8_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,8 +41,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
required_device<generic_slot_device> m_eprom1;
@@ -53,7 +53,7 @@ private:
required_device<generic_slot_device> m_eprom6;
required_device<generic_slot_device> m_eprom7;
- UINT8 m_bank;
+ uint8_t m_bank;
};
diff --git a/src/devices/bus/c64/dinamic.cpp b/src/devices/bus/c64/dinamic.cpp
index d52af7ba74e..78aa8f2fbc7 100644
--- a/src/devices/bus/c64/dinamic.cpp
+++ b/src/devices/bus/c64/dinamic.cpp
@@ -26,7 +26,7 @@ const device_type C64_DINAMIC = &device_creator<c64_dinamic_cartridge_device>;
// c64_dinamic_cartridge_device - constructor
//-------------------------------------------------
-c64_dinamic_cartridge_device::c64_dinamic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_dinamic_cartridge_device::c64_dinamic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_DINAMIC, "C64 Dinamic cartridge", tag, owner, clock, "c64_dinamic", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
@@ -59,7 +59,7 @@ void c64_dinamic_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_dinamic_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_dinamic_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
diff --git a/src/devices/bus/c64/dinamic.h b/src/devices/bus/c64/dinamic.h
index 234f14c43eb..c2f592c48ae 100644
--- a/src/devices/bus/c64/dinamic.h
+++ b/src/devices/bus/c64/dinamic.h
@@ -28,7 +28,7 @@ class c64_dinamic_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_dinamic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_dinamic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,10 +36,10 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
};
diff --git a/src/devices/bus/c64/dqbb.cpp b/src/devices/bus/c64/dqbb.cpp
index 6e98707587a..c145e8660ad 100644
--- a/src/devices/bus/c64/dqbb.cpp
+++ b/src/devices/bus/c64/dqbb.cpp
@@ -35,7 +35,7 @@ const device_type C64_DQBB = &device_creator<c64_dqbb_cartridge_device>;
// c64_dqbb_cartridge_device - constructor
//-------------------------------------------------
-c64_dqbb_cartridge_device::c64_dqbb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_dqbb_cartridge_device::c64_dqbb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_DQBB, "C64 Double Quick Brown Box cartridge", tag, owner, clock, "c64_dqbb", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -77,7 +77,7 @@ void c64_dqbb_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_dqbb_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_dqbb_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!m_cs && (!roml || !romh))
{
@@ -92,7 +92,7 @@ UINT8 c64_dqbb_cartridge_device::c64_cd_r(address_space &space, offs_t offset, U
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_dqbb_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_dqbb_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!m_cs && m_we && (offset >= 0x8000 && offset < 0xc000))
{
diff --git a/src/devices/bus/c64/dqbb.h b/src/devices/bus/c64/dqbb.h
index f826cf5e165..56fa57ccb4d 100644
--- a/src/devices/bus/c64/dqbb.h
+++ b/src/devices/bus/c64/dqbb.h
@@ -30,7 +30,7 @@ class c64_dqbb_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_dqbb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_dqbb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -43,8 +43,8 @@ protected:
virtual void nvram_write(emu_file &file) override { if (m_nvram != nullptr) { file.write(m_nvram, m_nvram.bytes()); } }
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
int m_cs;
diff --git a/src/devices/bus/c64/easy_calc_result.cpp b/src/devices/bus/c64/easy_calc_result.cpp
index db7e35b3067..edb0510f1e9 100644
--- a/src/devices/bus/c64/easy_calc_result.cpp
+++ b/src/devices/bus/c64/easy_calc_result.cpp
@@ -47,7 +47,7 @@ const device_type C64_EASY_CALC_RESULT = &device_creator<c64_easy_calc_result_ca
// c64_easy_calc_result_cartridge_device - constructor
//-------------------------------------------------
-c64_easy_calc_result_cartridge_device::c64_easy_calc_result_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_easy_calc_result_cartridge_device::c64_easy_calc_result_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_EASY_CALC_RESULT, "C64 Easy Calc Result cartridge", tag, owner, clock, "c64_easy_calc_result", __FILE__),
device_c64_expansion_card_interface(mconfig, *this), m_bank(0)
{
@@ -79,7 +79,7 @@ void c64_easy_calc_result_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_easy_calc_result_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_easy_calc_result_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -98,7 +98,7 @@ UINT8 c64_easy_calc_result_cartridge_device::c64_cd_r(address_space &space, offs
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_easy_calc_result_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_easy_calc_result_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/easy_calc_result.h b/src/devices/bus/c64/easy_calc_result.h
index 791692c04c7..ab00c7fc874 100644
--- a/src/devices/bus/c64/easy_calc_result.h
+++ b/src/devices/bus/c64/easy_calc_result.h
@@ -28,7 +28,7 @@ class c64_easy_calc_result_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_easy_calc_result_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_easy_calc_result_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,8 +36,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
int m_bank;
diff --git a/src/devices/bus/c64/easyflash.cpp b/src/devices/bus/c64/easyflash.cpp
index 007190c8ec9..ee37e79e47e 100644
--- a/src/devices/bus/c64/easyflash.cpp
+++ b/src/devices/bus/c64/easyflash.cpp
@@ -80,7 +80,7 @@ ioport_constructor c64_easyflash_cartridge_device::device_input_ports() const
// c64_easyflash_cartridge_device - constructor
//-------------------------------------------------
-c64_easyflash_cartridge_device::c64_easyflash_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_easyflash_cartridge_device::c64_easyflash_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_EASYFLASH, "C64 EasyFlash cartridge", tag, owner, clock, "c64_easyflash", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_flash_roml(*this, AM29F040_0_TAG),
@@ -123,7 +123,7 @@ void c64_easyflash_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_easyflash_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_easyflash_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -148,7 +148,7 @@ UINT8 c64_easyflash_cartridge_device::c64_cd_r(address_space &space, offs_t offs
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_easyflash_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_easyflash_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
diff --git a/src/devices/bus/c64/easyflash.h b/src/devices/bus/c64/easyflash.h
index 265abf19771..e297f97695e 100644
--- a/src/devices/bus/c64/easyflash.h
+++ b/src/devices/bus/c64/easyflash.h
@@ -29,7 +29,7 @@ class c64_easyflash_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_easyflash_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_easyflash_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,8 +41,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override;
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override;
@@ -50,10 +50,10 @@ private:
required_device<amd_29f040_device> m_flash_roml;
required_device<amd_29f040_device> m_flash_romh;
required_ioport m_jp1;
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
- UINT8 m_bank;
- UINT8 m_mode;
+ uint8_t m_bank;
+ uint8_t m_mode;
};
diff --git a/src/devices/bus/c64/epyx_fast_load.cpp b/src/devices/bus/c64/epyx_fast_load.cpp
index ebe3863088c..57ad6f45bf3 100644
--- a/src/devices/bus/c64/epyx_fast_load.cpp
+++ b/src/devices/bus/c64/epyx_fast_load.cpp
@@ -36,7 +36,7 @@ const device_type C64_EPYX_FAST_LOAD = &device_creator<c64_epyx_fast_load_cartri
// c64_epyx_fast_load_cartridge_device - constructor
//-------------------------------------------------
-c64_epyx_fast_load_cartridge_device::c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_epyx_fast_load_cartridge_device::c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_EPYX_FAST_LOAD, "C64 Epyx Fast Load cartridge", tag, owner, clock, "c64_epyx_fast_load", __FILE__),
device_c64_expansion_card_interface(mconfig, *this), m_exrom_timer(nullptr)
{
@@ -79,7 +79,7 @@ void c64_epyx_fast_load_cartridge_device::device_timer(emu_timer &timer, device_
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_epyx_fast_load_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_epyx_fast_load_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -106,7 +106,7 @@ UINT8 c64_epyx_fast_load_cartridge_device::c64_cd_r(address_space &space, offs_t
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_epyx_fast_load_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_epyx_fast_load_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/epyx_fast_load.h b/src/devices/bus/c64/epyx_fast_load.h
index c65f3842d12..6f12d0d6857 100644
--- a/src/devices/bus/c64/epyx_fast_load.h
+++ b/src/devices/bus/c64/epyx_fast_load.h
@@ -28,7 +28,7 @@ class c64_epyx_fast_load_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -37,8 +37,8 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
emu_timer *m_exrom_timer;
diff --git a/src/devices/bus/c64/exos.cpp b/src/devices/bus/c64/exos.cpp
index 0b0ce6c8257..027259aebcf 100644
--- a/src/devices/bus/c64/exos.cpp
+++ b/src/devices/bus/c64/exos.cpp
@@ -26,7 +26,7 @@ const device_type C64_EXOS = &device_creator<c64_exos_cartridge_device>;
// c64_exos_cartridge_device - constructor
//-------------------------------------------------
-c64_exos_cartridge_device::c64_exos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_exos_cartridge_device::c64_exos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_EXOS, "C64 ExOS cartridge", tag, owner, clock, "c64_exos", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
@@ -46,7 +46,7 @@ void c64_exos_cartridge_device::device_start()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_exos_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_exos_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!romh)
{
diff --git a/src/devices/bus/c64/exos.h b/src/devices/bus/c64/exos.h
index 7f4785098f4..7aa210fa27b 100644
--- a/src/devices/bus/c64/exos.h
+++ b/src/devices/bus/c64/exos.h
@@ -28,14 +28,14 @@ class c64_exos_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_exos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_exos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override;
};
diff --git a/src/devices/bus/c64/exp.cpp b/src/devices/bus/c64/exp.cpp
index 80f7b13639e..92c7eb64e5d 100644
--- a/src/devices/bus/c64/exp.cpp
+++ b/src/devices/bus/c64/exp.cpp
@@ -56,7 +56,7 @@ device_c64_expansion_card_interface::~device_c64_expansion_card_interface()
// c64_expansion_slot_device - constructor
//-------------------------------------------------
-c64_expansion_slot_device::c64_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_expansion_slot_device::c64_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_EXPANSION_SLOT, "C64 expansion port", tag, owner, clock, "c64_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this),
@@ -155,8 +155,8 @@ image_init_result c64_expansion_slot_device::call_load()
if (cbm_crt_read_header(*m_file, &roml_size, &romh_size, &exrom, &game))
{
- UINT8 *roml = nullptr;
- UINT8 *romh = nullptr;
+ uint8_t *roml = nullptr;
+ uint8_t *romh = nullptr;
m_card->m_roml.allocate(roml_size);
m_card->m_romh.allocate(romh_size);
@@ -223,7 +223,7 @@ std::string c64_expansion_slot_device::get_default_card_software()
// cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_expansion_slot_device::cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_expansion_slot_device::cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (m_card != nullptr)
{
@@ -238,7 +238,7 @@ UINT8 c64_expansion_slot_device::cd_r(address_space &space, offs_t offset, UINT8
// cd_w - cartridge data write
//-------------------------------------------------
-void c64_expansion_slot_device::cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_expansion_slot_device::cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (m_card != nullptr)
{
diff --git a/src/devices/bus/c64/exp.h b/src/devices/bus/c64/exp.h
index 4e4555173fa..67cdd7bd235 100644
--- a/src/devices/bus/c64/exp.h
+++ b/src/devices/bus/c64/exp.h
@@ -102,7 +102,7 @@ class c64_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- c64_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_write_nmi.set_callback(object); }
@@ -112,8 +112,8 @@ public:
template<class _Object> static devcb_base &set_dma_wr_callback(device_t &device, _Object object) { return downcast<c64_expansion_slot_device &>(device).m_write_dma.set_callback(object); }
// computer interface
- UINT8 cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
- void cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);
+ uint8_t cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2);
+ void cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2);
int game_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
int exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram);
@@ -175,15 +175,15 @@ public:
device_c64_expansion_card_interface(const machine_config &mconfig, device_t &device);
virtual ~device_c64_expansion_card_interface();
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) { return data; };
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) { };
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) { return data; };
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) { };
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) { return m_game; }
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) { return m_exrom; }
protected:
- optional_shared_ptr<UINT8> m_roml;
- optional_shared_ptr<UINT8> m_romh;
- optional_shared_ptr<UINT8> m_nvram;
+ optional_shared_ptr<uint8_t> m_roml;
+ optional_shared_ptr<uint8_t> m_romh;
+ optional_shared_ptr<uint8_t> m_nvram;
int m_game;
int m_exrom;
diff --git a/src/devices/bus/c64/fcc.cpp b/src/devices/bus/c64/fcc.cpp
index 93e5fe4ccc4..7ee25067e60 100644
--- a/src/devices/bus/c64/fcc.cpp
+++ b/src/devices/bus/c64/fcc.cpp
@@ -118,7 +118,7 @@ ioport_constructor c64_final_chesscard_device::device_input_ports() const
// c64_final_chesscard_device - constructor
//-------------------------------------------------
-c64_final_chesscard_device::c64_final_chesscard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_final_chesscard_device::c64_final_chesscard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_FCC, "Final ChessCard", tag, owner, clock, "c64_fcc", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -156,7 +156,7 @@ void c64_final_chesscard_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_final_chesscard_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_final_chesscard_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -182,7 +182,7 @@ UINT8 c64_final_chesscard_device::c64_cd_r(address_space &space, offs_t offset,
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_final_chesscard_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_final_chesscard_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
diff --git a/src/devices/bus/c64/fcc.h b/src/devices/bus/c64/fcc.h
index 29d22dde05c..5a6960bd8a8 100644
--- a/src/devices/bus/c64/fcc.h
+++ b/src/devices/bus/c64/fcc.h
@@ -29,7 +29,7 @@ class c64_final_chesscard_device : public device_t,
{
public:
// construction/destruction
- c64_final_chesscard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_final_chesscard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -50,13 +50,13 @@ protected:
virtual void nvram_write(emu_file &file) override { if (m_nvram != nullptr) { file.write(m_nvram, m_nvram.bytes()); } }
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
required_device<m65sc02_device> m_maincpu;
- UINT8 m_bank;
+ uint8_t m_bank;
int m_ramen;
};
diff --git a/src/devices/bus/c64/final.cpp b/src/devices/bus/c64/final.cpp
index 4087201c5cb..a1d34e170aa 100644
--- a/src/devices/bus/c64/final.cpp
+++ b/src/devices/bus/c64/final.cpp
@@ -62,7 +62,7 @@ ioport_constructor c64_final_cartridge_device::device_input_ports() const
// c64_final_cartridge_device - constructor
//-------------------------------------------------
-c64_final_cartridge_device::c64_final_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_final_cartridge_device::c64_final_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_FINAL, "C64 Final cartridge", tag, owner, clock, "c64_final", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
@@ -93,7 +93,7 @@ void c64_final_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_final_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_final_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml || !romh || !io1 || !io2)
{
@@ -119,7 +119,7 @@ UINT8 c64_final_cartridge_device::c64_cd_r(address_space &space, offs_t offset,
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_final_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_final_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/final.h b/src/devices/bus/c64/final.h
index cbf7fab0b73..85deee27964 100644
--- a/src/devices/bus/c64/final.h
+++ b/src/devices/bus/c64/final.h
@@ -28,7 +28,7 @@ class c64_final_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_final_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_final_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -41,8 +41,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
};
diff --git a/src/devices/bus/c64/final3.cpp b/src/devices/bus/c64/final3.cpp
index a72963123ba..7815ec1d5dc 100644
--- a/src/devices/bus/c64/final3.cpp
+++ b/src/devices/bus/c64/final3.cpp
@@ -63,7 +63,7 @@ ioport_constructor c64_final3_cartridge_device::device_input_ports() const
// c64_final3_cartridge_device - constructor
//-------------------------------------------------
-c64_final3_cartridge_device::c64_final3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_final3_cartridge_device::c64_final3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_FINAL3, "C64 Final Cartridge III", tag, owner, clock, "c64_final3", __FILE__),
device_c64_expansion_card_interface(mconfig, *this), m_bank(0), m_hidden(0)
{
@@ -103,7 +103,7 @@ void c64_final3_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_final3_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_final3_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml || !romh || !io1 || !io2)
{
@@ -119,7 +119,7 @@ UINT8 c64_final3_cartridge_device::c64_cd_r(address_space &space, offs_t offset,
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_final3_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_final3_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!m_hidden && !io2 && ((offset & 0xff) == 0xff))
{
diff --git a/src/devices/bus/c64/final3.h b/src/devices/bus/c64/final3.h
index 42c1e1aa9f8..92c12da282a 100644
--- a/src/devices/bus/c64/final3.h
+++ b/src/devices/bus/c64/final3.h
@@ -28,7 +28,7 @@ class c64_final3_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_final3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_final3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -41,11 +41,11 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
int m_hidden;
};
diff --git a/src/devices/bus/c64/fun_play.cpp b/src/devices/bus/c64/fun_play.cpp
index 971521773a7..e265bf05442 100644
--- a/src/devices/bus/c64/fun_play.cpp
+++ b/src/devices/bus/c64/fun_play.cpp
@@ -26,7 +26,7 @@ const device_type C64_FUN_PLAY = &device_creator<c64_fun_play_cartridge_device>;
// c64_fun_play_cartridge_device - constructor
//-------------------------------------------------
-c64_fun_play_cartridge_device::c64_fun_play_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_fun_play_cartridge_device::c64_fun_play_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_FUN_PLAY, "C64 Fun Play cartridge", tag, owner, clock, "c64_fun_play", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
@@ -59,7 +59,7 @@ void c64_fun_play_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_fun_play_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_fun_play_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -75,7 +75,7 @@ UINT8 c64_fun_play_cartridge_device::c64_cd_r(address_space &space, offs_t offse
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_fun_play_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_fun_play_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/fun_play.h b/src/devices/bus/c64/fun_play.h
index 8e4e7528eb7..3a7c5bee76f 100644
--- a/src/devices/bus/c64/fun_play.h
+++ b/src/devices/bus/c64/fun_play.h
@@ -28,7 +28,7 @@ class c64_fun_play_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_fun_play_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_fun_play_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,11 +36,11 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
};
diff --git a/src/devices/bus/c64/geocable.cpp b/src/devices/bus/c64/geocable.cpp
index 3b6acc54d2a..0c884418ce5 100644
--- a/src/devices/bus/c64/geocable.cpp
+++ b/src/devices/bus/c64/geocable.cpp
@@ -55,7 +55,7 @@ machine_config_constructor c64_geocable_device::device_mconfig_additions() const
// c64_geocable_device - constructor
//-------------------------------------------------
-c64_geocable_device::c64_geocable_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_geocable_device::c64_geocable_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_GEOCABLE, "C64 geoCable", tag, owner, clock, "c64_geocable", __FILE__),
device_pet_user_port_interface(mconfig, *this),
m_centronics(*this, CENTRONICS_TAG)
diff --git a/src/devices/bus/c64/geocable.h b/src/devices/bus/c64/geocable.h
index 6b823b9a668..e7faad2553c 100644
--- a/src/devices/bus/c64/geocable.h
+++ b/src/devices/bus/c64/geocable.h
@@ -29,7 +29,7 @@ class c64_geocable_device : public device_t,
{
public:
// construction/destruction
- c64_geocable_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_geocable_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/c64/georam.cpp b/src/devices/bus/c64/georam.cpp
index ccdcebedc40..fe147565f79 100644
--- a/src/devices/bus/c64/georam.cpp
+++ b/src/devices/bus/c64/georam.cpp
@@ -26,7 +26,7 @@ const device_type C64_GEORAM = &device_creator<c64_georam_cartridge_device>;
// c64_georam_cartridge_device - constructor
//-------------------------------------------------
-c64_georam_cartridge_device::c64_georam_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_georam_cartridge_device::c64_georam_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_GEORAM, "C64 GeoRAM cartridge", tag, owner, clock, "c64_georam", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram"),
@@ -63,7 +63,7 @@ void c64_georam_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_georam_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_georam_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
@@ -79,7 +79,7 @@ UINT8 c64_georam_cartridge_device::c64_cd_r(address_space &space, offs_t offset,
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_georam_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_georam_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/georam.h b/src/devices/bus/c64/georam.h
index bf1a431244d..1d570f51e71 100644
--- a/src/devices/bus/c64/georam.h
+++ b/src/devices/bus/c64/georam.h
@@ -28,7 +28,7 @@ class c64_georam_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_georam_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_georam_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,13 +36,13 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
- UINT16 m_bank;
+ uint16_t m_bank;
};
diff --git a/src/devices/bus/c64/ide64.cpp b/src/devices/bus/c64/ide64.cpp
index 01def305dd5..f96b7885699 100644
--- a/src/devices/bus/c64/ide64.cpp
+++ b/src/devices/bus/c64/ide64.cpp
@@ -94,7 +94,7 @@ ioport_constructor c64_ide64_cartridge_device::device_input_ports() const
// c64_ide64_cartridge_device - constructor
//-------------------------------------------------
-c64_ide64_cartridge_device::c64_ide64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_ide64_cartridge_device::c64_ide64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_IDE64, "C64 IDE64 cartridge", tag, owner, clock, "c64_ide64", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_flash_rom(*this, AT29C010A_TAG),
@@ -142,7 +142,7 @@ void c64_ide64_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_ide64_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_ide64_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!m_enable) return data;
@@ -177,7 +177,7 @@ UINT8 c64_ide64_cartridge_device::c64_cd_r(address_space &space, offs_t offset,
// 0x5f-0x5f DS1302
// 0x60-0xff ROM
- UINT8 io1_offset = offset & 0xff;
+ uint8_t io1_offset = offset & 0xff;
if (io1_offset >= 0x20 && io1_offset < 0x28)
{
@@ -248,7 +248,7 @@ UINT8 c64_ide64_cartridge_device::c64_cd_r(address_space &space, offs_t offset,
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_ide64_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_ide64_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!m_enable) return;
@@ -278,7 +278,7 @@ void c64_ide64_cartridge_device::c64_cd_w(address_space &space, offs_t offset, U
// 0x5f-0x5f DS1302
// 0x60-0xff ROM
- UINT8 io1_offset = offset & 0xff;
+ uint8_t io1_offset = offset & 0xff;
if (io1_offset >= 0x20 && io1_offset < 0x28)
{
diff --git a/src/devices/bus/c64/ide64.h b/src/devices/bus/c64/ide64.h
index cfe6e1cd27f..2a7294066e7 100644
--- a/src/devices/bus/c64/ide64.h
+++ b/src/devices/bus/c64/ide64.h
@@ -32,7 +32,7 @@ class c64_ide64_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_ide64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_ide64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -44,8 +44,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override;
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override;
@@ -54,10 +54,10 @@ private:
required_device<ds1302_device> m_rtc;
required_device<ata_interface_device> m_ata;
required_ioport m_jp1;
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
- UINT8 m_bank;
- UINT16 m_ata_data;
+ uint8_t m_bank;
+ uint16_t m_ata_data;
int m_wp;
int m_enable;
};
diff --git a/src/devices/bus/c64/ieee488.cpp b/src/devices/bus/c64/ieee488.cpp
index 974c9df0cb5..e1156336d39 100644
--- a/src/devices/bus/c64/ieee488.cpp
+++ b/src/devices/bus/c64/ieee488.cpp
@@ -46,7 +46,7 @@ READ8_MEMBER( c64_ieee488_device::tpi_pa_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
data |= m_bus->ren_r() << 2;
data |= m_bus->atn_r() << 3;
@@ -100,7 +100,7 @@ READ8_MEMBER( c64_ieee488_device::tpi_pc_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
data |= m_bus->ifc_r();
data |= m_bus->srq_r() << 1;
@@ -173,7 +173,7 @@ machine_config_constructor c64_ieee488_device::device_mconfig_additions() const
// c64_ieee488_device - constructor
//-------------------------------------------------
-c64_ieee488_device::c64_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_ieee488_device::c64_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_IEEE488, "IEEE-488", tag, owner, clock, "c64_ieee488", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_tpi(*this, MOS6525_TAG),
@@ -207,7 +207,7 @@ void c64_ieee488_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_ieee488_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_ieee488_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
data = m_exp->cd_r(space, offset, data, sphi2, ba, roml, romh, io1, io2);
@@ -228,7 +228,7 @@ UINT8 c64_ieee488_device::c64_cd_r(address_space &space, offs_t offset, UINT8 da
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_ieee488_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_ieee488_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io2)
{
diff --git a/src/devices/bus/c64/ieee488.h b/src/devices/bus/c64/ieee488.h
index ca11ff7f5dc..6fac297f40b 100644
--- a/src/devices/bus/c64/ieee488.h
+++ b/src/devices/bus/c64/ieee488.h
@@ -29,7 +29,7 @@ class c64_ieee488_device : public device_t,
{
public:
// construction/destruction
- c64_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -46,8 +46,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override;
private:
diff --git a/src/devices/bus/c64/kingsoft.cpp b/src/devices/bus/c64/kingsoft.cpp
index 2826920320f..4da97e0496b 100644
--- a/src/devices/bus/c64/kingsoft.cpp
+++ b/src/devices/bus/c64/kingsoft.cpp
@@ -26,7 +26,7 @@ const device_type C64_KINGSOFT = &device_creator<c64_kingsoft_cartridge_device>;
// c64_kingsoft_cartridge_device - constructor
//-------------------------------------------------
-c64_kingsoft_cartridge_device::c64_kingsoft_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_kingsoft_cartridge_device::c64_kingsoft_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_KINGSOFT, "C64 Kingsoft cartridge", tag, owner, clock, "c64_kingsoft", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
@@ -56,7 +56,7 @@ void c64_kingsoft_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_kingsoft_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_kingsoft_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -79,7 +79,7 @@ UINT8 c64_kingsoft_cartridge_device::c64_cd_r(address_space &space, offs_t offse
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_kingsoft_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_kingsoft_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/kingsoft.h b/src/devices/bus/c64/kingsoft.h
index ab9dea5d935..30d828dff64 100644
--- a/src/devices/bus/c64/kingsoft.h
+++ b/src/devices/bus/c64/kingsoft.h
@@ -28,7 +28,7 @@ class c64_kingsoft_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_kingsoft_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_kingsoft_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,8 +36,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override;
};
diff --git a/src/devices/bus/c64/mach5.cpp b/src/devices/bus/c64/mach5.cpp
index b285d35b221..e8ba7f2a094 100644
--- a/src/devices/bus/c64/mach5.cpp
+++ b/src/devices/bus/c64/mach5.cpp
@@ -51,7 +51,7 @@ ioport_constructor c64_mach5_cartridge_device::device_input_ports() const
// c64_mach5_cartridge_device - constructor
//-------------------------------------------------
-c64_mach5_cartridge_device::c64_mach5_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_mach5_cartridge_device::c64_mach5_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_MACH5, "C64 MACH5 cartridge", tag, owner, clock, "c64_mach5", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_s1(*this, "S1"), m_c128(false)
@@ -87,7 +87,7 @@ void c64_mach5_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_mach5_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_mach5_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml || !romh || !io1 || !io2)
{
@@ -102,7 +102,7 @@ UINT8 c64_mach5_cartridge_device::c64_cd_r(address_space &space, offs_t offset,
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_mach5_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_mach5_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!m_c128)
{
diff --git a/src/devices/bus/c64/mach5.h b/src/devices/bus/c64/mach5.h
index a41114ccffe..128b7d232a0 100644
--- a/src/devices/bus/c64/mach5.h
+++ b/src/devices/bus/c64/mach5.h
@@ -27,7 +27,7 @@ class c64_mach5_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_mach5_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_mach5_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -38,8 +38,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
required_ioport m_s1;
diff --git a/src/devices/bus/c64/magic_desk.cpp b/src/devices/bus/c64/magic_desk.cpp
index e315b4eeba0..401f51956ee 100644
--- a/src/devices/bus/c64/magic_desk.cpp
+++ b/src/devices/bus/c64/magic_desk.cpp
@@ -26,7 +26,7 @@ const device_type C64_MAGIC_DESK = &device_creator<c64_magic_desk_cartridge_devi
// c64_magic_desk_cartridge_device - constructor
//-------------------------------------------------
-c64_magic_desk_cartridge_device::c64_magic_desk_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_magic_desk_cartridge_device::c64_magic_desk_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_MAGIC_DESK, "C64 Magic Desk cartridge", tag, owner, clock, "c64_magic_desk", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
@@ -59,7 +59,7 @@ void c64_magic_desk_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_magic_desk_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_magic_desk_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -75,7 +75,7 @@ UINT8 c64_magic_desk_cartridge_device::c64_cd_r(address_space &space, offs_t off
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_magic_desk_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_magic_desk_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/magic_desk.h b/src/devices/bus/c64/magic_desk.h
index 601805fabaa..645c3f043b2 100644
--- a/src/devices/bus/c64/magic_desk.h
+++ b/src/devices/bus/c64/magic_desk.h
@@ -28,7 +28,7 @@ class c64_magic_desk_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_magic_desk_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_magic_desk_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,11 +36,11 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
};
diff --git a/src/devices/bus/c64/magic_formel.cpp b/src/devices/bus/c64/magic_formel.cpp
index b6f9605ee45..826edc35241 100644
--- a/src/devices/bus/c64/magic_formel.cpp
+++ b/src/devices/bus/c64/magic_formel.cpp
@@ -162,7 +162,7 @@ ioport_constructor c64_magic_formel_cartridge_device::device_input_ports() const
// c64_magic_formel_cartridge_device - constructor
//-------------------------------------------------
-c64_magic_formel_cartridge_device::c64_magic_formel_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_magic_formel_cartridge_device::c64_magic_formel_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_MAGIC_FORMEL, "C64 Magic Formel cartridge", tag, owner, clock, "c64_magic_formel", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_pia(*this, MC6821_TAG),
@@ -215,7 +215,7 @@ void c64_magic_formel_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_magic_formel_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_magic_formel_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!romh)
{
@@ -236,7 +236,7 @@ UINT8 c64_magic_formel_cartridge_device::c64_cd_r(address_space &space, offs_t o
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_magic_formel_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_magic_formel_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1 && !m_ram_oe)
{
@@ -246,7 +246,7 @@ void c64_magic_formel_cartridge_device::c64_cd_w(address_space &space, offs_t of
else if (!io2 && !(!m_u9b && m_ram_oe))
{
offs_t addr = (offset >> 6) & 0x03;
- UINT8 new_data = (BIT(data, 1) << 7) | (offset & 0x3f);
+ uint8_t new_data = (BIT(data, 1) << 7) | (offset & 0x3f);
m_pia->write(space, addr, new_data);
}
diff --git a/src/devices/bus/c64/magic_formel.h b/src/devices/bus/c64/magic_formel.h
index ecf439e5606..ffc90c1db0c 100644
--- a/src/devices/bus/c64/magic_formel.h
+++ b/src/devices/bus/c64/magic_formel.h
@@ -28,7 +28,7 @@ class c64_magic_formel_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_magic_formel_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_magic_formel_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -47,16 +47,16 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override;
private:
required_device<pia6821_device> m_pia;
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
- UINT8 m_rom_bank;
- UINT8 m_ram_bank;
+ uint8_t m_rom_bank;
+ uint8_t m_ram_bank;
int m_ram_oe;
int m_pb7;
int m_u9a;
diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp
index cc0b2da9453..078ca95e804 100644
--- a/src/devices/bus/c64/magic_voice.cpp
+++ b/src/devices/bus/c64/magic_voice.cpp
@@ -93,7 +93,7 @@ READ8_MEMBER( c64_magic_voice_cartridge_device::tpi_pa_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
data |= m_exp->game_r(get_offset(m_ca), 1, 1, 1, 0) << 5;
data |= m_vslsi->eos_r() << 6;
@@ -140,7 +140,7 @@ READ8_MEMBER( c64_magic_voice_cartridge_device::tpi_pb_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
data |= m_exp->exrom_r(get_offset(m_ca), 1, 1, 1, 0) << 7;
@@ -260,7 +260,7 @@ machine_config_constructor c64_magic_voice_cartridge_device::device_mconfig_addi
// c64_magic_voice_cartridge_device - constructor
//-------------------------------------------------
-c64_magic_voice_cartridge_device::c64_magic_voice_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_magic_voice_cartridge_device::c64_magic_voice_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_MAGIC_VOICE, "C64 Magic Voice cartridge", tag, owner, clock, "c64_magic_voice", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_vslsi(*this, T6721A_TAG),
@@ -307,7 +307,7 @@ void c64_magic_voice_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_magic_voice_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_magic_voice_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io2 && sphi2)
{
@@ -333,7 +333,7 @@ UINT8 c64_magic_voice_cartridge_device::c64_cd_r(address_space &space, offs_t of
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_magic_voice_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_magic_voice_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io2 && sphi2)
{
diff --git a/src/devices/bus/c64/magic_voice.h b/src/devices/bus/c64/magic_voice.h
index f5e8af19e59..c8b11a851aa 100644
--- a/src/devices/bus/c64/magic_voice.h
+++ b/src/devices/bus/c64/magic_voice.h
@@ -30,7 +30,7 @@ class c64_magic_voice_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_magic_voice_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_magic_voice_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -53,8 +53,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override;
private:
@@ -65,10 +65,10 @@ private:
required_device<cmos_40105_device> m_fifo;
required_device<c64_expansion_slot_device> m_exp;
- UINT16 m_ca;
- UINT8 m_tpi_pb;
+ uint16_t m_ca;
+ uint8_t m_tpi_pb;
int m_tpi_pc6;
- UINT8 m_pd;
+ uint8_t m_pd;
};
diff --git a/src/devices/bus/c64/midi_maplin.cpp b/src/devices/bus/c64/midi_maplin.cpp
index 7a143391129..2c389a259a9 100644
--- a/src/devices/bus/c64/midi_maplin.cpp
+++ b/src/devices/bus/c64/midi_maplin.cpp
@@ -78,7 +78,7 @@ machine_config_constructor c64_maplin_midi_cartridge_device::device_mconfig_addi
// c64_maplin_midi_cartridge_device - constructor
//-------------------------------------------------
-c64_maplin_midi_cartridge_device::c64_maplin_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_maplin_midi_cartridge_device::c64_maplin_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_MIDI_MAPLIN, "C64 Maplin MIDI", tag, owner, clock, "c64_midimap", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MC6850_TAG)
@@ -110,7 +110,7 @@ void c64_maplin_midi_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_maplin_midi_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_maplin_midi_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io2)
{
@@ -134,7 +134,7 @@ UINT8 c64_maplin_midi_cartridge_device::c64_cd_r(address_space &space, offs_t of
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_maplin_midi_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_maplin_midi_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io2)
{
diff --git a/src/devices/bus/c64/midi_maplin.h b/src/devices/bus/c64/midi_maplin.h
index ac088c2f631..5608f506989 100644
--- a/src/devices/bus/c64/midi_maplin.h
+++ b/src/devices/bus/c64/midi_maplin.h
@@ -27,7 +27,7 @@ class c64_maplin_midi_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_maplin_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_maplin_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,8 +41,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
required_device<acia6850_device> m_acia;
diff --git a/src/devices/bus/c64/midi_namesoft.cpp b/src/devices/bus/c64/midi_namesoft.cpp
index cd1553b6187..cefff6e8297 100644
--- a/src/devices/bus/c64/midi_namesoft.cpp
+++ b/src/devices/bus/c64/midi_namesoft.cpp
@@ -78,7 +78,7 @@ machine_config_constructor c64_namesoft_midi_cartridge_device::device_mconfig_ad
// c64_namesoft_midi_cartridge_device - constructor
//-------------------------------------------------
-c64_namesoft_midi_cartridge_device::c64_namesoft_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_namesoft_midi_cartridge_device::c64_namesoft_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_MIDI_NAMESOFT, "C64 Namesoft MIDI", tag, owner, clock, "c64_midins", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MC6850_TAG)
@@ -108,7 +108,7 @@ void c64_namesoft_midi_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_namesoft_midi_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_namesoft_midi_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
@@ -132,7 +132,7 @@ UINT8 c64_namesoft_midi_cartridge_device::c64_cd_r(address_space &space, offs_t
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_namesoft_midi_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_namesoft_midi_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/midi_namesoft.h b/src/devices/bus/c64/midi_namesoft.h
index 048ea6b123f..d9321d9f217 100644
--- a/src/devices/bus/c64/midi_namesoft.h
+++ b/src/devices/bus/c64/midi_namesoft.h
@@ -27,7 +27,7 @@ class c64_namesoft_midi_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_namesoft_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_namesoft_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,8 +41,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
required_device<acia6850_device> m_acia;
diff --git a/src/devices/bus/c64/midi_passport.cpp b/src/devices/bus/c64/midi_passport.cpp
index 2948503f675..408b7a835e3 100644
--- a/src/devices/bus/c64/midi_passport.cpp
+++ b/src/devices/bus/c64/midi_passport.cpp
@@ -97,7 +97,7 @@ machine_config_constructor c64_passport_midi_cartridge_device::device_mconfig_ad
// c64_passport_midi_cartridge_device - constructor
//-------------------------------------------------
-c64_passport_midi_cartridge_device::c64_passport_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_passport_midi_cartridge_device::c64_passport_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_MIDI_PASSPORT, "C64 Passport MIDI", tag, owner, clock, "c64_midipp", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MC6850_TAG),
@@ -135,7 +135,7 @@ void c64_passport_midi_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_passport_midi_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_passport_midi_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
@@ -164,7 +164,7 @@ UINT8 c64_passport_midi_cartridge_device::c64_cd_r(address_space &space, offs_t
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_passport_midi_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_passport_midi_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/midi_passport.h b/src/devices/bus/c64/midi_passport.h
index ff7be2185a1..995c5b1d6ee 100644
--- a/src/devices/bus/c64/midi_passport.h
+++ b/src/devices/bus/c64/midi_passport.h
@@ -28,7 +28,7 @@ class c64_passport_midi_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_passport_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_passport_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -43,8 +43,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
required_device<acia6850_device> m_acia;
diff --git a/src/devices/bus/c64/midi_sci.cpp b/src/devices/bus/c64/midi_sci.cpp
index 40e2c56cbfc..ae8caad26dd 100644
--- a/src/devices/bus/c64/midi_sci.cpp
+++ b/src/devices/bus/c64/midi_sci.cpp
@@ -78,7 +78,7 @@ machine_config_constructor c64_sequential_midi_cartridge_device::device_mconfig_
// c64_sequential_midi_cartridge_device - constructor
//-------------------------------------------------
-c64_sequential_midi_cartridge_device::c64_sequential_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_sequential_midi_cartridge_device::c64_sequential_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_MIDI_SCI, "C64 Sequential Circuits MIDI", tag, owner, clock, "c64_midisci", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MC6850_TAG)
@@ -109,7 +109,7 @@ void c64_sequential_midi_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_sequential_midi_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_sequential_midi_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
@@ -133,7 +133,7 @@ UINT8 c64_sequential_midi_cartridge_device::c64_cd_r(address_space &space, offs_
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_sequential_midi_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_sequential_midi_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/midi_sci.h b/src/devices/bus/c64/midi_sci.h
index 6ab277b3ef1..c4f49bb092c 100644
--- a/src/devices/bus/c64/midi_sci.h
+++ b/src/devices/bus/c64/midi_sci.h
@@ -27,7 +27,7 @@ class c64_sequential_midi_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_sequential_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_sequential_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,8 +41,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
required_device<acia6850_device> m_acia;
diff --git a/src/devices/bus/c64/midi_siel.cpp b/src/devices/bus/c64/midi_siel.cpp
index cce956a1427..913405cfb06 100644
--- a/src/devices/bus/c64/midi_siel.cpp
+++ b/src/devices/bus/c64/midi_siel.cpp
@@ -78,7 +78,7 @@ machine_config_constructor c64_siel_midi_cartridge_device::device_mconfig_additi
// c64_siel_midi_cartridge_device - constructor
//-------------------------------------------------
-c64_siel_midi_cartridge_device::c64_siel_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_siel_midi_cartridge_device::c64_siel_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_MIDI_SIEL, "C64 Siel MIDI", tag, owner, clock, "c64_midisiel", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MC6850_TAG)
@@ -110,7 +110,7 @@ void c64_siel_midi_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_siel_midi_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_siel_midi_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
@@ -134,7 +134,7 @@ UINT8 c64_siel_midi_cartridge_device::c64_cd_r(address_space &space, offs_t offs
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_siel_midi_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_siel_midi_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/midi_siel.h b/src/devices/bus/c64/midi_siel.h
index 12787d4999c..35373dda012 100644
--- a/src/devices/bus/c64/midi_siel.h
+++ b/src/devices/bus/c64/midi_siel.h
@@ -27,7 +27,7 @@ class c64_siel_midi_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_siel_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_siel_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,8 +41,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
required_device<acia6850_device> m_acia;
diff --git a/src/devices/bus/c64/mikro_assembler.cpp b/src/devices/bus/c64/mikro_assembler.cpp
index 2578d4ae5b4..28f15a5efef 100644
--- a/src/devices/bus/c64/mikro_assembler.cpp
+++ b/src/devices/bus/c64/mikro_assembler.cpp
@@ -26,7 +26,7 @@ const device_type C64_MIKRO_ASSEMBLER = &device_creator<c64_mikro_assembler_cart
// c64_mikro_assembler_cartridge_device - constructor
//-------------------------------------------------
-c64_mikro_assembler_cartridge_device::c64_mikro_assembler_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_mikro_assembler_cartridge_device::c64_mikro_assembler_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_MIKRO_ASSEMBLER, "C64 Mikro Assembler cartridge", tag, owner, clock, "c64_mikro_assembler", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
@@ -46,7 +46,7 @@ void c64_mikro_assembler_cartridge_device::device_start()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_mikro_assembler_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_mikro_assembler_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml || !romh || !io1 || !io2)
{
diff --git a/src/devices/bus/c64/mikro_assembler.h b/src/devices/bus/c64/mikro_assembler.h
index 6b742fbb0f3..7d6bfee782e 100644
--- a/src/devices/bus/c64/mikro_assembler.h
+++ b/src/devices/bus/c64/mikro_assembler.h
@@ -28,14 +28,14 @@ class c64_mikro_assembler_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_mikro_assembler_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_mikro_assembler_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
};
diff --git a/src/devices/bus/c64/multiscreen.cpp b/src/devices/bus/c64/multiscreen.cpp
index d0848bf5a24..b1929b37943 100644
--- a/src/devices/bus/c64/multiscreen.cpp
+++ b/src/devices/bus/c64/multiscreen.cpp
@@ -139,7 +139,7 @@ machine_config_constructor c64_multiscreen_cartridge_device::device_mconfig_addi
// c64_multiscreen_cartridge_device - constructor
//-------------------------------------------------
-c64_multiscreen_cartridge_device::c64_multiscreen_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_multiscreen_cartridge_device::c64_multiscreen_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_MULTISCREEN, "C64 Multiscreen cartridge", tag, owner, clock, "c64_mscr", __FILE__),
device_c64_expansion_card_interface(mconfig, *this), m_bank(0)
{
@@ -171,7 +171,7 @@ void c64_multiscreen_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_multiscreen_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_multiscreen_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -208,7 +208,7 @@ UINT8 c64_multiscreen_cartridge_device::c64_cd_r(address_space &space, offs_t of
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_multiscreen_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_multiscreen_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (offset >= 0x8000 && offset < 0xa000)
{
diff --git a/src/devices/bus/c64/multiscreen.h b/src/devices/bus/c64/multiscreen.h
index f68024d2267..7a457a53ba5 100644
--- a/src/devices/bus/c64/multiscreen.h
+++ b/src/devices/bus/c64/multiscreen.h
@@ -30,7 +30,7 @@ class c64_multiscreen_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_multiscreen_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_multiscreen_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -42,11 +42,11 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
};
diff --git a/src/devices/bus/c64/music64.cpp b/src/devices/bus/c64/music64.cpp
index 1b8fd6a695b..8f5de837cbf 100644
--- a/src/devices/bus/c64/music64.cpp
+++ b/src/devices/bus/c64/music64.cpp
@@ -149,7 +149,7 @@ ioport_constructor c64_music64_cartridge_device::device_input_ports() const
// c64_music64_cartridge_device - constructor
//-------------------------------------------------
-c64_music64_cartridge_device::c64_music64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_music64_cartridge_device::c64_music64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_MUSIC64, "C64 Music 64 cartridge", tag, owner, clock, "c64_music64", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_exp(*this, C64_EXPANSION_SLOT_TAG),
@@ -180,7 +180,7 @@ void c64_music64_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_music64_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_music64_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
data = m_exp->cd_r(space, offset, data, sphi2, ba, roml, romh, io1, io2);
@@ -202,7 +202,7 @@ UINT8 c64_music64_cartridge_device::c64_cd_r(address_space &space, offs_t offset
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_music64_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_music64_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
m_exp->cd_w(space, offset, data, sphi2, ba, roml, romh, io1, io2);
}
diff --git a/src/devices/bus/c64/music64.h b/src/devices/bus/c64/music64.h
index 5af70da1744..34f102b99a9 100644
--- a/src/devices/bus/c64/music64.h
+++ b/src/devices/bus/c64/music64.h
@@ -27,7 +27,7 @@ class c64_music64_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_music64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_music64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -39,8 +39,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override;
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override;
diff --git a/src/devices/bus/c64/neoram.cpp b/src/devices/bus/c64/neoram.cpp
index 91019bdb9aa..2e33ee69729 100644
--- a/src/devices/bus/c64/neoram.cpp
+++ b/src/devices/bus/c64/neoram.cpp
@@ -26,7 +26,7 @@ const device_type C64_NEORAM = &device_creator<c64_neoram_cartridge_device>;
// c64_neoram_cartridge_device - constructor
//-------------------------------------------------
-c64_neoram_cartridge_device::c64_neoram_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_neoram_cartridge_device::c64_neoram_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_NEORAM, "C64 NeoRAM cartridge", tag, owner, clock, "c64_neoram", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -63,7 +63,7 @@ void c64_neoram_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_neoram_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_neoram_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
@@ -79,7 +79,7 @@ UINT8 c64_neoram_cartridge_device::c64_cd_r(address_space &space, offs_t offset,
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_neoram_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_neoram_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/neoram.h b/src/devices/bus/c64/neoram.h
index f9e28d23c0a..0bd98158776 100644
--- a/src/devices/bus/c64/neoram.h
+++ b/src/devices/bus/c64/neoram.h
@@ -29,7 +29,7 @@ class c64_neoram_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_neoram_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_neoram_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -42,11 +42,11 @@ protected:
virtual void nvram_write(emu_file &file) override { if (m_nvram != nullptr) { file.write(m_nvram, m_nvram.bytes()); } }
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- UINT16 m_bank;
+ uint16_t m_bank;
};
diff --git a/src/devices/bus/c64/ocean.cpp b/src/devices/bus/c64/ocean.cpp
index 496651a1b25..7961111e606 100644
--- a/src/devices/bus/c64/ocean.cpp
+++ b/src/devices/bus/c64/ocean.cpp
@@ -48,7 +48,7 @@ const device_type C64_OCEAN = &device_creator<c64_ocean_cartridge_device>;
// c64_ocean_cartridge_device - constructor
//-------------------------------------------------
-c64_ocean_cartridge_device::c64_ocean_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_ocean_cartridge_device::c64_ocean_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_OCEAN, "C64 Ocean cartridge", tag, owner, clock, "c64_ocean", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
@@ -81,7 +81,7 @@ void c64_ocean_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_ocean_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_ocean_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml && m_roml.bytes())
{
@@ -106,7 +106,7 @@ UINT8 c64_ocean_cartridge_device::c64_cd_r(address_space &space, offs_t offset,
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_ocean_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_ocean_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/ocean.h b/src/devices/bus/c64/ocean.h
index 49697d758e7..c5508a6c9ac 100644
--- a/src/devices/bus/c64/ocean.h
+++ b/src/devices/bus/c64/ocean.h
@@ -28,7 +28,7 @@ class c64_ocean_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_ocean_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_ocean_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,11 +36,11 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
};
diff --git a/src/devices/bus/c64/pagefox.cpp b/src/devices/bus/c64/pagefox.cpp
index b6df18e03c1..c1ee255b670 100644
--- a/src/devices/bus/c64/pagefox.cpp
+++ b/src/devices/bus/c64/pagefox.cpp
@@ -48,7 +48,7 @@ const device_type C64_PAGEFOX = &device_creator<c64_pagefox_cartridge_device>;
// c64_pagefox_cartridge_device - constructor
//-------------------------------------------------
-c64_pagefox_cartridge_device::c64_pagefox_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_pagefox_cartridge_device::c64_pagefox_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_PAGEFOX, "C64 Pagefox cartridge", tag, owner, clock, "c64_pagefox", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram"), m_bank(0)
@@ -84,7 +84,7 @@ void c64_pagefox_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_pagefox_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_pagefox_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml || !romh)
{
@@ -109,7 +109,7 @@ UINT8 c64_pagefox_cartridge_device::c64_cd_r(address_space &space, offs_t offset
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_pagefox_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_pagefox_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (offset >= 0x8000 && offset < 0xc000)
{
diff --git a/src/devices/bus/c64/pagefox.h b/src/devices/bus/c64/pagefox.h
index 7b68ce54c07..70dec864689 100644
--- a/src/devices/bus/c64/pagefox.h
+++ b/src/devices/bus/c64/pagefox.h
@@ -28,7 +28,7 @@ class c64_pagefox_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_pagefox_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_pagefox_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,13 +36,13 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
- UINT8 m_bank;
+ uint8_t m_bank;
};
diff --git a/src/devices/bus/c64/partner.cpp b/src/devices/bus/c64/partner.cpp
index 4feb8022b08..3f33ae0aaa2 100644
--- a/src/devices/bus/c64/partner.cpp
+++ b/src/devices/bus/c64/partner.cpp
@@ -76,7 +76,7 @@ ioport_constructor c64_partner_cartridge_device::device_input_ports() const
// c64_partner_cartridge_device - constructor
//-------------------------------------------------
-c64_partner_cartridge_device::c64_partner_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_partner_cartridge_device::c64_partner_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_PARTNER, "C64 PARTNER 64 cartridge", tag, owner, clock, "c64_partner", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram"),
@@ -119,7 +119,7 @@ void c64_partner_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_partner_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_partner_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
@@ -153,7 +153,7 @@ UINT8 c64_partner_cartridge_device::c64_cd_r(address_space &space, offs_t offset
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_partner_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_partner_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/partner.h b/src/devices/bus/c64/partner.h
index 640cb7daab5..28a1f7c59a4 100644
--- a/src/devices/bus/c64/partner.h
+++ b/src/devices/bus/c64/partner.h
@@ -27,7 +27,7 @@ class c64_partner_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_partner_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_partner_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -40,12 +40,12 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override;
private:
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
int m_a0;
int m_a6;
diff --git a/src/devices/bus/c64/prophet64.cpp b/src/devices/bus/c64/prophet64.cpp
index bd61247eed3..3cd575e93cb 100644
--- a/src/devices/bus/c64/prophet64.cpp
+++ b/src/devices/bus/c64/prophet64.cpp
@@ -26,7 +26,7 @@ const device_type C64_PROPHET64 = &device_creator<c64_prophet64_cartridge_device
// c64_prophet64_cartridge_device - constructor
//-------------------------------------------------
-c64_prophet64_cartridge_device::c64_prophet64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_prophet64_cartridge_device::c64_prophet64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_PROPHET64, "PROPHET64", tag, owner, clock, "c64_prophet64", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
@@ -60,7 +60,7 @@ void c64_prophet64_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_prophet64_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_prophet64_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -76,7 +76,7 @@ UINT8 c64_prophet64_cartridge_device::c64_cd_r(address_space &space, offs_t offs
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_prophet64_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_prophet64_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io2)
{
diff --git a/src/devices/bus/c64/prophet64.h b/src/devices/bus/c64/prophet64.h
index e8e810da9e6..8b39fbacfa7 100644
--- a/src/devices/bus/c64/prophet64.h
+++ b/src/devices/bus/c64/prophet64.h
@@ -27,7 +27,7 @@ class c64_prophet64_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_prophet64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_prophet64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -35,11 +35,11 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
};
diff --git a/src/devices/bus/c64/ps64.cpp b/src/devices/bus/c64/ps64.cpp
index 422fa7d837d..1f097c3c416 100644
--- a/src/devices/bus/c64/ps64.cpp
+++ b/src/devices/bus/c64/ps64.cpp
@@ -100,7 +100,7 @@ machine_config_constructor c64_ps64_cartridge_device::device_mconfig_additions()
// c64_ps64_cartridge_device - constructor
//-------------------------------------------------
-c64_ps64_cartridge_device::c64_ps64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_ps64_cartridge_device::c64_ps64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_PS64, "C64 PS-64", tag, owner, clock, "c64_ps64", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
@@ -129,7 +129,7 @@ void c64_ps64_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_ps64_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_ps64_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -148,7 +148,7 @@ UINT8 c64_ps64_cartridge_device::c64_cd_r(address_space &space, offs_t offset, U
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_ps64_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_ps64_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/ps64.h b/src/devices/bus/c64/ps64.h
index 5f2e87d7bcb..39397875508 100644
--- a/src/devices/bus/c64/ps64.h
+++ b/src/devices/bus/c64/ps64.h
@@ -29,7 +29,7 @@ class c64_ps64_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_ps64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_ps64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -40,8 +40,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
};
diff --git a/src/devices/bus/c64/reu.cpp b/src/devices/bus/c64/reu.cpp
index 4883ada757b..f1f58c50bb5 100644
--- a/src/devices/bus/c64/reu.cpp
+++ b/src/devices/bus/c64/reu.cpp
@@ -58,7 +58,7 @@ machine_config_constructor c64_reu_cartridge_device::device_mconfig_additions()
// c64_reu_cartridge_device - constructor
//-------------------------------------------------
-c64_reu_cartridge_device::c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, int jp1, size_t ram_size, const char *shortname, const char *source) :
+c64_reu_cartridge_device::c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, uint32_t variant, int jp1, size_t ram_size, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_c64_expansion_card_interface(mconfig, *this),
m_dmac(*this, MOS8726R1_TAG),
@@ -70,13 +70,13 @@ c64_reu_cartridge_device::c64_reu_cartridge_device(const machine_config &mconfig
{
}
-c64_reu1700_cartridge_device::c64_reu1700_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c64_reu1700_cartridge_device::c64_reu1700_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c64_reu_cartridge_device(mconfig, C64_REU1700, "1700 REU", tag, owner, clock, TYPE_1700, 0, 128 * 1024, "c64_1700reu", __FILE__) { }
-c64_reu1750_cartridge_device::c64_reu1750_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c64_reu1750_cartridge_device::c64_reu1750_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c64_reu_cartridge_device(mconfig, C64_REU1750, "1750 REU", tag, owner, clock, TYPE_1750, 1, 256 * 1024, "c64_1750reu", __FILE__) { }
-c64_reu1764_cartridge_device::c64_reu1764_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c64_reu1764_cartridge_device::c64_reu1764_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c64_reu_cartridge_device(mconfig, C64_REU1764, "1764 REU", tag, owner, clock, TYPE_1764, 1, 512 * 1024, "c64_1764reu", __FILE__) { }
@@ -109,7 +109,7 @@ void c64_reu_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_reu_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_reu_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!m_dmac->romsel_r(roml, romh))
{
@@ -128,7 +128,7 @@ UINT8 c64_reu_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UI
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_reu_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_reu_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io2)
{
diff --git a/src/devices/bus/c64/reu.h b/src/devices/bus/c64/reu.h
index c0fb6252ac3..adda61566ad 100644
--- a/src/devices/bus/c64/reu.h
+++ b/src/devices/bus/c64/reu.h
@@ -31,7 +31,7 @@ class c64_reu_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, int jp1, size_t ram_size, const char *shortname, const char *source);
+ c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, uint32_t variant, int jp1, size_t ram_size, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -49,12 +49,12 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
required_device<mos8726_device> m_dmac;
required_device<generic_slot_device> m_eprom;
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
int m_variant;
int m_jp1;
@@ -68,7 +68,7 @@ class c64_reu1700_cartridge_device : public c64_reu_cartridge_device
{
public:
// construction/destruction
- c64_reu1700_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_reu1700_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
@@ -78,7 +78,7 @@ class c64_reu1750_cartridge_device : public c64_reu_cartridge_device
{
public:
// construction/destruction
- c64_reu1750_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_reu1750_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
// ======================> c64_reu1700_cartridge_device
@@ -87,7 +87,7 @@ class c64_reu1764_cartridge_device : public c64_reu_cartridge_device
{
public:
// construction/destruction
- c64_reu1764_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_reu1764_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
diff --git a/src/devices/bus/c64/rex.cpp b/src/devices/bus/c64/rex.cpp
index 5a4a0abaf78..84b883c40c9 100644
--- a/src/devices/bus/c64/rex.cpp
+++ b/src/devices/bus/c64/rex.cpp
@@ -26,7 +26,7 @@ const device_type C64_REX = &device_creator<c64_rex_cartridge_device>;
// c64_rex_cartridge_device - constructor
//-------------------------------------------------
-c64_rex_cartridge_device::c64_rex_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_rex_cartridge_device::c64_rex_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_REX, "C64 Rex cartridge", tag, owner, clock, "c64_rex", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
@@ -56,7 +56,7 @@ void c64_rex_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_rex_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_rex_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
diff --git a/src/devices/bus/c64/rex.h b/src/devices/bus/c64/rex.h
index d5f17dfdd5b..d12e771124e 100644
--- a/src/devices/bus/c64/rex.h
+++ b/src/devices/bus/c64/rex.h
@@ -28,7 +28,7 @@ class c64_rex_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_rex_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_rex_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,7 +36,7 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
};
diff --git a/src/devices/bus/c64/rex_ep256.cpp b/src/devices/bus/c64/rex_ep256.cpp
index ecb5e3983e4..772840706c0 100644
--- a/src/devices/bus/c64/rex_ep256.cpp
+++ b/src/devices/bus/c64/rex_ep256.cpp
@@ -61,7 +61,7 @@ machine_config_constructor c64_rex_ep256_cartridge_device::device_mconfig_additi
// c64_rex_ep256_cartridge_device - constructor
//-------------------------------------------------
-c64_rex_ep256_cartridge_device::c64_rex_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_rex_ep256_cartridge_device::c64_rex_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_REX_EP256, "C64 Rex 256KB EPROM cartridge", tag, owner, clock, "rexep256", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
@@ -104,7 +104,7 @@ void c64_rex_ep256_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_rex_ep256_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_rex_ep256_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -138,7 +138,7 @@ UINT8 c64_rex_ep256_cartridge_device::c64_cd_r(address_space &space, offs_t offs
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_rex_ep256_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_rex_ep256_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io2 && ((offset & 0xf0) == 0xa0))
{
diff --git a/src/devices/bus/c64/rex_ep256.h b/src/devices/bus/c64/rex_ep256.h
index abd5f53618b..6c12bb69922 100644
--- a/src/devices/bus/c64/rex_ep256.h
+++ b/src/devices/bus/c64/rex_ep256.h
@@ -30,7 +30,7 @@ class c64_rex_ep256_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_rex_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_rex_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,13 +41,13 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
generic_slot_device *m_eproms[8];
- UINT8 m_bank, m_socket;
+ uint8_t m_bank, m_socket;
int m_reset;
};
diff --git a/src/devices/bus/c64/ross.cpp b/src/devices/bus/c64/ross.cpp
index 1a074958aa0..84e94c8e1ef 100644
--- a/src/devices/bus/c64/ross.cpp
+++ b/src/devices/bus/c64/ross.cpp
@@ -26,7 +26,7 @@ const device_type C64_ROSS = &device_creator<c64_ross_cartridge_device>;
// c64_ross_cartridge_device - constructor
//-------------------------------------------------
-c64_ross_cartridge_device::c64_ross_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_ross_cartridge_device::c64_ross_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_ROSS, "C64 Ross cartridge", tag, owner, clock, "c64_ross", __FILE__),
device_c64_expansion_card_interface(mconfig, *this), m_bank(0)
{
@@ -61,7 +61,7 @@ void c64_ross_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_ross_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_ross_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml || !romh)
{
@@ -78,7 +78,7 @@ UINT8 c64_ross_cartridge_device::c64_cd_r(address_space &space, offs_t offset, U
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_ross_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_ross_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/ross.h b/src/devices/bus/c64/ross.h
index 6f88948927b..f644521fef9 100644
--- a/src/devices/bus/c64/ross.h
+++ b/src/devices/bus/c64/ross.h
@@ -28,7 +28,7 @@ class c64_ross_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_ross_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_ross_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,11 +36,11 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
};
diff --git a/src/devices/bus/c64/sfx_sound_expander.cpp b/src/devices/bus/c64/sfx_sound_expander.cpp
index 71649a4a86b..48d93789dcf 100644
--- a/src/devices/bus/c64/sfx_sound_expander.cpp
+++ b/src/devices/bus/c64/sfx_sound_expander.cpp
@@ -180,7 +180,7 @@ inline offs_t c64_sfx_sound_expander_cartridge_device::get_offset(offs_t offset,
// c64_sfx_sound_expander_cartridge_device - constructor
//-------------------------------------------------
-c64_sfx_sound_expander_cartridge_device::c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_sfx_sound_expander_cartridge_device::c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_SFX_SOUND_EXPANDER, "C64 SFX Sound Expander cartridge", tag, owner, clock, "c64_sfxse", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_opl(*this, YM3526_TAG),
@@ -213,7 +213,7 @@ void c64_sfx_sound_expander_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_sfx_sound_expander_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_sfx_sound_expander_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
data = m_exp->cd_r(space, get_offset(offset, 1), data, sphi2, ba, roml, romh, io1, io2);
@@ -238,7 +238,7 @@ UINT8 c64_sfx_sound_expander_cartridge_device::c64_cd_r(address_space &space, of
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_sfx_sound_expander_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_sfx_sound_expander_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io2 && sphi2)
{
diff --git a/src/devices/bus/c64/sfx_sound_expander.h b/src/devices/bus/c64/sfx_sound_expander.h
index a422c4df784..7e8df5ce2dd 100644
--- a/src/devices/bus/c64/sfx_sound_expander.h
+++ b/src/devices/bus/c64/sfx_sound_expander.h
@@ -28,7 +28,7 @@ class c64_sfx_sound_expander_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -42,8 +42,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override;
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override;
diff --git a/src/devices/bus/c64/silverrock.cpp b/src/devices/bus/c64/silverrock.cpp
index 4ae1dd4ab75..e9a7dcf11eb 100644
--- a/src/devices/bus/c64/silverrock.cpp
+++ b/src/devices/bus/c64/silverrock.cpp
@@ -59,7 +59,7 @@ const device_type C64_SILVERROCK = &device_creator<c64_silverrock_cartridge_devi
// c64_silverrock_cartridge_device - constructor
//-------------------------------------------------
-c64_silverrock_cartridge_device::c64_silverrock_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_silverrock_cartridge_device::c64_silverrock_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_SILVERROCK, "C64 SilverRock cartridge", tag, owner, clock, "c64_silverrock", __FILE__),
device_c64_expansion_card_interface(mconfig, *this), m_bank(0)
{
@@ -91,7 +91,7 @@ void c64_silverrock_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_silverrock_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_silverrock_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -108,7 +108,7 @@ UINT8 c64_silverrock_cartridge_device::c64_cd_r(address_space &space, offs_t off
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_silverrock_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_silverrock_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/silverrock.h b/src/devices/bus/c64/silverrock.h
index 6450e555fa7..f9bd9f1ae65 100644
--- a/src/devices/bus/c64/silverrock.h
+++ b/src/devices/bus/c64/silverrock.h
@@ -28,7 +28,7 @@ class c64_silverrock_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_silverrock_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_silverrock_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,11 +36,11 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
};
diff --git a/src/devices/bus/c64/simons_basic.cpp b/src/devices/bus/c64/simons_basic.cpp
index 01baf228189..f59945130fe 100644
--- a/src/devices/bus/c64/simons_basic.cpp
+++ b/src/devices/bus/c64/simons_basic.cpp
@@ -26,7 +26,7 @@ const device_type C64_SIMONS_BASIC = &device_creator<c64_simons_basic_cartridge_
// c64_simons_basic_cartridge_device - constructor
//-------------------------------------------------
-c64_simons_basic_cartridge_device::c64_simons_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_simons_basic_cartridge_device::c64_simons_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_SIMONS_BASIC, "Simons' BASIC", tag, owner, clock, "c64_simons_basic", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
@@ -56,7 +56,7 @@ void c64_simons_basic_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_simons_basic_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_simons_basic_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -75,7 +75,7 @@ UINT8 c64_simons_basic_cartridge_device::c64_cd_r(address_space &space, offs_t o
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_simons_basic_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_simons_basic_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/simons_basic.h b/src/devices/bus/c64/simons_basic.h
index 7193fee1aa3..3d79ea93810 100644
--- a/src/devices/bus/c64/simons_basic.h
+++ b/src/devices/bus/c64/simons_basic.h
@@ -28,7 +28,7 @@ class c64_simons_basic_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_simons_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_simons_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,8 +36,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
};
diff --git a/src/devices/bus/c64/stardos.cpp b/src/devices/bus/c64/stardos.cpp
index 4c92982c695..44cbdc0d6a0 100644
--- a/src/devices/bus/c64/stardos.cpp
+++ b/src/devices/bus/c64/stardos.cpp
@@ -112,7 +112,7 @@ void c64_stardos_cartridge_device::charge_io2_capacitor()
// c64_stardos_cartridge_device - constructor
//-------------------------------------------------
-c64_stardos_cartridge_device::c64_stardos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_stardos_cartridge_device::c64_stardos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_STARDOS, "C64 StarDOS cartridge", tag, owner, clock, "c64_stardos", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_io1_charge(0),
@@ -137,7 +137,7 @@ void c64_stardos_cartridge_device::device_start()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_stardos_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_stardos_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml || !romh)
{
@@ -161,7 +161,7 @@ UINT8 c64_stardos_cartridge_device::c64_cd_r(address_space &space, offs_t offset
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_stardos_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_stardos_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/stardos.h b/src/devices/bus/c64/stardos.h
index 63b37867da7..ec1f366f5de 100644
--- a/src/devices/bus/c64/stardos.h
+++ b/src/devices/bus/c64/stardos.h
@@ -29,7 +29,7 @@ class c64_stardos_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_stardos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_stardos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -39,8 +39,8 @@ protected:
virtual void device_start() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override;
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override;
diff --git a/src/devices/bus/c64/std.cpp b/src/devices/bus/c64/std.cpp
index 6fa3abfef1d..4e1c74a1abf 100644
--- a/src/devices/bus/c64/std.cpp
+++ b/src/devices/bus/c64/std.cpp
@@ -26,7 +26,7 @@ const device_type C64_STD = &device_creator<c64_standard_cartridge_device>;
// c64_standard_cartridge_device - constructor
//-------------------------------------------------
-c64_standard_cartridge_device::c64_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_standard_cartridge_device::c64_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_STD, "C64 standard cartridge", tag, owner, clock, "c64_standard", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
@@ -46,7 +46,7 @@ void c64_standard_cartridge_device::device_start()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_standard_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_standard_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml && m_roml.bytes())
{
diff --git a/src/devices/bus/c64/std.h b/src/devices/bus/c64/std.h
index 16bbdb9f4ff..43d640bfdf4 100644
--- a/src/devices/bus/c64/std.h
+++ b/src/devices/bus/c64/std.h
@@ -28,14 +28,14 @@ class c64_standard_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
};
diff --git a/src/devices/bus/c64/structured_basic.cpp b/src/devices/bus/c64/structured_basic.cpp
index f299246e118..8cc7a439561 100644
--- a/src/devices/bus/c64/structured_basic.cpp
+++ b/src/devices/bus/c64/structured_basic.cpp
@@ -26,7 +26,7 @@ const device_type C64_STRUCTURED_BASIC = &device_creator<c64_structured_basic_ca
// c64_structured_basic_cartridge_device - constructor
//-------------------------------------------------
-c64_structured_basic_cartridge_device::c64_structured_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_structured_basic_cartridge_device::c64_structured_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_STRUCTURED_BASIC, "C64 Structured Basic cartridge", tag, owner, clock, "c64_structured_basic", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
@@ -61,7 +61,7 @@ void c64_structured_basic_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_structured_basic_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_structured_basic_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -78,7 +78,7 @@ UINT8 c64_structured_basic_cartridge_device::c64_cd_r(address_space &space, offs
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_structured_basic_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_structured_basic_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/structured_basic.h b/src/devices/bus/c64/structured_basic.h
index b061da08921..07a0e6fa55f 100644
--- a/src/devices/bus/c64/structured_basic.h
+++ b/src/devices/bus/c64/structured_basic.h
@@ -28,7 +28,7 @@ class c64_structured_basic_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_structured_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_structured_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,11 +36,11 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
};
diff --git a/src/devices/bus/c64/super_explode.cpp b/src/devices/bus/c64/super_explode.cpp
index 90c88ba1001..4a3ec8cc5b6 100644
--- a/src/devices/bus/c64/super_explode.cpp
+++ b/src/devices/bus/c64/super_explode.cpp
@@ -36,7 +36,7 @@ const device_type C64_SUPER_EXPLODE = &device_creator<c64_super_explode_cartridg
// c64_super_explode_cartridge_device - constructor
//-------------------------------------------------
-c64_super_explode_cartridge_device::c64_super_explode_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_super_explode_cartridge_device::c64_super_explode_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_SUPER_EXPLODE, "C64 Super Explode! cartridge", tag, owner, clock, "c64_super_explode", __FILE__),
device_c64_expansion_card_interface(mconfig, *this), m_bank(0), m_exrom_timer(nullptr)
{
@@ -84,7 +84,7 @@ void c64_super_explode_cartridge_device::device_timer(emu_timer &timer, device_t
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_super_explode_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_super_explode_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -111,7 +111,7 @@ UINT8 c64_super_explode_cartridge_device::c64_cd_r(address_space &space, offs_t
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_super_explode_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_super_explode_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/super_explode.h b/src/devices/bus/c64/super_explode.h
index d460791bef3..92883aa77d5 100644
--- a/src/devices/bus/c64/super_explode.h
+++ b/src/devices/bus/c64/super_explode.h
@@ -28,7 +28,7 @@ class c64_super_explode_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_super_explode_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_super_explode_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -37,11 +37,11 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
emu_timer *m_exrom_timer;
};
diff --git a/src/devices/bus/c64/super_games.cpp b/src/devices/bus/c64/super_games.cpp
index 53d1f932e7a..a0e8bcb9fa0 100644
--- a/src/devices/bus/c64/super_games.cpp
+++ b/src/devices/bus/c64/super_games.cpp
@@ -26,7 +26,7 @@ const device_type C64_SUPER_GAMES = &device_creator<c64_super_games_cartridge_de
// c64_super_games_cartridge_device - constructor
//-------------------------------------------------
-c64_super_games_cartridge_device::c64_super_games_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_super_games_cartridge_device::c64_super_games_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_SUPER_GAMES, "C64 Super Games cartridge", tag, owner, clock, "c64_super_games", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
@@ -59,7 +59,7 @@ void c64_super_games_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_super_games_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_super_games_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml || !romh)
{
@@ -75,7 +75,7 @@ UINT8 c64_super_games_cartridge_device::c64_cd_r(address_space &space, offs_t of
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_super_games_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_super_games_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io2)
{
diff --git a/src/devices/bus/c64/super_games.h b/src/devices/bus/c64/super_games.h
index 321a5c8ef92..5ed9b7d6a72 100644
--- a/src/devices/bus/c64/super_games.h
+++ b/src/devices/bus/c64/super_games.h
@@ -28,7 +28,7 @@ class c64_super_games_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_super_games_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_super_games_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,11 +36,11 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
};
diff --git a/src/devices/bus/c64/supercpu.cpp b/src/devices/bus/c64/supercpu.cpp
index f7d36540732..1411fa5a648 100644
--- a/src/devices/bus/c64/supercpu.cpp
+++ b/src/devices/bus/c64/supercpu.cpp
@@ -118,7 +118,7 @@ ioport_constructor c64_supercpu_device::device_input_ports() const
// c64_supercpu_device - constructor
//-------------------------------------------------
-c64_supercpu_device::c64_supercpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_supercpu_device::c64_supercpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_SUPERCPU, "SuperCPU", tag, owner, clock, "c64_supercpu", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_maincpu(*this, G65816_TAG),
@@ -151,7 +151,7 @@ void c64_supercpu_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_supercpu_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_supercpu_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
data = m_exp->cd_r(space, offset, data, sphi2, ba, roml, romh, io1, io2);
@@ -205,7 +205,7 @@ UINT8 c64_supercpu_device::c64_cd_r(address_space &space, offs_t offset, UINT8 d
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_supercpu_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_supercpu_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
switch (offset)
{
diff --git a/src/devices/bus/c64/supercpu.h b/src/devices/bus/c64/supercpu.h
index ea3618fe6de..8843d55b5cd 100644
--- a/src/devices/bus/c64/supercpu.h
+++ b/src/devices/bus/c64/supercpu.h
@@ -28,7 +28,7 @@ class c64_supercpu_device : public device_t,
{
public:
// construction/destruction
- c64_supercpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_supercpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -41,8 +41,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override;
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override;
@@ -50,8 +50,8 @@ private:
required_device<cpu_device> m_maincpu;
required_device<c64_expansion_slot_device> m_exp;
- required_shared_ptr<UINT8> m_sram;
- required_shared_ptr<UINT8> m_dimm;
+ required_shared_ptr<uint8_t> m_sram;
+ required_shared_ptr<uint8_t> m_dimm;
};
diff --git a/src/devices/bus/c64/sw8k.cpp b/src/devices/bus/c64/sw8k.cpp
index d8864e5ceb9..9febecdf202 100644
--- a/src/devices/bus/c64/sw8k.cpp
+++ b/src/devices/bus/c64/sw8k.cpp
@@ -71,7 +71,7 @@ ioport_constructor c64_switchable_8k_cartridge_device::device_input_ports() cons
// c64_switchable_8k_cartridge_device - constructor
//-------------------------------------------------
-c64_switchable_8k_cartridge_device::c64_switchable_8k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_switchable_8k_cartridge_device::c64_switchable_8k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_SW8K, "C64 Switchable 8K cartridge", tag, owner, clock, "c64_sw8k", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_sw(*this, "SW"), m_bank(0)
@@ -102,7 +102,7 @@ void c64_switchable_8k_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_switchable_8k_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_switchable_8k_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
diff --git a/src/devices/bus/c64/sw8k.h b/src/devices/bus/c64/sw8k.h
index d6a753e1f1b..9947010c5be 100644
--- a/src/devices/bus/c64/sw8k.h
+++ b/src/devices/bus/c64/sw8k.h
@@ -28,7 +28,7 @@ class c64_switchable_8k_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_switchable_8k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_switchable_8k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -39,7 +39,7 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
required_ioport m_sw;
diff --git a/src/devices/bus/c64/swiftlink.cpp b/src/devices/bus/c64/swiftlink.cpp
index 14e0b224da5..f2b118d7d5d 100644
--- a/src/devices/bus/c64/swiftlink.cpp
+++ b/src/devices/bus/c64/swiftlink.cpp
@@ -99,7 +99,7 @@ ioport_constructor c64_swiftlink_cartridge_device::device_input_ports() const
// c64_swiftlink_cartridge_device - constructor
//-------------------------------------------------
-c64_swiftlink_cartridge_device::c64_swiftlink_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_swiftlink_cartridge_device::c64_swiftlink_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_SWIFTLINK, "C64 SwiftLink cartridge", tag, owner, clock, "c64_swiftlink", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MOS6551_TAG),
@@ -135,7 +135,7 @@ void c64_swiftlink_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_swiftlink_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_swiftlink_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (((m_cs == DE00) && !io1) || ((m_cs == DF00) && !io2) ||
((m_cs == D700) && ((offset & 0xff00) == 0xd700)))
@@ -151,7 +151,7 @@ UINT8 c64_swiftlink_cartridge_device::c64_cd_r(address_space &space, offs_t offs
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_swiftlink_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_swiftlink_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (((m_cs == DE00) && !io1) || ((m_cs == DF00) && !io2) ||
((m_cs == D700) && ((offset & 0xff00) == 0xd700)))
diff --git a/src/devices/bus/c64/swiftlink.h b/src/devices/bus/c64/swiftlink.h
index 9a364845094..3cc2ed17165 100644
--- a/src/devices/bus/c64/swiftlink.h
+++ b/src/devices/bus/c64/swiftlink.h
@@ -29,7 +29,7 @@ class c64_swiftlink_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_swiftlink_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_swiftlink_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -43,8 +43,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
required_device<mos6551_device> m_acia;
diff --git a/src/devices/bus/c64/system3.cpp b/src/devices/bus/c64/system3.cpp
index 9bc4a33f7dd..25463f1e9c1 100644
--- a/src/devices/bus/c64/system3.cpp
+++ b/src/devices/bus/c64/system3.cpp
@@ -26,7 +26,7 @@ const device_type C64_SYSTEM3 = &device_creator<c64_system3_cartridge_device>;
// c64_system3_cartridge_device - constructor
//-------------------------------------------------
-c64_system3_cartridge_device::c64_system3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_system3_cartridge_device::c64_system3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_SYSTEM3, "C64 System 3 cartridge", tag, owner, clock, "c64_system3", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
@@ -59,7 +59,7 @@ void c64_system3_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_system3_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_system3_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
@@ -81,7 +81,7 @@ UINT8 c64_system3_cartridge_device::c64_cd_r(address_space &space, offs_t offset
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_system3_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_system3_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/system3.h b/src/devices/bus/c64/system3.h
index fef5c100217..d2c3dd7f17e 100644
--- a/src/devices/bus/c64/system3.h
+++ b/src/devices/bus/c64/system3.h
@@ -28,7 +28,7 @@ class c64_system3_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_system3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_system3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,11 +36,11 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
};
diff --git a/src/devices/bus/c64/tdos.cpp b/src/devices/bus/c64/tdos.cpp
index 9ce8c14f22a..45c5d203e8c 100644
--- a/src/devices/bus/c64/tdos.cpp
+++ b/src/devices/bus/c64/tdos.cpp
@@ -201,7 +201,7 @@ ioport_constructor c64_tdos_cartridge_device::device_input_ports() const
// c64_tdos_cartridge_device - constructor
//-------------------------------------------------
-c64_tdos_cartridge_device::c64_tdos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_tdos_cartridge_device::c64_tdos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_TDOS, "C64 TDOS cartridge", tag, owner, clock, "c64_tdos", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_ssda(*this, MC68A52P_TAG),
@@ -238,7 +238,7 @@ void c64_tdos_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_tdos_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_tdos_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
data = m_exp->cd_r(space, offset, data, sphi2, ba, roml, romh, io1, io2);
@@ -285,7 +285,7 @@ UINT8 c64_tdos_cartridge_device::c64_cd_r(address_space &space, offs_t offset, U
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_tdos_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_tdos_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
m_exp->cd_w(space, offset, data, sphi2, ba, roml, romh, io1, io2);
diff --git a/src/devices/bus/c64/tdos.h b/src/devices/bus/c64/tdos.h
index 42c08cbd1c8..e7c8b7945f6 100644
--- a/src/devices/bus/c64/tdos.h
+++ b/src/devices/bus/c64/tdos.h
@@ -28,7 +28,7 @@ class c64_tdos_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_tdos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_tdos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -40,8 +40,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override;
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override;
diff --git a/src/devices/bus/c64/turbo232.cpp b/src/devices/bus/c64/turbo232.cpp
index 1dd43b2011d..aac81a90584 100644
--- a/src/devices/bus/c64/turbo232.cpp
+++ b/src/devices/bus/c64/turbo232.cpp
@@ -98,7 +98,7 @@ ioport_constructor c64_turbo232_cartridge_device::device_input_ports() const
// c64_turbo232_cartridge_device - constructor
//-------------------------------------------------
-c64_turbo232_cartridge_device::c64_turbo232_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_turbo232_cartridge_device::c64_turbo232_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_TURBO232, "C64 Turbo232 cartridge", tag, owner, clock, "c64_turbo232", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MOS6551_TAG),
@@ -137,7 +137,7 @@ void c64_turbo232_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_turbo232_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_turbo232_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (((m_cs == DE00) && !io1) || ((m_cs == DF00) && !io2) ||
((m_cs == D700) && ((offset & 0xff00) == 0xd700)))
@@ -164,7 +164,7 @@ UINT8 c64_turbo232_cartridge_device::c64_cd_r(address_space &space, offs_t offse
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_turbo232_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_turbo232_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (((m_cs == DE00) && !io1) || ((m_cs == DF00) && !io2) ||
((m_cs == D700) && ((offset & 0xff00) == 0xd700)))
diff --git a/src/devices/bus/c64/turbo232.h b/src/devices/bus/c64/turbo232.h
index 4f80cec374f..c98d9cc10eb 100644
--- a/src/devices/bus/c64/turbo232.h
+++ b/src/devices/bus/c64/turbo232.h
@@ -29,7 +29,7 @@ class c64_turbo232_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_turbo232_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_turbo232_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -43,8 +43,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
required_device<mos6551_device> m_acia;
@@ -78,7 +78,7 @@ private:
int m_cs;
int m_irq;
- UINT8 m_es;
+ uint8_t m_es;
};
diff --git a/src/devices/bus/c64/vizastar.cpp b/src/devices/bus/c64/vizastar.cpp
index d635ffec656..6c589d2864f 100644
--- a/src/devices/bus/c64/vizastar.cpp
+++ b/src/devices/bus/c64/vizastar.cpp
@@ -58,7 +58,7 @@ const device_type C64_VIZASTAR = &device_creator<c64_vizastar_cartridge_device>;
// c64_vizastar_cartridge_device - constructor
//-------------------------------------------------
-c64_vizastar_cartridge_device::c64_vizastar_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_vizastar_cartridge_device::c64_vizastar_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_VIZASTAR, "VizaStar 64 XL4", tag, owner, clock, "c64_vizastar", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
@@ -78,7 +78,7 @@ void c64_vizastar_cartridge_device::device_start()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_vizastar_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_vizastar_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
diff --git a/src/devices/bus/c64/vizastar.h b/src/devices/bus/c64/vizastar.h
index 4c24f9705be..44606be0d21 100644
--- a/src/devices/bus/c64/vizastar.h
+++ b/src/devices/bus/c64/vizastar.h
@@ -28,14 +28,14 @@ class c64_vizastar_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_vizastar_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_vizastar_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
};
diff --git a/src/devices/bus/c64/vw64.cpp b/src/devices/bus/c64/vw64.cpp
index 3288e492a43..2a57b2b80cc 100644
--- a/src/devices/bus/c64/vw64.cpp
+++ b/src/devices/bus/c64/vw64.cpp
@@ -66,7 +66,7 @@ const device_type C64_VW64 = &device_creator<c64_vizawrite_cartridge_device>;
// c64_vizawrite_cartridge_device - constructor
//-------------------------------------------------
-c64_vizawrite_cartridge_device::c64_vizawrite_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_vizawrite_cartridge_device::c64_vizawrite_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_VW64, "VizaWrite 64", tag, owner, clock, "c64_vizawrite", __FILE__),
device_c64_expansion_card_interface(mconfig, *this), m_game_timer(nullptr)
{
@@ -110,7 +110,7 @@ void c64_vizawrite_cartridge_device::device_timer(emu_timer &timer, device_timer
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_vizawrite_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_vizawrite_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
diff --git a/src/devices/bus/c64/vw64.h b/src/devices/bus/c64/vw64.h
index 906ca3b0b27..e531ec1c260 100644
--- a/src/devices/bus/c64/vw64.h
+++ b/src/devices/bus/c64/vw64.h
@@ -28,7 +28,7 @@ class c64_vizawrite_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_vizawrite_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_vizawrite_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -37,7 +37,7 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override { return 0; }
private:
diff --git a/src/devices/bus/c64/warp_speed.cpp b/src/devices/bus/c64/warp_speed.cpp
index d625fa5ea7d..c1c0188e19f 100644
--- a/src/devices/bus/c64/warp_speed.cpp
+++ b/src/devices/bus/c64/warp_speed.cpp
@@ -85,7 +85,7 @@ ioport_constructor c64_warp_speed_cartridge_device::device_input_ports() const
// c64_warp_speed_cartridge_device - constructor
//-------------------------------------------------
-c64_warp_speed_cartridge_device::c64_warp_speed_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_warp_speed_cartridge_device::c64_warp_speed_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_WARP_SPEED, "C64 Warp Speed cartridge", tag, owner, clock, "c64_warp_speed", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
@@ -116,7 +116,7 @@ void c64_warp_speed_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_warp_speed_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_warp_speed_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml || !romh || !io1 || !io2)
{
@@ -132,7 +132,7 @@ UINT8 c64_warp_speed_cartridge_device::c64_cd_r(address_space &space, offs_t off
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_warp_speed_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_warp_speed_cartridge_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io1)
{
diff --git a/src/devices/bus/c64/warp_speed.h b/src/devices/bus/c64/warp_speed.h
index b3eeca48809..d2ad01ae902 100644
--- a/src/devices/bus/c64/warp_speed.h
+++ b/src/devices/bus/c64/warp_speed.h
@@ -28,7 +28,7 @@ class c64_warp_speed_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_warp_speed_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_warp_speed_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -39,8 +39,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
};
diff --git a/src/devices/bus/c64/westermann.cpp b/src/devices/bus/c64/westermann.cpp
index 6a758428a1f..68f288c710f 100644
--- a/src/devices/bus/c64/westermann.cpp
+++ b/src/devices/bus/c64/westermann.cpp
@@ -26,7 +26,7 @@ const device_type C64_WESTERMANN = &device_creator<c64_westermann_cartridge_devi
// c64_westermann_cartridge_device - constructor
//-------------------------------------------------
-c64_westermann_cartridge_device::c64_westermann_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_westermann_cartridge_device::c64_westermann_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_WESTERMANN, "C64 Westermann cartridge", tag, owner, clock, "c64_westermann", __FILE__),
device_c64_expansion_card_interface(mconfig, *this)
{
@@ -56,7 +56,7 @@ void c64_westermann_cartridge_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_westermann_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_westermann_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
diff --git a/src/devices/bus/c64/westermann.h b/src/devices/bus/c64/westermann.h
index 220b5390925..d4f03fd3835 100644
--- a/src/devices/bus/c64/westermann.h
+++ b/src/devices/bus/c64/westermann.h
@@ -28,7 +28,7 @@ class c64_westermann_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_westermann_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_westermann_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,7 +36,7 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
};
diff --git a/src/devices/bus/c64/xl80.cpp b/src/devices/bus/c64/xl80.cpp
index 561ae033148..a96c2f4a4d7 100644
--- a/src/devices/bus/c64/xl80.cpp
+++ b/src/devices/bus/c64/xl80.cpp
@@ -87,9 +87,9 @@ MC6845_UPDATE_ROW( c64_xl80_device::crtc_update_row )
for (int column = 0; column < x_count; column++)
{
- UINT8 code = m_ram[((ma + column) & 0x7ff)];
- UINT16 addr = (code << 3) | (ra & 0x07);
- UINT8 data = m_char_rom->base()[addr & 0x7ff];
+ uint8_t code = m_ram[((ma + column) & 0x7ff)];
+ uint16_t addr = (code << 3) | (ra & 0x07);
+ uint8_t data = m_char_rom->base()[addr & 0x7ff];
if (column == cursor_x)
{
@@ -158,7 +158,7 @@ machine_config_constructor c64_xl80_device::device_mconfig_additions() const
// c64_xl80_device - constructor
//-------------------------------------------------
-c64_xl80_device::c64_xl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_xl80_device::c64_xl80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_XL80, "XL 80", tag, owner, clock, "c64_xl80", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_crtc(*this, HD46505SP_TAG),
@@ -193,7 +193,7 @@ void c64_xl80_device::device_reset()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_xl80_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_xl80_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!io2 && BIT(offset, 2))
{
@@ -219,7 +219,7 @@ UINT8 c64_xl80_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data,
// c64_cd_w - cartridge data write
//-------------------------------------------------
-void c64_xl80_device::c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+void c64_xl80_device::c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (offset >= 0x9800 && offset < 0xa000)
{
diff --git a/src/devices/bus/c64/xl80.h b/src/devices/bus/c64/xl80.h
index 22caa7a5042..9a80928718e 100644
--- a/src/devices/bus/c64/xl80.h
+++ b/src/devices/bus/c64/xl80.h
@@ -29,7 +29,7 @@ class c64_xl80_device : public device_t,
{
public:
// construction/destruction
- c64_xl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_xl80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -44,8 +44,8 @@ protected:
virtual void device_reset() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
- virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual void c64_cd_w(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override { return 1; }
virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override { return 0; }
@@ -53,7 +53,7 @@ private:
required_device<h46505_device> m_crtc;
required_device<palette_device> m_palette;
required_memory_region m_char_rom;
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
};
diff --git a/src/devices/bus/c64/zaxxon.cpp b/src/devices/bus/c64/zaxxon.cpp
index 5406c584876..af3be3f9daa 100644
--- a/src/devices/bus/c64/zaxxon.cpp
+++ b/src/devices/bus/c64/zaxxon.cpp
@@ -26,7 +26,7 @@ const device_type C64_ZAXXON = &device_creator<c64_zaxxon_cartridge_device>;
// c64_zaxxon_cartridge_device - constructor
//-------------------------------------------------
-c64_zaxxon_cartridge_device::c64_zaxxon_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_zaxxon_cartridge_device::c64_zaxxon_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_ZAXXON, "C64 Zaxxon cartridge", tag, owner, clock, "c64_zaxxon", __FILE__),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
@@ -49,7 +49,7 @@ void c64_zaxxon_cartridge_device::device_start()
// c64_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c64_zaxxon_cartridge_device::c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
+uint8_t c64_zaxxon_cartridge_device::c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (!roml)
{
diff --git a/src/devices/bus/c64/zaxxon.h b/src/devices/bus/c64/zaxxon.h
index 28b8eecc911..78bb7e8b0b6 100644
--- a/src/devices/bus/c64/zaxxon.h
+++ b/src/devices/bus/c64/zaxxon.h
@@ -28,14 +28,14 @@ class c64_zaxxon_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_zaxxon_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_zaxxon_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_c64_expansion_card_interface overrides
- virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
+ virtual uint8_t c64_cd_r(address_space &space, offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) override;
private:
int m_bank;
diff --git a/src/devices/bus/cbm2/24k.cpp b/src/devices/bus/cbm2/24k.cpp
index a31c58a7aaf..586e24b8564 100644
--- a/src/devices/bus/cbm2/24k.cpp
+++ b/src/devices/bus/cbm2/24k.cpp
@@ -26,7 +26,7 @@ const device_type CBM2_24K = &device_creator<cbm2_24k_cartridge_device>;
// cbm2_24k_cartridge_device - constructor
//-------------------------------------------------
-cbm2_24k_cartridge_device::cbm2_24k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm2_24k_cartridge_device::cbm2_24k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CBM2_24K, "24K RAM/ROM cartridge", tag, owner, clock, "cbm2_24k", __FILE__),
device_cbm2_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram")
@@ -48,7 +48,7 @@ void cbm2_24k_cartridge_device::device_start()
// cbm2_bd_r - cartridge data read
//-------------------------------------------------
-UINT8 cbm2_24k_cartridge_device::cbm2_bd_r(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3)
+uint8_t cbm2_24k_cartridge_device::cbm2_bd_r(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3)
{
if (!csbank1)
{
@@ -71,7 +71,7 @@ UINT8 cbm2_24k_cartridge_device::cbm2_bd_r(address_space &space, offs_t offset,
// cbm2_bd_w - cartridge data write
//-------------------------------------------------
-void cbm2_24k_cartridge_device::cbm2_bd_w(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3)
+void cbm2_24k_cartridge_device::cbm2_bd_w(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3)
{
if (!csbank1)
{
diff --git a/src/devices/bus/cbm2/24k.h b/src/devices/bus/cbm2/24k.h
index 6d39d0dd5d5..aef9190849e 100644
--- a/src/devices/bus/cbm2/24k.h
+++ b/src/devices/bus/cbm2/24k.h
@@ -27,17 +27,17 @@ class cbm2_24k_cartridge_device : public device_t,
{
public:
// construction/destruction
- cbm2_24k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm2_24k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_cbm2_expansion_card_interface overrides
- virtual UINT8 cbm2_bd_r(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3) override;
- virtual void cbm2_bd_w(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3) override;
+ virtual uint8_t cbm2_bd_r(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) override;
+ virtual void cbm2_bd_w(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) override;
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
};
diff --git a/src/devices/bus/cbm2/exp.cpp b/src/devices/bus/cbm2/exp.cpp
index e3cbd5e2bee..aff76dee622 100644
--- a/src/devices/bus/cbm2/exp.cpp
+++ b/src/devices/bus/cbm2/exp.cpp
@@ -62,7 +62,7 @@ device_cbm2_expansion_card_interface::~device_cbm2_expansion_card_interface()
// cbm2_expansion_slot_device - constructor
//-------------------------------------------------
-cbm2_expansion_slot_device::cbm2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm2_expansion_slot_device::cbm2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CBM2_EXPANSION_SLOT, "CBM-II expansion port", tag, owner, clock, "cbm2_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this), m_card(nullptr)
@@ -153,7 +153,7 @@ std::string cbm2_expansion_slot_device::get_default_card_software()
// read - cartridge data read
//-------------------------------------------------
-UINT8 cbm2_expansion_slot_device::read(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3)
+uint8_t cbm2_expansion_slot_device::read(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3)
{
if (m_card != nullptr)
{
@@ -168,7 +168,7 @@ UINT8 cbm2_expansion_slot_device::read(address_space &space, offs_t offset, UINT
// write - cartridge data write
//-------------------------------------------------
-void cbm2_expansion_slot_device::write(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3)
+void cbm2_expansion_slot_device::write(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3)
{
if (m_card != nullptr)
{
diff --git a/src/devices/bus/cbm2/exp.h b/src/devices/bus/cbm2/exp.h
index ad66454a746..acba3dcf25e 100644
--- a/src/devices/bus/cbm2/exp.h
+++ b/src/devices/bus/cbm2/exp.h
@@ -66,11 +66,11 @@ class cbm2_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- cbm2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// computer interface
- UINT8 read(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3);
- void write(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3);
+ uint8_t read(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3);
+ void write(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3);
// cartridge interface
int phi2() { return clock(); }
@@ -113,13 +113,13 @@ public:
device_cbm2_expansion_card_interface(const machine_config &mconfig, device_t &device);
virtual ~device_cbm2_expansion_card_interface();
- virtual UINT8 cbm2_bd_r(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3) { return data; };
- virtual void cbm2_bd_w(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3) { };
+ virtual uint8_t cbm2_bd_r(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) { return data; };
+ virtual void cbm2_bd_w(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) { };
protected:
- optional_shared_ptr<UINT8> m_bank1;
- optional_shared_ptr<UINT8> m_bank2;
- optional_shared_ptr<UINT8> m_bank3;
+ optional_shared_ptr<uint8_t> m_bank1;
+ optional_shared_ptr<uint8_t> m_bank2;
+ optional_shared_ptr<uint8_t> m_bank3;
cbm2_expansion_slot_device *m_slot;
};
diff --git a/src/devices/bus/cbm2/hrg.cpp b/src/devices/bus/cbm2/hrg.cpp
index ecc42220d80..81a27fa2ce2 100644
--- a/src/devices/bus/cbm2/hrg.cpp
+++ b/src/devices/bus/cbm2/hrg.cpp
@@ -147,7 +147,7 @@ machine_config_constructor cbm2_hrg_b_t::device_mconfig_additions() const
// cbm2_hrg_t - constructor
//-------------------------------------------------
-cbm2_hrg_t::cbm2_hrg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+cbm2_hrg_t::cbm2_hrg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cbm2_expansion_card_interface(mconfig, *this),
m_gdc(*this, EF9366_TAG),
@@ -155,12 +155,12 @@ cbm2_hrg_t::cbm2_hrg_t(const machine_config &mconfig, device_type type, const ch
{
}
-cbm2_hrg_a_t::cbm2_hrg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm2_hrg_a_t::cbm2_hrg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
cbm2_hrg_t(mconfig, CBM2_HRG_A, "CBM 500/600/700 High Resolution Graphics (A)", tag, owner, clock, "cbm2_hrga", __FILE__)
{
}
-cbm2_hrg_b_t::cbm2_hrg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm2_hrg_b_t::cbm2_hrg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
cbm2_hrg_t(mconfig, CBM2_HRG_B, "CBM 500/600/700 High Resolution Graphics (B)", tag, owner, clock, "cbm2_hrgb", __FILE__)
{
}
@@ -189,7 +189,7 @@ void cbm2_hrg_t::device_reset()
// cbm2_bd_r - cartridge data read
//-------------------------------------------------
-UINT8 cbm2_hrg_t::cbm2_bd_r(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3)
+uint8_t cbm2_hrg_t::cbm2_bd_r(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3)
{
if (!csbank3)
{
@@ -232,7 +232,7 @@ UINT8 cbm2_hrg_t::cbm2_bd_r(address_space &space, offs_t offset, UINT8 data, int
// cbm2_bd_w - cartridge data write
//-------------------------------------------------
-void cbm2_hrg_t::cbm2_bd_w(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3)
+void cbm2_hrg_t::cbm2_bd_w(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3)
{
if (!csbank3)
{
diff --git a/src/devices/bus/cbm2/hrg.h b/src/devices/bus/cbm2/hrg.h
index d4c813a6d48..d7b181c1c81 100644
--- a/src/devices/bus/cbm2/hrg.h
+++ b/src/devices/bus/cbm2/hrg.h
@@ -28,7 +28,7 @@ class cbm2_hrg_t : public device_t,
{
public:
// construction/destruction
- cbm2_hrg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ cbm2_hrg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -39,8 +39,8 @@ protected:
virtual void device_reset() override;
// device_cbm2_expansion_card_interface overrides
- virtual UINT8 cbm2_bd_r(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3) override;
- virtual void cbm2_bd_w(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3) override;
+ virtual uint8_t cbm2_bd_r(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) override;
+ virtual void cbm2_bd_w(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) override;
private:
required_device<ef9365_device> m_gdc;
@@ -54,7 +54,7 @@ class cbm2_hrg_a_t : public cbm2_hrg_t
{
public:
// construction/destruction
- cbm2_hrg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm2_hrg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -67,7 +67,7 @@ class cbm2_hrg_b_t : public cbm2_hrg_t
{
public:
// construction/destruction
- cbm2_hrg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm2_hrg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cbm2/std.cpp b/src/devices/bus/cbm2/std.cpp
index e6e697927dc..4b1e74e8c27 100644
--- a/src/devices/bus/cbm2/std.cpp
+++ b/src/devices/bus/cbm2/std.cpp
@@ -26,7 +26,7 @@ const device_type CBM2_STD = &device_creator<cbm2_standard_cartridge_device>;
// cbm2_standard_cartridge_device - constructor
//-------------------------------------------------
-cbm2_standard_cartridge_device::cbm2_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm2_standard_cartridge_device::cbm2_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CBM2_STD, "CBM-II standard cartridge", tag, owner, clock, "cbm2_standard", __FILE__),
device_cbm2_expansion_card_interface(mconfig, *this)
{
@@ -46,7 +46,7 @@ void cbm2_standard_cartridge_device::device_start()
// cbm2_bd_r - cartridge data read
//-------------------------------------------------
-UINT8 cbm2_standard_cartridge_device::cbm2_bd_r(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3)
+uint8_t cbm2_standard_cartridge_device::cbm2_bd_r(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3)
{
if (!csbank1 && m_bank1.bytes())
{
diff --git a/src/devices/bus/cbm2/std.h b/src/devices/bus/cbm2/std.h
index 1645958e40b..e5c8498d387 100644
--- a/src/devices/bus/cbm2/std.h
+++ b/src/devices/bus/cbm2/std.h
@@ -27,14 +27,14 @@ class cbm2_standard_cartridge_device : public device_t,
{
public:
// construction/destruction
- cbm2_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm2_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_cbm2_expansion_card_interface overrides
- virtual UINT8 cbm2_bd_r(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3) override;
+ virtual uint8_t cbm2_bd_r(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) override;
};
diff --git a/src/devices/bus/cbm2/user.cpp b/src/devices/bus/cbm2/user.cpp
index b6271071a9b..c19adfce06a 100644
--- a/src/devices/bus/cbm2/user.cpp
+++ b/src/devices/bus/cbm2/user.cpp
@@ -42,7 +42,7 @@ device_cbm2_user_port_interface::device_cbm2_user_port_interface(const machine_c
// cbm2_user_port_device - constructor
//-------------------------------------------------
-cbm2_user_port_device::cbm2_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm2_user_port_device::cbm2_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CBM2_USER_PORT, "CBM2 user port", tag, owner, clock, "cbm2_user_port", __FILE__),
device_slot_interface(mconfig, *this),
m_write_irq(*this),
diff --git a/src/devices/bus/cbm2/user.h b/src/devices/bus/cbm2/user.h
index 58810f02f3f..a6246c40fa1 100644
--- a/src/devices/bus/cbm2/user.h
+++ b/src/devices/bus/cbm2/user.h
@@ -78,11 +78,11 @@ public:
device_cbm2_user_port_interface(const machine_config &mconfig, device_t &device);
virtual ~device_cbm2_user_port_interface() { }
- virtual UINT8 cbm2_d1_r(address_space &space, offs_t offset) { return 0xff; };
- virtual void cbm2_d1_w(address_space &space, offs_t offset, UINT8 data) { };
+ virtual uint8_t cbm2_d1_r(address_space &space, offs_t offset) { return 0xff; };
+ virtual void cbm2_d1_w(address_space &space, offs_t offset, uint8_t data) { };
- virtual UINT8 cbm2_d2_r(address_space &space, offs_t offset) { return 0xff; };
- virtual void cbm2_d2_w(address_space &space, offs_t offset, UINT8 data) { };
+ virtual uint8_t cbm2_d2_r(address_space &space, offs_t offset) { return 0xff; };
+ virtual void cbm2_d2_w(address_space &space, offs_t offset, uint8_t data) { };
virtual int cbm2_pb2_r() { return 1; }
virtual void cbm2_pb2_w(int state) { };
@@ -105,7 +105,7 @@ class cbm2_user_port_device : public device_t,
{
public:
// construction/destruction
- cbm2_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm2_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~cbm2_user_port_device() { }
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<cbm2_user_port_device &>(device).m_write_irq.set_callback(object); }
@@ -114,9 +114,9 @@ public:
template<class _Object> static devcb_base &set_flag_wr_callback(device_t &device, _Object object) { return downcast<cbm2_user_port_device &>(device).m_write_flag.set_callback(object); }
// computer interface
- DECLARE_READ8_MEMBER( d1_r ) { UINT8 data = 0xff; if (m_card != nullptr) data = m_card->cbm2_d1_r(space, offset); return data; }
+ DECLARE_READ8_MEMBER( d1_r ) { uint8_t data = 0xff; if (m_card != nullptr) data = m_card->cbm2_d1_r(space, offset); return data; }
DECLARE_WRITE8_MEMBER( d1_w ) { if (m_card != nullptr) m_card->cbm2_d1_w(space, offset, data); }
- DECLARE_READ8_MEMBER( d2_r ) { UINT8 data = 0xff; if (m_card != nullptr) data = m_card->cbm2_d2_r(space, offset); return data; }
+ DECLARE_READ8_MEMBER( d2_r ) { uint8_t data = 0xff; if (m_card != nullptr) data = m_card->cbm2_d2_r(space, offset); return data; }
DECLARE_WRITE8_MEMBER( d2_w ) { if (m_card != nullptr) m_card->cbm2_d2_w(space, offset, data); }
DECLARE_READ_LINE_MEMBER( pb2_r ) { return m_card ? m_card->cbm2_pb2_r() : 1; }
DECLARE_WRITE_LINE_MEMBER( pb2_w ) { if (m_card != nullptr) m_card->cbm2_pb2_w(state); }
diff --git a/src/devices/bus/cbmiec/c1526.cpp b/src/devices/bus/cbmiec/c1526.cpp
index b9f240fde45..d33b9d026c2 100644
--- a/src/devices/bus/cbmiec/c1526.cpp
+++ b/src/devices/bus/cbmiec/c1526.cpp
@@ -170,7 +170,7 @@ ioport_constructor c4023_t::device_input_ports() const
// c1526_base_t - constructor
//-------------------------------------------------
-c1526_base_t:: c1526_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+c1526_base_t:: c1526_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -180,7 +180,7 @@ c1526_base_t:: c1526_base_t(const machine_config &mconfig, device_type type, con
// c1526_t - constructor
//-------------------------------------------------
-c1526_t::c1526_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c1526_t::c1526_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
c1526_base_t(mconfig, C1526, "MPS802/C1526 Printer", tag, owner, clock, "c1526", __FILE__),
device_cbm_iec_interface(mconfig, *this)
{
@@ -191,7 +191,7 @@ c1526_t::c1526_t(const machine_config &mconfig, const char *tag, device_t *owner
// c4023_t - constructor
//-------------------------------------------------
-c4023_t::c4023_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c4023_t::c4023_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
c1526_base_t(mconfig, C4023, "C4023 Printer", tag, owner, clock, "c4023", __FILE__),
device_ieee488_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/c1526.h b/src/devices/bus/cbmiec/c1526.h
index d8ab0567905..c3a127c4580 100644
--- a/src/devices/bus/cbmiec/c1526.h
+++ b/src/devices/bus/cbmiec/c1526.h
@@ -28,7 +28,7 @@ class c1526_base_t : public device_t
{
public:
// construction/destruction
- c1526_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ c1526_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -44,7 +44,7 @@ class c1526_t : public c1526_base_t,
{
public:
// construction/destruction
- c1526_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1526_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -66,7 +66,7 @@ class c4023_t : public c1526_base_t,
{
public:
// construction/destruction
- c4023_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c4023_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp
index 3a763c1f53e..c5c2aaa2741 100644
--- a/src/devices/bus/cbmiec/c1541.cpp
+++ b/src/devices/bus/cbmiec/c1541.cpp
@@ -590,7 +590,7 @@ READ8_MEMBER( c1541_base_t::via0_pb_r )
*/
- UINT8 data;
+ uint8_t data;
// data in
data = !m_bus->data_r() && !m_ga->atn_r();
@@ -687,7 +687,7 @@ READ8_MEMBER( c1541_base_t::via1_pb_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// write protect sense
data |= !m_floppy->wpt_r() << 4;
@@ -999,7 +999,7 @@ inline void c1541_base_t::set_iec_data()
// c1541_base_t - constructor
//-------------------------------------------------
-c1541_base_t:: c1541_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+c1541_base_t:: c1541_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cbm_iec_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this),
@@ -1020,7 +1020,7 @@ c1541_base_t:: c1541_base_t(const machine_config &mconfig, device_type type, con
// c1540_t - constructor
//-------------------------------------------------
-c1540_t::c1540_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1540_t::c1540_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, C1540, "C1540", tag, owner, clock, "c1540", __FILE__) { }
@@ -1028,7 +1028,7 @@ c1540_t::c1540_t(const machine_config &mconfig, const char *tag, device_t *owner
// c1541_t - constructor
//-------------------------------------------------
-c1541_t::c1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541_t::c1541_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, C1541, "C1541", tag, owner, clock, "c1541", __FILE__) { }
@@ -1036,7 +1036,7 @@ c1541_t::c1541_t(const machine_config &mconfig, const char *tag, device_t *owner
// c1541c_t - constructor
//-------------------------------------------------
-c1541c_t::c1541c_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541c_t::c1541c_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, C1541C, "C1541C", tag, owner, clock, "c1541c", __FILE__) { }
@@ -1044,7 +1044,7 @@ c1541c_t::c1541c_t(const machine_config &mconfig, const char *tag, device_t *own
// c1541ii_t - constructor
//-------------------------------------------------
-c1541ii_t::c1541ii_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541ii_t::c1541ii_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, C1541II, "C1541-II", tag, owner, clock, "c1541ii", __FILE__) { }
@@ -1052,7 +1052,7 @@ c1541ii_t::c1541ii_t(const machine_config &mconfig, const char *tag, device_t *o
// sx1541_t - constructor
//-------------------------------------------------
-sx1541_t::sx1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sx1541_t::sx1541_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, SX1541, "SX1541", tag, owner, clock, "sx1541", __FILE__) { }
@@ -1060,7 +1060,7 @@ sx1541_t::sx1541_t(const machine_config &mconfig, const char *tag, device_t *own
// fsd1_t - constructor
//-------------------------------------------------
-fsd1_t::fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fsd1_t::fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, FSD1, "FSD-1", tag, owner, clock, "fsd1", __FILE__) { }
@@ -1068,7 +1068,7 @@ fsd1_t::fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner,
// fsd2_t - constructor
//-------------------------------------------------
-fsd2_t::fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fsd2_t::fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, FSD2, "FSD-2", tag, owner, clock, "fsd2", __FILE__) { }
@@ -1076,7 +1076,7 @@ fsd2_t::fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner,
// csd1_t - constructor
//-------------------------------------------------
-csd1_t::csd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+csd1_t::csd1_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, CSD1, "CSD-1", tag, owner, clock, "csd1", __FILE__) { }
@@ -1084,7 +1084,7 @@ csd1_t::csd1_t(const machine_config &mconfig, const char *tag, device_t *owner,
// c1541_dolphin_dos_t - constructor
//-------------------------------------------------
-c1541_dolphin_dos_t::c1541_dolphin_dos_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541_dolphin_dos_t::c1541_dolphin_dos_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, C1541_DOLPHIN_DOS, "C1541 Dolphin-DOS 2.0", tag, owner, clock, "c1541dd", __FILE__) { }
@@ -1092,7 +1092,7 @@ c1541_dolphin_dos_t::c1541_dolphin_dos_t(const machine_config &mconfig, const ch
// c1541_professional_dos_v1_t - constructor
//-------------------------------------------------
-c1541_professional_dos_v1_t::c1541_professional_dos_v1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541_professional_dos_v1_t::c1541_professional_dos_v1_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, C1541_PROFESSIONAL_DOS_V1, "C1541 Professional-DOS v1", tag, owner, clock, "c1541pd", __FILE__) { }
@@ -1100,7 +1100,7 @@ c1541_professional_dos_v1_t::c1541_professional_dos_v1_t(const machine_config &m
// c1541_prologic_dos_classic_t - constructor
//-------------------------------------------------
-c1541_prologic_dos_classic_t::c1541_prologic_dos_classic_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1541_prologic_dos_classic_t::c1541_prologic_dos_classic_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, C1541_PROLOGIC_DOS_CLASSIC, "C1541 ProLogic-DOS Classic", tag, owner, clock, "c1541pdc", __FILE__),
m_pia(*this, MC6821_TAG),
m_cent_data_out(*this, "cent_data_out"),
@@ -1113,7 +1113,7 @@ c1541_prologic_dos_classic_t::c1541_prologic_dos_classic_t(const machine_config
// indus_gt_t - constructor
//-------------------------------------------------
-indus_gt_t::indus_gt_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+indus_gt_t::indus_gt_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1541_base_t(mconfig, INDUS_GT, "Indus GT", tag, owner, clock, "indusgt", __FILE__) { }
@@ -1137,11 +1137,11 @@ void fsd2_t::device_start()
c1541_base_t::device_start();
// decrypt ROM
- UINT8 *rom = memregion(M6502_TAG)->base();
+ uint8_t *rom = memregion(M6502_TAG)->base();
for (offs_t offset = 0; offset < 0x4000; offset++)
{
- UINT8 data = BITSWAP8(rom[offset], 7, 6, 5, 3, 4, 2, 1, 0);
+ uint8_t data = BITSWAP8(rom[offset], 7, 6, 5, 3, 4, 2, 1, 0);
rom[offset] = data;
}
@@ -1195,7 +1195,7 @@ void c1541_base_t::cbm_iec_reset(int state)
// parallel_data_w -
//-------------------------------------------------
-void c1541_base_t::parallel_data_w(UINT8 data)
+void c1541_base_t::parallel_data_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 7192089e65a..a2ca5a9fed5 100644
--- a/src/devices/bus/cbmiec/c1541.h
+++ b/src/devices/bus/cbmiec/c1541.h
@@ -42,7 +42,7 @@ class c1541_base_t : public device_t,
{
public:
// construction/destruction
- c1541_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ c1541_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -72,7 +72,7 @@ protected:
virtual void cbm_iec_reset(int state) override;
// device_c64_floppy_parallel_interface overrides
- virtual void parallel_data_w(UINT8 data) override;
+ virtual void parallel_data_w(uint8_t data) override;
virtual void parallel_strobe_w(int state) override;
enum
@@ -105,7 +105,7 @@ class c1540_t : public c1541_base_t
{
public:
// construction/destruction
- c1540_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1540_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -118,7 +118,7 @@ class c1541_t : public c1541_base_t
{
public:
// construction/destruction
- c1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -131,7 +131,7 @@ class c1541c_t : public c1541_base_t
{
public:
// construction/destruction
- c1541c_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541c_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -148,7 +148,7 @@ class c1541ii_t : public c1541_base_t
{
public:
// construction/destruction
- c1541ii_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541ii_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -161,7 +161,7 @@ class sx1541_t : public c1541_base_t
{
public:
// construction/destruction
- sx1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sx1541_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -174,7 +174,7 @@ class fsd1_t : public c1541_base_t
{
public:
// construction/destruction
- fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -187,7 +187,7 @@ class fsd2_t : public c1541_base_t
{
public:
// construction/destruction
- fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -203,7 +203,7 @@ class csd1_t : public c1541_base_t
{
public:
// construction/destruction
- csd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ csd1_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -216,7 +216,7 @@ class c1541_dolphin_dos_t : public c1541_base_t
{
public:
// construction/destruction
- c1541_dolphin_dos_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541_dolphin_dos_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -230,7 +230,7 @@ class c1541_professional_dos_v1_t : public c1541_base_t
{
public:
// construction/destruction
- c1541_professional_dos_v1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541_professional_dos_v1_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -244,7 +244,7 @@ class c1541_prologic_dos_classic_t : public c1541_base_t
{
public:
// construction/destruction
- c1541_prologic_dos_classic_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1541_prologic_dos_classic_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -274,7 +274,7 @@ class indus_gt_t : public c1541_base_t
{
public:
// construction/destruction
- indus_gt_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ indus_gt_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp
index b7d98b8b15d..e0118b1b868 100644
--- a/src/devices/bus/cbmiec/c1571.cpp
+++ b/src/devices/bus/cbmiec/c1571.cpp
@@ -193,7 +193,7 @@ READ8_MEMBER( c1571_t::via0_pa_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// track 0 sense
data |= (m_floppy->trk00_r() ? 0x01 : 0x00);
@@ -232,7 +232,7 @@ WRITE8_MEMBER( c1571_t::via0_pa_w )
if (m_1_2mhz != clock_1_2)
{
- UINT32 clock = clock_1_2 ? XTAL_16MHz/8 : XTAL_16MHz/16;
+ uint32_t clock = clock_1_2 ? XTAL_16MHz/8 : XTAL_16MHz/16;
m_maincpu->set_unscaled_clock(clock);
m_cia->set_unscaled_clock(clock);
@@ -274,7 +274,7 @@ WRITE8_MEMBER( c1571cr_t::via0_pa_w )
if (m_1_2mhz != clock_1_2)
{
- UINT32 clock = clock_1_2 ? XTAL_16MHz/8 : XTAL_16MHz/16;
+ uint32_t clock = clock_1_2 ? XTAL_16MHz/8 : XTAL_16MHz/16;
m_maincpu->set_unscaled_clock(clock);
m_cia->set_unscaled_clock(clock);
@@ -303,7 +303,7 @@ READ8_MEMBER( c1571_t::via0_pb_r )
*/
- UINT8 data;
+ uint8_t data;
// data in
data = !m_bus->data_r();
@@ -381,7 +381,7 @@ WRITE8_MEMBER( c1571cr_t::via0_pb_w )
READ8_MEMBER( c1571_t::via1_r )
{
- UINT8 data = m_via1->read(space, offset);
+ uint8_t data = m_via1->read(space, offset);
m_ga->ted_w(!m_1_2mhz);
m_ga->ted_w(1);
@@ -421,7 +421,7 @@ READ8_MEMBER( c1571_t::via1_pb_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// write protect sense
data |= !m_floppy->wpt_r() << 4;
@@ -830,7 +830,7 @@ ioport_constructor c1571_t::device_input_ports() const
// c1571_t - constructor
//-------------------------------------------------
-c1571_t::c1571_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+c1571_t::c1571_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cbm_iec_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this),
@@ -853,7 +853,7 @@ c1571_t::c1571_t(const machine_config &mconfig, device_type type, const char *na
{
}
-c1571_t::c1571_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1571_t::c1571_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, C1571, "C1571", tag, owner, clock, "c1571", __FILE__),
device_cbm_iec_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this),
@@ -881,7 +881,7 @@ c1571_t::c1571_t(const machine_config &mconfig, const char *tag, device_t *owner
// c1570_t - constructor
//-------------------------------------------------
-c1570_t::c1570_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1570_t::c1570_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1571_t(mconfig, C1570, "C1570", tag, owner, clock, "c1570", __FILE__)
{
}
@@ -891,7 +891,7 @@ c1570_t::c1570_t(const machine_config &mconfig, const char *tag, device_t *owner
// c1571cr_t - constructor
//-------------------------------------------------
-c1571cr_t::c1571cr_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1571cr_t::c1571cr_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1571_t(mconfig, C1571CR, "C1571CR", tag, owner, clock, "c1571cr", __FILE__)
{
}
@@ -901,7 +901,7 @@ c1571cr_t::c1571cr_t(const machine_config &mconfig, const char *tag, device_t *o
// mini_chief_t - constructor
//-------------------------------------------------
-mini_chief_t::mini_chief_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mini_chief_t::mini_chief_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1571_t(mconfig, MINI_CHIEF, "ICT Mini Chief", tag, owner, clock, "minichif", __FILE__)
{
}
@@ -999,7 +999,7 @@ void c1571_t::cbm_iec_reset(int state)
// parallel_data_w -
//-------------------------------------------------
-void c1571_t::parallel_data_w(UINT8 data)
+void c1571_t::parallel_data_w(uint8_t data)
{
m_parallel_data = data;
}
diff --git a/src/devices/bus/cbmiec/c1571.h b/src/devices/bus/cbmiec/c1571.h
index 74d90080615..64635542f4d 100644
--- a/src/devices/bus/cbmiec/c1571.h
+++ b/src/devices/bus/cbmiec/c1571.h
@@ -44,8 +44,8 @@ class c1571_t : public device_t,
{
public:
// construction/destruction
- c1571_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- c1571_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1571_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ c1571_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -89,7 +89,7 @@ protected:
virtual void cbm_iec_reset(int state) override;
// device_c64_floppy_parallel_interface overrides
- virtual void parallel_data_w(UINT8 data) override;
+ virtual void parallel_data_w(uint8_t data) override;
virtual void parallel_strobe_w(int state) override;
enum
@@ -131,7 +131,7 @@ class c1570_t : public c1571_t
{
public:
// construction/destruction
- c1570_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1570_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -145,7 +145,7 @@ class c1571cr_t : public c1571_t
{
public:
// construction/destruction
- c1571cr_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1571cr_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -162,7 +162,7 @@ class mini_chief_t : public c1571_t
{
public:
// construction/destruction
- mini_chief_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mini_chief_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp
index 1bfcad12218..005370fa3d8 100644
--- a/src/devices/bus/cbmiec/c1581.cpp
+++ b/src/devices/bus/cbmiec/c1581.cpp
@@ -131,7 +131,7 @@ READ8_MEMBER( c1581_t::cia_pa_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// ready
//data |= !m_floppy->ready_r() << 1;
@@ -192,7 +192,7 @@ READ8_MEMBER( c1581_t::cia_pb_r )
*/
- UINT8 data;
+ uint8_t data;
// data in
data = !m_bus->data_r();
@@ -326,7 +326,7 @@ ioport_constructor c1581_t::device_input_ports() const
// c1581_t - constructor
//-------------------------------------------------
-c1581_t::c1581_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+c1581_t::c1581_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
@@ -342,7 +342,7 @@ c1581_t::c1581_t(const machine_config &mconfig, device_type type, const char *na
{
}
-c1581_t::c1581_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1581_t::c1581_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, C1581, "C1581", tag, owner, clock, "c1581", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
@@ -363,7 +363,7 @@ c1581_t::c1581_t(const machine_config &mconfig, const char *tag, device_t *owner
// c1563_t - constructor
//-------------------------------------------------
-c1563_t::c1563_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1563_t::c1563_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c1581_t(mconfig, C1563, "C1563", tag, owner, clock, "c1563", __FILE__) { }
diff --git a/src/devices/bus/cbmiec/c1581.h b/src/devices/bus/cbmiec/c1581.h
index 0694bc77ab8..e09d0579ebf 100644
--- a/src/devices/bus/cbmiec/c1581.h
+++ b/src/devices/bus/cbmiec/c1581.h
@@ -39,8 +39,8 @@ class c1581_t : public device_t,
{
public:
// construction/destruction
- c1581_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- c1581_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1581_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ c1581_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -96,7 +96,7 @@ class c1563_t : public c1581_t
{
public:
// construction/destruction
- c1563_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1563_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/c64_nl10.cpp b/src/devices/bus/cbmiec/c64_nl10.cpp
index 9ee058adf80..4b9e2afa033 100644
--- a/src/devices/bus/cbmiec/c64_nl10.cpp
+++ b/src/devices/bus/cbmiec/c64_nl10.cpp
@@ -46,7 +46,7 @@ const tiny_rom_entry *c64_nl10_interface_device::device_rom_region() const
// c64_nl10_interface_device - constructor
//-------------------------------------------------
-c64_nl10_interface_device::c64_nl10_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c64_nl10_interface_device::c64_nl10_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, C64_NL10_INTERFACE, "Star NL-10 C64 Interface Cartridge", tag, owner, clock, "c64_nl10", __FILE__),
device_cbm_iec_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/c64_nl10.h b/src/devices/bus/cbmiec/c64_nl10.h
index 99da4a2c141..556cb01d12d 100644
--- a/src/devices/bus/cbmiec/c64_nl10.h
+++ b/src/devices/bus/cbmiec/c64_nl10.h
@@ -27,7 +27,7 @@ class c64_nl10_interface_device : public device_t,
{
public:
// construction/destruction
- c64_nl10_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_nl10_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/cbmiec.cpp b/src/devices/bus/cbmiec/cbmiec.cpp
index 7e893614f3f..a9f47da877f 100644
--- a/src/devices/bus/cbmiec/cbmiec.cpp
+++ b/src/devices/bus/cbmiec/cbmiec.cpp
@@ -245,7 +245,7 @@ device_cbm_iec_interface::~device_cbm_iec_interface()
// cbm_iec_slot_device - constructor
//-------------------------------------------------
-cbm_iec_slot_device::cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm_iec_slot_device::cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CBM_IEC_SLOT, "CBM IEC slot", tag, owner, clock, "cbm_iec_slot", __FILE__),
device_slot_interface(mconfig, *this), m_address(0)
{
@@ -282,7 +282,7 @@ void cbm_iec_slot_device::device_start()
// cbm_iec_device - constructor
//-------------------------------------------------
-cbm_iec_device::cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cbm_iec_device::cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, CBM_IEC, "CBM IEC bus", tag, owner, clock, "cbm_iec", __FILE__),
m_write_srq(*this),
m_write_atn(*this),
diff --git a/src/devices/bus/cbmiec/cbmiec.h b/src/devices/bus/cbmiec/cbmiec.h
index 5be1ff5f818..8ba9b8b2f02 100644
--- a/src/devices/bus/cbmiec/cbmiec.h
+++ b/src/devices/bus/cbmiec/cbmiec.h
@@ -76,7 +76,7 @@ class cbm_iec_device : public device_t
{
public:
// construction/destruction
- cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _write> void set_srq_callback(_write wr) { m_write_srq.set_callback(wr); }
template<class _write> void set_atn_callback(_write wr) { m_write_atn.set_callback(wr); }
@@ -159,7 +159,7 @@ class cbm_iec_slot_device : public device_t,
{
public:
// construction/destruction
- cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void set_address(int address) { m_address = address; }
int get_address() { return m_address; }
diff --git a/src/devices/bus/cbmiec/cmdhd.cpp b/src/devices/bus/cbmiec/cmdhd.cpp
index ef26f7be706..5300b9ef859 100644
--- a/src/devices/bus/cbmiec/cmdhd.cpp
+++ b/src/devices/bus/cbmiec/cmdhd.cpp
@@ -108,7 +108,7 @@ machine_config_constructor cmd_hd_device::device_mconfig_additions() const
// cmd_hd_device - constructor
//-------------------------------------------------
-cmd_hd_device::cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cmd_hd_device::cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, CMD_HD, "HD", tag, owner, clock, "cmdhd", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
diff --git a/src/devices/bus/cbmiec/cmdhd.h b/src/devices/bus/cbmiec/cmdhd.h
index 9869531b05d..40a08021f12 100644
--- a/src/devices/bus/cbmiec/cmdhd.h
+++ b/src/devices/bus/cbmiec/cmdhd.h
@@ -40,7 +40,7 @@ class cmd_hd_device : public device_t,
{
public:
// construction/destruction
- cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/diag264_lb_iec.cpp b/src/devices/bus/cbmiec/diag264_lb_iec.cpp
index d9c2e5ed303..2fc5544dd7b 100644
--- a/src/devices/bus/cbmiec/diag264_lb_iec.cpp
+++ b/src/devices/bus/cbmiec/diag264_lb_iec.cpp
@@ -26,7 +26,7 @@ const device_type DIAG264_SERIAL_LOOPBACK = &device_creator<diag264_serial_loopb
// diag264_serial_loopback_device - constructor
//-------------------------------------------------
-diag264_serial_loopback_device::diag264_serial_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+diag264_serial_loopback_device::diag264_serial_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, DIAG264_SERIAL_LOOPBACK, "Diag264 Serial Loopback", tag, owner, clock, "diag264_serial_loopback", __FILE__),
device_cbm_iec_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/diag264_lb_iec.h b/src/devices/bus/cbmiec/diag264_lb_iec.h
index b76c1fc696e..f58b15e23fb 100644
--- a/src/devices/bus/cbmiec/diag264_lb_iec.h
+++ b/src/devices/bus/cbmiec/diag264_lb_iec.h
@@ -27,7 +27,7 @@ class diag264_serial_loopback_device : public device_t,
{
public:
// construction/destruction
- diag264_serial_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ diag264_serial_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp
index c9040a6c657..91d4e66b74d 100644
--- a/src/devices/bus/cbmiec/fd2000.cpp
+++ b/src/devices/bus/cbmiec/fd2000.cpp
@@ -168,7 +168,7 @@ READ8_MEMBER( fd2000_device::via_pb_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// FDC interrupt
data |= m_fdc->get_irq() << 7;
@@ -274,7 +274,7 @@ machine_config_constructor fd2000_device::device_mconfig_additions() const
// fd2000_device - constructor
//-------------------------------------------------
-fd2000_device::fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fd2000_device::fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, FD2000, "FD-2000", tag, owner, clock, "fd2000", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, G65SC02PI2_TAG),
@@ -284,7 +284,7 @@ fd2000_device::fd2000_device(const machine_config &mconfig, const char *tag, dev
{
}
-fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, uint32_t variant, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, R65C02P4_TAG),
@@ -299,7 +299,7 @@ fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, co
// fd4000_device - constructor
//-------------------------------------------------
-fd4000_device::fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fd4000_device::fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: fd2000_device(mconfig, FD4000, "FD-4000", tag, owner, clock, TYPE_FD4000, "fd4000", __FILE__ ) { }
diff --git a/src/devices/bus/cbmiec/fd2000.h b/src/devices/bus/cbmiec/fd2000.h
index 4a660cd218d..f5c0218ae62 100644
--- a/src/devices/bus/cbmiec/fd2000.h
+++ b/src/devices/bus/cbmiec/fd2000.h
@@ -39,8 +39,8 @@ class fd2000_device : public device_t,
{
public:
// construction/destruction
- fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- fd2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ fd2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, uint32_t variant, const char *shortname, const char *source);
enum
{
@@ -84,7 +84,7 @@ class fd4000_device : public fd2000_device
{
public:
// construction/destruction
- fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
diff --git a/src/devices/bus/cbmiec/interpod.cpp b/src/devices/bus/cbmiec/interpod.cpp
index ebf1a6b3776..b109773722b 100644
--- a/src/devices/bus/cbmiec/interpod.cpp
+++ b/src/devices/bus/cbmiec/interpod.cpp
@@ -153,7 +153,7 @@ machine_config_constructor interpod_device::device_mconfig_additions() const
// interpod_device - constructor
//-------------------------------------------------
-interpod_device::interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+interpod_device::interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, INTERPOD, "Interpod", tag, owner, clock, "interpod", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, R6502_TAG),
diff --git a/src/devices/bus/cbmiec/interpod.h b/src/devices/bus/cbmiec/interpod.h
index 833bcd94a35..28fb987eac8 100644
--- a/src/devices/bus/cbmiec/interpod.h
+++ b/src/devices/bus/cbmiec/interpod.h
@@ -49,7 +49,7 @@ class interpod_device : public device_t,
{
public:
// construction/destruction
- interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/serialbox.cpp b/src/devices/bus/cbmiec/serialbox.cpp
index 617a4c3eded..8642eb5dbd9 100644
--- a/src/devices/bus/cbmiec/serialbox.cpp
+++ b/src/devices/bus/cbmiec/serialbox.cpp
@@ -93,7 +93,7 @@ machine_config_constructor serial_box_device::device_mconfig_additions() const
// serial_box_device - constructor
//-------------------------------------------------
-serial_box_device::serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+serial_box_device::serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SERIAL_BOX, "Serial Box", tag, owner, clock, "serbox", __FILE__),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG)
diff --git a/src/devices/bus/cbmiec/serialbox.h b/src/devices/bus/cbmiec/serialbox.h
index 090ebdfb091..550a501a2a7 100644
--- a/src/devices/bus/cbmiec/serialbox.h
+++ b/src/devices/bus/cbmiec/serialbox.h
@@ -36,7 +36,7 @@ class serial_box_device : public device_t,
{
public:
// construction/destruction
- serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/vic1515.cpp b/src/devices/bus/cbmiec/vic1515.cpp
index c1ab23f427a..e831ad7f8c3 100644
--- a/src/devices/bus/cbmiec/vic1515.cpp
+++ b/src/devices/bus/cbmiec/vic1515.cpp
@@ -108,7 +108,7 @@ ioport_constructor vic1515_t::device_input_ports() const
// vic1515_t - constructor
//-------------------------------------------------
-vic1515_t::vic1515_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vic1515_t::vic1515_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VIC1515, "VIC-1515", tag, owner, clock, "vic1515", __FILE__),
device_cbm_iec_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/vic1515.h b/src/devices/bus/cbmiec/vic1515.h
index 9cf6a53b3d1..998bb1de4f4 100644
--- a/src/devices/bus/cbmiec/vic1515.h
+++ b/src/devices/bus/cbmiec/vic1515.h
@@ -28,7 +28,7 @@ class vic1515_t : public device_t,
{
public:
// construction/destruction
- vic1515_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1515_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/vic1520.cpp b/src/devices/bus/cbmiec/vic1520.cpp
index 9d62de41bb6..8122887bd5f 100644
--- a/src/devices/bus/cbmiec/vic1520.cpp
+++ b/src/devices/bus/cbmiec/vic1520.cpp
@@ -136,7 +136,7 @@ ioport_constructor vic1520_t::device_input_ports() const
// vic1520_t - constructor
//-------------------------------------------------
-vic1520_t::vic1520_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vic1520_t::vic1520_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VIC1520, "VIC-1520", tag, owner, clock, "vic1520", __FILE__),
device_cbm_iec_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/vic1520.h b/src/devices/bus/cbmiec/vic1520.h
index 9f893766bf8..4405f0da327 100644
--- a/src/devices/bus/cbmiec/vic1520.h
+++ b/src/devices/bus/cbmiec/vic1520.h
@@ -28,7 +28,7 @@ class vic1520_t : public device_t,
{
public:
// construction/destruction
- vic1520_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1520_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/centronics/comxpl80.cpp b/src/devices/bus/centronics/comxpl80.cpp
index 2db0e42694a..6192563759d 100644
--- a/src/devices/bus/centronics/comxpl80.cpp
+++ b/src/devices/bus/centronics/comxpl80.cpp
@@ -158,7 +158,7 @@ ioport_constructor comx_pl80_device::device_input_ports() const
// comx_pl80_device - constructor
//-------------------------------------------------
-comx_pl80_device::comx_pl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+comx_pl80_device::comx_pl80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, COMX_PL80, "COMX PL-80", tag, owner, clock, "comx_pl80", __FILE__),
device_centronics_peripheral_interface(mconfig, *this),
m_plotter(*this, "gfx1"),
diff --git a/src/devices/bus/centronics/comxpl80.h b/src/devices/bus/centronics/comxpl80.h
index 9301fcc5ef3..094453a4c97 100644
--- a/src/devices/bus/centronics/comxpl80.h
+++ b/src/devices/bus/centronics/comxpl80.h
@@ -28,7 +28,7 @@ class comx_pl80_device : public device_t,
{
public:
// construction/destruction
- comx_pl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_pl80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -61,15 +61,15 @@ private:
required_ioport m_sw;
// PL-80 plotter state
- UINT16 m_font_addr; // font ROM pack address latch
- UINT8 m_x_motor_phase; // X motor phase
- UINT8 m_y_motor_phase; // Y motor phase
- UINT8 m_z_motor_phase; // Z motor phase
- UINT8 m_plotter_data; // plotter data bus
+ uint16_t m_font_addr; // font ROM pack address latch
+ uint8_t m_x_motor_phase; // X motor phase
+ uint8_t m_y_motor_phase; // Y motor phase
+ uint8_t m_z_motor_phase; // Z motor phase
+ uint8_t m_plotter_data; // plotter data bus
int m_plotter_ack; // plotter acknowledge
int m_plotter_online; // online LED
- UINT8 m_data;
+ uint8_t m_data;
};
diff --git a/src/devices/bus/centronics/covox.cpp b/src/devices/bus/centronics/covox.cpp
index f8d4da11a6b..b6f5b45fe69 100644
--- a/src/devices/bus/centronics/covox.cpp
+++ b/src/devices/bus/centronics/covox.cpp
@@ -33,7 +33,7 @@ MACHINE_CONFIG_END
// centronics_covox_device - constructor
//-------------------------------------------------
-centronics_covox_device::centronics_covox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+centronics_covox_device::centronics_covox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, CENTRONICS_COVOX, "Covox Speech Thing", tag, owner, clock, "covox", __FILE__),
device_centronics_peripheral_interface( mconfig, *this ),
m_dac(*this, "dac"),
@@ -87,7 +87,7 @@ MACHINE_CONFIG_END
// centronics_covox_stereo_device - constructor
//-------------------------------------------------
-centronics_covox_stereo_device::centronics_covox_stereo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+centronics_covox_stereo_device::centronics_covox_stereo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, CENTRONICS_COVOX_STEREO, "Covox (Stereo-in-1)", tag, owner, clock, "covox_stereo", __FILE__),
device_centronics_peripheral_interface( mconfig, *this ),
m_ldac(*this, "ldac"),
diff --git a/src/devices/bus/centronics/covox.h b/src/devices/bus/centronics/covox.h
index 527c8d8e398..48036c05487 100644
--- a/src/devices/bus/centronics/covox.h
+++ b/src/devices/bus/centronics/covox.h
@@ -21,7 +21,7 @@ class centronics_covox_device : public device_t,
{
public:
// construction/destruction
- centronics_covox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ centronics_covox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -44,7 +44,7 @@ private:
void update_dac();
- UINT8 m_data;
+ uint8_t m_data;
};
// device type definition
@@ -57,7 +57,7 @@ class centronics_covox_stereo_device : public device_t,
{
public:
// construction/destruction
- centronics_covox_stereo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ centronics_covox_stereo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -84,7 +84,7 @@ private:
void update_dac();
int m_strobe;
- UINT8 m_data;
+ uint8_t m_data;
int m_autofd;
};
diff --git a/src/devices/bus/centronics/ctronics.cpp b/src/devices/bus/centronics/ctronics.cpp
index 34d2e21f022..852c789d22d 100644
--- a/src/devices/bus/centronics/ctronics.cpp
+++ b/src/devices/bus/centronics/ctronics.cpp
@@ -12,7 +12,7 @@
const device_type CENTRONICS = &device_creator<centronics_device>;
-centronics_device::centronics_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+centronics_device::centronics_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, CENTRONICS, "Centronics", tag, owner, clock, "centronics", __FILE__),
device_slot_interface(mconfig, *this),
m_strobe_handler(*this),
diff --git a/src/devices/bus/centronics/ctronics.h b/src/devices/bus/centronics/ctronics.h
index 51f13348051..1cadbd0f992 100644
--- a/src/devices/bus/centronics/ctronics.h
+++ b/src/devices/bus/centronics/ctronics.h
@@ -102,7 +102,7 @@ class centronics_device : public device_t,
friend class device_centronics_peripheral_interface;
public:
- centronics_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ centronics_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_strobe_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_strobe_handler.set_callback(object); }
template<class _Object> static devcb_base &set_data0_handler(device_t &device, _Object object) { return downcast<centronics_device &>(device).m_data0_handler.set_callback(object); }
diff --git a/src/devices/bus/centronics/digiblst.cpp b/src/devices/bus/centronics/digiblst.cpp
index 1b7ed87ce2f..cea44838ecc 100644
--- a/src/devices/bus/centronics/digiblst.cpp
+++ b/src/devices/bus/centronics/digiblst.cpp
@@ -33,7 +33,7 @@ MACHINE_CONFIG_END
// centronics_covox_device - constructor
//-------------------------------------------------
-centronics_digiblaster_device::centronics_digiblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+centronics_digiblaster_device::centronics_digiblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, CENTRONICS_DIGIBLASTER, "Digiblaster (DIY)", tag, owner, clock, "digiblst", __FILE__),
device_centronics_peripheral_interface( mconfig, *this ),
m_dac(*this, "dac"),
diff --git a/src/devices/bus/centronics/digiblst.h b/src/devices/bus/centronics/digiblst.h
index 6bf4956ee47..4b5924b9f55 100644
--- a/src/devices/bus/centronics/digiblst.h
+++ b/src/devices/bus/centronics/digiblst.h
@@ -27,7 +27,7 @@ class centronics_digiblaster_device : public device_t,
{
public:
// construction/destruction
- centronics_digiblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ centronics_digiblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -50,7 +50,7 @@ private:
void update_dac();
- UINT8 m_data;
+ uint8_t m_data;
};
// device type definition
diff --git a/src/devices/bus/centronics/dsjoy.cpp b/src/devices/bus/centronics/dsjoy.cpp
index de9b1138ec8..2f358ceae3a 100644
--- a/src/devices/bus/centronics/dsjoy.cpp
+++ b/src/devices/bus/centronics/dsjoy.cpp
@@ -5,7 +5,7 @@
const device_type DEMPA_SHINBUNSHA_JOYSTICK = &device_creator<dempa_shinbunsha_joystick_device>;
-dempa_shinbunsha_joystick_device::dempa_shinbunsha_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+dempa_shinbunsha_joystick_device::dempa_shinbunsha_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, DEMPA_SHINBUNSHA_JOYSTICK, "Dempa Shinbunsha Joystick", tag, owner, clock, "dempa_shinbunsha_joystick", __FILE__),
device_centronics_peripheral_interface( mconfig, *this ),
m_lptjoy(*this, "lptjoy"),
diff --git a/src/devices/bus/centronics/dsjoy.h b/src/devices/bus/centronics/dsjoy.h
index c23ddf87e11..5db48e615fb 100644
--- a/src/devices/bus/centronics/dsjoy.h
+++ b/src/devices/bus/centronics/dsjoy.h
@@ -18,7 +18,7 @@ class dempa_shinbunsha_joystick_device : public device_t,
{
public:
// construction/destruction
- dempa_shinbunsha_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dempa_shinbunsha_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -37,7 +37,7 @@ private:
void update_perror();
- UINT8 m_data;
+ uint8_t m_data;
int m_perror;
};
diff --git a/src/devices/bus/centronics/epson_ex800.cpp b/src/devices/bus/centronics/epson_ex800.cpp
index 3e50493f6aa..4305744fcb1 100644
--- a/src/devices/bus/centronics/epson_ex800.cpp
+++ b/src/devices/bus/centronics/epson_ex800.cpp
@@ -357,7 +357,7 @@ ioport_constructor epson_ex800_t::device_input_ports() const
// epson_ex800_t - constructor
//-------------------------------------------------
-epson_ex800_t::epson_ex800_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+epson_ex800_t::epson_ex800_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, EPSON_EX800, "Epson EX-800", tag, owner, clock, "ex800", __FILE__),
device_centronics_peripheral_interface(mconfig, *this),
m_maincpu(*this, "maincpu"),
diff --git a/src/devices/bus/centronics/epson_ex800.h b/src/devices/bus/centronics/epson_ex800.h
index e5dabd1cc42..b1892cc969b 100644
--- a/src/devices/bus/centronics/epson_ex800.h
+++ b/src/devices/bus/centronics/epson_ex800.h
@@ -29,7 +29,7 @@ class epson_ex800_t : public device_t,
{
public:
// construction/destruction
- epson_ex800_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ epson_ex800_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp
index 3eb784999ba..0367206cd78 100644
--- a/src/devices/bus/centronics/epson_lx800.cpp
+++ b/src/devices/bus/centronics/epson_lx800.cpp
@@ -199,7 +199,7 @@ ioport_constructor epson_lx800_t::device_input_ports() const
// epson_lx800_t - constructor
//-------------------------------------------------
-epson_lx800_t::epson_lx800_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+epson_lx800_t::epson_lx800_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, EPSON_LX800, "Epson LX-800", tag, owner, clock, "lx800", __FILE__),
device_centronics_peripheral_interface(mconfig, *this),
m_maincpu(*this, "maincpu"),
@@ -207,7 +207,7 @@ epson_lx800_t::epson_lx800_t(const machine_config &mconfig, const char *tag, dev
{
}
-epson_lx800_t::epson_lx800_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+epson_lx800_t::epson_lx800_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_centronics_peripheral_interface(mconfig, *this),
m_maincpu(*this, "maincpu"),
@@ -250,7 +250,7 @@ void epson_lx800_t::device_reset()
*/
READ8_MEMBER( epson_lx800_t::porta_r )
{
- UINT8 result = 0;
+ uint8_t result = 0;
logerror("%s: lx800_porta_r(%02x)\n", machine().describe_context(), offset);
@@ -280,7 +280,7 @@ WRITE8_MEMBER( epson_lx800_t::porta_w )
*/
READ8_MEMBER( epson_lx800_t::portc_r )
{
- UINT8 result = 0;
+ uint8_t result = 0;
logerror("%s: lx800_portc_r(%02x)\n", machine().describe_context(), offset);
diff --git a/src/devices/bus/centronics/epson_lx800.h b/src/devices/bus/centronics/epson_lx800.h
index a8cd3113749..f960d3f168f 100644
--- a/src/devices/bus/centronics/epson_lx800.h
+++ b/src/devices/bus/centronics/epson_lx800.h
@@ -30,8 +30,8 @@ class epson_lx800_t : public device_t,
{
public:
// construction/destruction
- epson_lx800_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- epson_lx800_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ epson_lx800_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ epson_lx800_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp
index a4578a312d8..d5cebfe8e2e 100644
--- a/src/devices/bus/centronics/epson_lx810l.cpp
+++ b/src/devices/bus/centronics/epson_lx810l.cpp
@@ -288,7 +288,7 @@ INPUT_CHANGED_MEMBER(epson_lx810l_t::online_sw)
// epson_lx810l_t - constructor
//-------------------------------------------------
-epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, EPSON_LX810L, "Epson LX-810L", tag, owner, clock, "lx810l", __FILE__),
device_centronics_peripheral_interface(mconfig, *this),
m_maincpu(*this, "maincpu"),
@@ -308,7 +308,7 @@ epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, const char *tag, d
{
}
-epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_centronics_peripheral_interface(mconfig, *this),
m_maincpu(*this, "maincpu"),
@@ -328,7 +328,7 @@ epson_lx810l_t::epson_lx810l_t(const machine_config &mconfig, device_type type,
{
}
-epson_ap2000_t::epson_ap2000_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+epson_ap2000_t::epson_ap2000_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: epson_lx810l_t(mconfig, EPSON_AP2000, "Epson ActionPrinter 2000", tag, owner, clock, "ap2000", __FILE__)
{ }
@@ -410,9 +410,9 @@ WRITE8_MEMBER(epson_lx810l_t::fakemem_w)
*/
READ8_MEMBER( epson_lx810l_t::porta_r )
{
- UINT8 result = 0;
- UINT8 hp_sensor = m_cr_pos_abs <= 0 ? 0 : 1;
- UINT8 pe_sensor = m_pf_pos_abs <= 0 ? 1 : 0;
+ uint8_t result = 0;
+ uint8_t hp_sensor = m_cr_pos_abs <= 0 ? 0 : 1;
+ uint8_t pe_sensor = m_pf_pos_abs <= 0 ? 1 : 0;
result |= hp_sensor; /* home position */
result |= pe_sensor << 1; /* paper end */
@@ -441,11 +441,11 @@ WRITE8_MEMBER( epson_lx810l_t::porta_w )
*/
READ8_MEMBER( epson_lx810l_t::portb_r )
{
- UINT8 result = ~ioport("DIPSW1")->read();
+ uint8_t result = ~ioport("DIPSW1")->read();
/* if 93C06 is selected */
if (m_93c06_cs) {
- UINT8 do_r = m_eeprom->do_read();
+ uint8_t do_r = m_eeprom->do_read();
result &= 0xfe;
result |= do_r;
}
@@ -457,7 +457,7 @@ READ8_MEMBER( epson_lx810l_t::portb_r )
WRITE8_MEMBER( epson_lx810l_t::portb_w )
{
- UINT8 data_in = BIT(data, 1);
+ uint8_t data_in = BIT(data, 1);
/* if 93C06 is selected */
if (m_93c06_cs)
@@ -478,7 +478,7 @@ WRITE8_MEMBER( epson_lx810l_t::portb_w )
*/
READ8_MEMBER( epson_lx810l_t::portc_r )
{
- UINT8 result = 0;
+ uint8_t result = 0;
/* result |= ioport("serial")->read() << 1; */
result |= !ioport("ONLINE")->read() << 3;
@@ -561,7 +561,7 @@ WRITE_LINE_MEMBER( epson_lx810l_t::e05a30_ready )
Video hardware (simulates paper)
***************************************************************************/
-UINT32 epson_lx810l_t::screen_update_lx810l(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t epson_lx810l_t::screen_update_lx810l(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
int scrolly = -bitmap_line(9);
copyscrollbitmap(bitmap, m_bitmap, 0, nullptr, 1, &scrolly, cliprect);
@@ -609,25 +609,25 @@ WRITE_LINE_MEMBER( epson_lx810l_t::co0_w )
READ8_MEMBER(epson_lx810l_t::an0_r)
{
- UINT8 res = !!(ioport("DIPSW2")->read() & 0x01);
+ uint8_t res = !!(ioport("DIPSW2")->read() & 0x01);
return res - 1; /* DIPSW2.1 */
}
READ8_MEMBER(epson_lx810l_t::an1_r)
{
- UINT8 res = !!(ioport("DIPSW2")->read() & 0x02);
+ uint8_t res = !!(ioport("DIPSW2")->read() & 0x02);
return res - 1; /* DIPSW2.2 */
}
READ8_MEMBER(epson_lx810l_t::an2_r)
{
- UINT8 res = !!(ioport("DIPSW2")->read() & 0x04);
+ uint8_t res = !!(ioport("DIPSW2")->read() & 0x04);
return res - 1; /* DIPSW2.3 */
}
READ8_MEMBER(epson_lx810l_t::an3_r)
{
- UINT8 res = !!(ioport("DIPSW2")->read() & 0x08);
+ uint8_t res = !!(ioport("DIPSW2")->read() & 0x08);
return res - 1; /* DIPSW2.4 */
}
@@ -643,7 +643,7 @@ READ8_MEMBER(epson_lx810l_t::an5_r)
READ8_MEMBER(epson_lx810l_t::an6_r)
{
- UINT8 res = !ioport("LOADEJECT")->read();
+ uint8_t res = !ioport("LOADEJECT")->read();
return res - 1;
}
diff --git a/src/devices/bus/centronics/epson_lx810l.h b/src/devices/bus/centronics/epson_lx810l.h
index aa3fb556d2a..11da3cf8305 100644
--- a/src/devices/bus/centronics/epson_lx810l.h
+++ b/src/devices/bus/centronics/epson_lx810l.h
@@ -41,10 +41,10 @@ class epson_lx810l_t : public device_t,
public:
// construction/destruction
epson_lx810l_t(const machine_config &mconfig, const char *tag,
- device_t *owner, UINT32 clock);
+ device_t *owner, uint32_t clock);
epson_lx810l_t(const machine_config &mconfig, device_type type,
const char *name, const char *tag, device_t *owner,
- UINT32 clock, const char *shortname, const char *source);
+ uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -101,7 +101,7 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(online_sw);
/* Video hardware (simulates paper) */
- UINT32 screen_update_lx810l(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_lx810l(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
#define uabs(x) ((x) > 0 ? (x) : -(x))
unsigned int bitmap_line(int i) { return ((uabs(m_pf_pos_abs) / 6) + i) % m_bitmap.height(); }
@@ -121,13 +121,13 @@ private:
int m_93c06_clk;
int m_93c06_cs;
- UINT16 m_printhead;
+ uint16_t m_printhead;
int m_pf_pos_abs;
int m_cr_pos_abs;
int m_real_cr_pos;
int m_real_cr_steps;
int m_real_cr_dir; /* 1 is going right, -1 is going left */
- UINT8 m_fakemem;
+ uint8_t m_fakemem;
bitmap_rgb32 m_bitmap;
enum {
@@ -142,7 +142,7 @@ class epson_ap2000_t : public epson_lx810l_t
public:
// construction/destruction
epson_ap2000_t(const machine_config &mconfig, const char *tag,
- device_t *owner, UINT32 clock);
+ device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/centronics/nec_p72.cpp b/src/devices/bus/centronics/nec_p72.cpp
index 0baceec3313..2e2533ccc06 100644
--- a/src/devices/bus/centronics/nec_p72.cpp
+++ b/src/devices/bus/centronics/nec_p72.cpp
@@ -81,14 +81,14 @@ void nec_p72_t::device_start()
// nec_p72_t - constructor
//-------------------------------------------------
-nec_p72_t::nec_p72_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nec_p72_t::nec_p72_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NEC_P72, "NEC PinWrite P72", tag, owner, clock, "p72", __FILE__),
device_centronics_peripheral_interface(mconfig, *this),
m_maincpu(*this, "maincpu")
{
}
-nec_p72_t::nec_p72_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nec_p72_t::nec_p72_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_centronics_peripheral_interface(mconfig, *this),
m_maincpu(*this, "maincpu")
diff --git a/src/devices/bus/centronics/nec_p72.h b/src/devices/bus/centronics/nec_p72.h
index 3638170d4b5..58c8f0a61f4 100644
--- a/src/devices/bus/centronics/nec_p72.h
+++ b/src/devices/bus/centronics/nec_p72.h
@@ -22,10 +22,10 @@ class nec_p72_t : public device_t,
public:
// construction/destruction
nec_p72_t(const machine_config &mconfig, const char *tag,
- device_t *owner, UINT32 clock);
+ device_t *owner, uint32_t clock);
nec_p72_t(const machine_config &mconfig, device_type type,
const char *name, const char *tag, device_t *owner,
- UINT32 clock, const char *shortname, const char *source);
+ uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/centronics/printer.cpp b/src/devices/bus/centronics/printer.cpp
index 50ca485c094..3a09169ddee 100644
--- a/src/devices/bus/centronics/printer.cpp
+++ b/src/devices/bus/centronics/printer.cpp
@@ -24,7 +24,7 @@ MACHINE_CONFIG_END
// centronics_printer_device - constructor
//-------------------------------------------------
-centronics_printer_device::centronics_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+centronics_printer_device::centronics_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CENTRONICS_PRINTER, "Centronics Printer", tag, owner, clock, "centronics_printer", __FILE__),
device_centronics_peripheral_interface( mconfig, *this ),
m_strobe(0),
diff --git a/src/devices/bus/centronics/printer.h b/src/devices/bus/centronics/printer.h
index 7e0ce223e7f..4c3cfa30393 100644
--- a/src/devices/bus/centronics/printer.h
+++ b/src/devices/bus/centronics/printer.h
@@ -15,7 +15,7 @@ class centronics_printer_device : public device_t,
{
public:
// construction/destruction
- centronics_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ centronics_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) override;
virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_data |= 0x01; else m_data &= ~0x01; }
@@ -46,7 +46,7 @@ private:
};
int m_strobe;
- UINT8 m_data;
+ uint8_t m_data;
int m_busy;
required_device<printer_image_device> m_printer;
diff --git a/src/devices/bus/cgenie/expansion/expansion.cpp b/src/devices/bus/cgenie/expansion/expansion.cpp
index 632d921ef9c..085c8f73ca2 100644
--- a/src/devices/bus/cgenie/expansion/expansion.cpp
+++ b/src/devices/bus/cgenie/expansion/expansion.cpp
@@ -26,7 +26,7 @@ const device_type EXPANSION_SLOT = &device_creator<expansion_slot_device>;
// expansion_slot_device - constructor
//-------------------------------------------------
-expansion_slot_device::expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+expansion_slot_device::expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, EXPANSION_SLOT, "Expansion Slot", tag, owner, clock, "expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_program(nullptr),
diff --git a/src/devices/bus/cgenie/expansion/expansion.h b/src/devices/bus/cgenie/expansion/expansion.h
index a78829ad37b..e73abe6cb5e 100644
--- a/src/devices/bus/cgenie/expansion/expansion.h
+++ b/src/devices/bus/cgenie/expansion/expansion.h
@@ -70,7 +70,7 @@ class expansion_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~expansion_slot_device();
void set_program_space(address_space *program);
diff --git a/src/devices/bus/cgenie/expansion/floppy.cpp b/src/devices/bus/cgenie/expansion/floppy.cpp
index 676d73a0659..f82d38d3485 100644
--- a/src/devices/bus/cgenie/expansion/floppy.cpp
+++ b/src/devices/bus/cgenie/expansion/floppy.cpp
@@ -103,7 +103,7 @@ machine_config_constructor cgenie_fdc_device::device_mconfig_additions() const
// cgenie_fdc_device - constructor
//-------------------------------------------------
-cgenie_fdc_device::cgenie_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cgenie_fdc_device::cgenie_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CGENIE_FDC, "Floppy Disc Controller", tag, owner, clock, "cgenie_fdc", __FILE__),
device_expansion_interface(mconfig, *this),
m_fdc(*this, "fd1793"),
@@ -151,7 +151,7 @@ void cgenie_fdc_device::device_reset()
READ8_MEMBER( cgenie_fdc_device::irq_r )
{
- UINT8 data = m_irq_status;
+ uint8_t data = m_irq_status;
m_irq_status &= ~IRQ_TIMER;
m_slot->int_w(m_irq_status ? ASSERT_LINE : CLEAR_LINE);
@@ -167,7 +167,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( cgenie_fdc_device::timer_callback )
DEVICE_IMAGE_LOAD_MEMBER( cgenie_fdc_device, socket_load )
{
- UINT32 size = m_socket->common_get_size("rom");
+ uint32_t size = m_socket->common_get_size("rom");
if (size > 0x1000)
{
diff --git a/src/devices/bus/cgenie/expansion/floppy.h b/src/devices/bus/cgenie/expansion/floppy.h
index 8717371fc89..218b8a94bd1 100644
--- a/src/devices/bus/cgenie/expansion/floppy.h
+++ b/src/devices/bus/cgenie/expansion/floppy.h
@@ -27,7 +27,7 @@ class cgenie_fdc_device : public device_t, public device_expansion_interface
{
public:
// construction/destruction
- cgenie_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cgenie_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_ADDRESS_MAP(mmio, 8);
@@ -65,7 +65,7 @@ private:
floppy_image_device *m_floppy;
- UINT8 m_irq_status;
+ uint8_t m_irq_status;
};
// device type definition
diff --git a/src/devices/bus/cgenie/parallel/joystick.cpp b/src/devices/bus/cgenie/parallel/joystick.cpp
index 0971226d8e0..caeeee8cfe0 100644
--- a/src/devices/bus/cgenie/parallel/joystick.cpp
+++ b/src/devices/bus/cgenie/parallel/joystick.cpp
@@ -92,7 +92,7 @@ ioport_constructor cgenie_joystick_device::device_input_ports() const
// cgenie_joystick_device - constructor
//-------------------------------------------------
-cgenie_joystick_device::cgenie_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cgenie_joystick_device::cgenie_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CGENIE_JOYSTICK, "Joystick Interface EG2013", tag, owner, clock, "cgenie_joystick", __FILE__),
device_parallel_interface(mconfig, *this),
m_joy(*this, "JOY.%u", 0),
@@ -122,7 +122,7 @@ void cgenie_joystick_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-void cgenie_joystick_device::pa_w(UINT8 data)
+void cgenie_joystick_device::pa_w(uint8_t data)
{
if (VERBOSE)
logerror("%s: pa_w %02x\n", tag(), data);
@@ -131,9 +131,9 @@ void cgenie_joystick_device::pa_w(UINT8 data)
m_select = data & 0x3f;
}
-UINT8 cgenie_joystick_device::pb_r()
+uint8_t cgenie_joystick_device::pb_r()
{
- UINT8 data = 0x0f;
+ uint8_t data = 0x0f;
// read button state
for (int i = 0; i < 4; i++)
diff --git a/src/devices/bus/cgenie/parallel/joystick.h b/src/devices/bus/cgenie/parallel/joystick.h
index bbdb32e5444..61ce928d673 100644
--- a/src/devices/bus/cgenie/parallel/joystick.h
+++ b/src/devices/bus/cgenie/parallel/joystick.h
@@ -25,21 +25,21 @@ class cgenie_joystick_device : public device_t, public device_parallel_interface
{
public:
// construction/destruction
- cgenie_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cgenie_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual void device_start() override;
virtual void device_reset() override;
virtual ioport_constructor device_input_ports() const override;
- virtual void pa_w(UINT8 data) override;
- virtual UINT8 pb_r() override;
+ virtual void pa_w(uint8_t data) override;
+ virtual uint8_t pb_r() override;
private:
required_ioport_array<4> m_joy;
required_ioport_array<6> m_keypad;
- UINT8 m_select;
+ uint8_t m_select;
};
// device type definition
diff --git a/src/devices/bus/cgenie/parallel/parallel.cpp b/src/devices/bus/cgenie/parallel/parallel.cpp
index d147a550135..ca3681ec715 100644
--- a/src/devices/bus/cgenie/parallel/parallel.cpp
+++ b/src/devices/bus/cgenie/parallel/parallel.cpp
@@ -26,7 +26,7 @@ const device_type PARALLEL_SLOT = &device_creator<parallel_slot_device>;
// parallel_slot_device - constructor
//-------------------------------------------------
-parallel_slot_device::parallel_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+parallel_slot_device::parallel_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PARALLEL_SLOT, "Parallel Slot", tag, owner, clock, "parallel_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_cart(nullptr)
diff --git a/src/devices/bus/cgenie/parallel/parallel.h b/src/devices/bus/cgenie/parallel/parallel.h
index 2c52f54bd2c..b12a0c3709b 100644
--- a/src/devices/bus/cgenie/parallel/parallel.h
+++ b/src/devices/bus/cgenie/parallel/parallel.h
@@ -46,7 +46,7 @@ class parallel_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- parallel_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ parallel_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~parallel_slot_device();
// IOA
@@ -73,11 +73,11 @@ public:
device_parallel_interface(const machine_config &mconfig, device_t &device);
virtual ~device_parallel_interface();
- virtual UINT8 pa_r() { return 0xff; };
- virtual void pa_w(UINT8 data) {};
+ virtual uint8_t pa_r() { return 0xff; };
+ virtual void pa_w(uint8_t data) {};
- virtual UINT8 pb_r() { return 0xff; };
- virtual void pb_w(UINT8 data) {};
+ virtual uint8_t pb_r() { return 0xff; };
+ virtual void pb_w(uint8_t data) {};
protected:
parallel_slot_device *m_slot;
diff --git a/src/devices/bus/cgenie/parallel/printer.cpp b/src/devices/bus/cgenie/parallel/printer.cpp
index f9963844dd5..7d2a0ac8978 100644
--- a/src/devices/bus/cgenie/parallel/printer.cpp
+++ b/src/devices/bus/cgenie/parallel/printer.cpp
@@ -50,7 +50,7 @@ machine_config_constructor cgenie_printer_device::device_mconfig_additions() con
// cgenie_printer_device - constructor
//-------------------------------------------------
-cgenie_printer_device::cgenie_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cgenie_printer_device::cgenie_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CGENIE_PRINTER, "Printer Interface EG2012", tag, owner, clock, "cgenie_printer", __FILE__),
device_parallel_interface(mconfig, *this),
m_centronics(*this, "centronics"),
@@ -103,7 +103,7 @@ WRITE_LINE_MEMBER( cgenie_printer_device::fault_w )
m_centronics_ready = state;
}
-void cgenie_printer_device::pa_w(UINT8 data)
+void cgenie_printer_device::pa_w(uint8_t data)
{
if (VERBOSE)
logerror("%s: pa_w %02x\n", tag(), data);
@@ -111,9 +111,9 @@ void cgenie_printer_device::pa_w(UINT8 data)
m_latch->write(data);
}
-UINT8 cgenie_printer_device::pb_r()
+uint8_t cgenie_printer_device::pb_r()
{
- UINT8 data = 0x0f;
+ uint8_t data = 0x0f;
data |= m_centronics_ready << 4;
data |= m_centronics_unit_sel << 5;
@@ -123,7 +123,7 @@ UINT8 cgenie_printer_device::pb_r()
return data;
}
-void cgenie_printer_device::pb_w(UINT8 data)
+void cgenie_printer_device::pb_w(uint8_t data)
{
if (VERBOSE)
logerror("%s: pa_w %02x\n", tag(), data);
diff --git a/src/devices/bus/cgenie/parallel/printer.h b/src/devices/bus/cgenie/parallel/printer.h
index 6faec62f308..e4addaef23a 100644
--- a/src/devices/bus/cgenie/parallel/printer.h
+++ b/src/devices/bus/cgenie/parallel/printer.h
@@ -26,7 +26,7 @@ class cgenie_printer_device : public device_t, public device_parallel_interface
{
public:
// construction/destruction
- cgenie_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cgenie_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_WRITE_LINE_MEMBER(busy_w);
DECLARE_WRITE_LINE_MEMBER(perror_w);
@@ -38,9 +38,9 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual void pa_w(UINT8 data) override;
- virtual UINT8 pb_r() override;
- virtual void pb_w(UINT8 data) override;
+ virtual void pa_w(uint8_t data) override;
+ virtual uint8_t pb_r() override;
+ virtual void pb_w(uint8_t data) override;
private:
required_device<centronics_device> m_centronics;
diff --git a/src/devices/bus/chanf/rom.cpp b/src/devices/bus/chanf/rom.cpp
index 858e52ad2e3..9e2e0479e89 100644
--- a/src/devices/bus/chanf/rom.cpp
+++ b/src/devices/bus/chanf/rom.cpp
@@ -31,39 +31,39 @@ const device_type CHANF_ROM_MULTI_OLD = &device_creator<chanf_multi_old_device>;
const device_type CHANF_ROM_MULTI_FINAL = &device_creator<chanf_multi_final_device>;
-chanf_rom_device::chanf_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+chanf_rom_device::chanf_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_channelf_cart_interface( mconfig, *this ), m_addr_latch(0), m_addr(0), m_read_write(0), m_data0(0)
{
}
-chanf_rom_device::chanf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+chanf_rom_device::chanf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, CHANF_ROM_STD, "Channel F Standard Carts", tag, owner, clock, "chanf_rom", __FILE__),
device_channelf_cart_interface( mconfig, *this ), m_addr_latch(0), m_addr(0), m_read_write(0), m_data0(0)
{
}
-chanf_maze_device::chanf_maze_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+chanf_maze_device::chanf_maze_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: chanf_rom_device(mconfig, CHANF_ROM_MAZE, "Channel F Maze Cart", tag, owner, clock, "chanf_maze", __FILE__)
{
}
-chanf_hangman_device::chanf_hangman_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+chanf_hangman_device::chanf_hangman_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: chanf_rom_device(mconfig, CHANF_ROM_HANGMAN, "Channel F Hangman Cart", tag, owner, clock, "chanf_hang", __FILE__)
{
}
-chanf_chess_device::chanf_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+chanf_chess_device::chanf_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: chanf_rom_device(mconfig, CHANF_ROM_CHESS, "Channel F Chess Cart", tag, owner, clock, "chanf_chess", __FILE__)
{
}
-chanf_multi_old_device::chanf_multi_old_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+chanf_multi_old_device::chanf_multi_old_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: chanf_rom_device(mconfig, CHANF_ROM_MULTI_OLD, "Channel F Multigame (Earlier Version) Cart", tag, owner, clock, "chanf_multi_old", __FILE__), m_base_bank(0)
{
}
-chanf_multi_final_device::chanf_multi_final_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+chanf_multi_final_device::chanf_multi_final_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: chanf_rom_device(mconfig, CHANF_ROM_MULTI_FINAL, "Channel F Multigame (Final Version) Cart", tag, owner, clock, "chanf_multi_fin", __FILE__), m_base_bank(0), m_half_bank(0)
{
}
@@ -154,7 +154,7 @@ READ8_MEMBER(chanf_rom_device::read_rom)
}
// These are shared among Maze & Hangman cart types (not directly used by base chanf_rom_device)
-UINT8 chanf_rom_device::common_read_2102(UINT32 offset)
+uint8_t chanf_rom_device::common_read_2102(uint32_t offset)
{
if (offset == 0)
{
@@ -171,7 +171,7 @@ UINT8 chanf_rom_device::common_read_2102(UINT32 offset)
return m_latch[1];
}
-void chanf_rom_device::common_write_2102(UINT32 offset, UINT8 data)
+void chanf_rom_device::common_write_2102(uint32_t offset, uint8_t data)
{
if (offset == 0)
{
@@ -192,13 +192,13 @@ void chanf_rom_device::common_write_2102(UINT32 offset, UINT8 data)
m_latch[1] = data;
// all bits but 2,3 come from this write, but they are shuffled
// notice that data is 8bits, so when swapping bit8 & bit9 are always 0!
- m_addr_latch = (m_addr_latch & 0x0c) | (BITSWAP16((UINT16) data, 15, 14, 13, 12, 11, 10, 7, 6, 5, 3, 2, 1, 9, 8, 4, 0));
+ m_addr_latch = (m_addr_latch & 0x0c) | (BITSWAP16((uint16_t) data, 15, 14, 13, 12, 11, 10, 7, 6, 5, 3, 2, 1, 9, 8, 4, 0));
}
}
// These are shared among Schach & Multigame cart types (not directly used by base chanf_rom_device)
-UINT8 chanf_rom_device::common_read_3853(UINT32 offset)
+uint8_t chanf_rom_device::common_read_3853(uint32_t offset)
{
if (offset < m_ram.size())
return m_ram[offset];
@@ -206,7 +206,7 @@ UINT8 chanf_rom_device::common_read_3853(UINT32 offset)
return 0xff;
}
-void chanf_rom_device::common_write_3853(UINT32 offset, UINT8 data)
+void chanf_rom_device::common_write_3853(uint32_t offset, uint8_t data)
{
if (offset < m_ram.size())
m_ram[offset] = data;
diff --git a/src/devices/bus/chanf/rom.h b/src/devices/bus/chanf/rom.h
index 4591865ec05..7fd8944ba99 100644
--- a/src/devices/bus/chanf/rom.h
+++ b/src/devices/bus/chanf/rom.h
@@ -13,17 +13,17 @@ class chanf_rom_device : public device_t,
{
public:
// construction/destruction
- chanf_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- chanf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ chanf_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ chanf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override {}
virtual void device_reset() override {}
- UINT8 common_read_2102(UINT32 offset);
- UINT8 common_read_3853(UINT32 offset);
- void common_write_2102(UINT32 offset, UINT8 data);
- void common_write_3853(UINT32 offset, UINT8 data);
+ uint8_t common_read_2102(uint32_t offset);
+ uint8_t common_read_3853(uint32_t offset);
+ void common_write_2102(uint32_t offset, uint8_t data);
+ void common_write_3853(uint32_t offset, uint8_t data);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
@@ -31,8 +31,8 @@ public:
protected:
// used for RAM chip in Hangman & Maze
- UINT8 m_latch[2]; // PORT A & PORT B
- UINT16 m_addr_latch, m_addr;
+ uint8_t m_latch[2]; // PORT A & PORT B
+ uint16_t m_addr_latch, m_addr;
int m_read_write, m_data0;
};
@@ -42,7 +42,7 @@ class chanf_maze_device : public chanf_rom_device
{
public:
// construction/destruction
- chanf_maze_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ chanf_maze_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -60,7 +60,7 @@ class chanf_hangman_device : public chanf_rom_device
{
public:
// construction/destruction
- chanf_hangman_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ chanf_hangman_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -78,7 +78,7 @@ class chanf_chess_device : public chanf_rom_device
{
public:
// construction/destruction
- chanf_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ 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); }
@@ -92,7 +92,7 @@ class chanf_multi_old_device : public chanf_rom_device
{
public:
// construction/destruction
- chanf_multi_old_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ chanf_multi_old_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -115,7 +115,7 @@ class chanf_multi_final_device : public chanf_rom_device
{
public:
// construction/destruction
- chanf_multi_final_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ chanf_multi_final_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/chanf/slot.cpp b/src/devices/bus/chanf/slot.cpp
index 3aa7e43146d..ba0fbb622a8 100644
--- a/src/devices/bus/chanf/slot.cpp
+++ b/src/devices/bus/chanf/slot.cpp
@@ -45,7 +45,7 @@ device_channelf_cart_interface::~device_channelf_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_channelf_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_channelf_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -59,7 +59,7 @@ void device_channelf_cart_interface::rom_alloc(UINT32 size, const char *tag)
// ram_alloc - alloc the space for the ram
//-------------------------------------------------
-void device_channelf_cart_interface::ram_alloc(UINT32 size)
+void device_channelf_cart_interface::ram_alloc(uint32_t size)
{
m_ram.resize(size);
}
@@ -72,7 +72,7 @@ void device_channelf_cart_interface::ram_alloc(UINT32 size)
//-------------------------------------------------
// channelf_cart_slot_device - constructor
//-------------------------------------------------
-channelf_cart_slot_device::channelf_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+channelf_cart_slot_device::channelf_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CHANF_CART_SLOT, "Fairchild Channel F Cartridge Slot", tag, owner, clock, "cf_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -163,7 +163,7 @@ image_init_result channelf_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT32 len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
+ uint32_t len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
m_cart->rom_alloc(len, tag());
if (software_entry() == nullptr)
@@ -210,7 +210,7 @@ std::string channelf_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- UINT32 len = m_file->size();
+ uint32_t len = m_file->size();
int type;
if (len == 0x40000)
diff --git a/src/devices/bus/chanf/slot.h b/src/devices/bus/chanf/slot.h
index d34b57fdb04..2c802b8e7c0 100644
--- a/src/devices/bus/chanf/slot.h
+++ b/src/devices/bus/chanf/slot.h
@@ -38,20 +38,20 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_ram) {}
virtual DECLARE_WRITE8_MEMBER(write_bank) {}
- void rom_alloc(UINT32 size, const char *tag);
- void ram_alloc(UINT32 size);
- UINT8* get_rom_base() { return m_rom; }
- UINT8* get_ram_base() { return &m_ram[0]; }
- UINT32 get_rom_size() { return m_rom_size; }
- UINT32 get_ram_size() { return m_ram.size(); }
+ void rom_alloc(uint32_t size, const char *tag);
+ void ram_alloc(uint32_t size);
+ uint8_t* get_rom_base() { return m_rom; }
+ uint8_t* get_ram_base() { return &m_ram[0]; }
+ uint32_t get_rom_size() { return m_rom_size; }
+ uint32_t get_ram_size() { return m_ram.size(); }
void save_ram() { device().save_item(NAME(m_ram)); }
protected:
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT8> m_ram;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint8_t> m_ram;
};
@@ -63,7 +63,7 @@ class channelf_cart_slot_device : public device_t,
{
public:
// construction/destruction
- channelf_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ channelf_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~channelf_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/coco/coco_232.cpp b/src/devices/bus/coco/coco_232.cpp
index a1b9c673c4b..e6b005756bf 100644
--- a/src/devices/bus/coco/coco_232.cpp
+++ b/src/devices/bus/coco/coco_232.cpp
@@ -41,7 +41,7 @@ const device_type COCO_232 = &device_creator<coco_232_device>;
// coco_232_device - constructor
//-------------------------------------------------
-coco_232_device::coco_232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+coco_232_device::coco_232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, COCO_232, "CoCo RS-232 PAK", tag, owner, clock, "coco_232", __FILE__),
device_cococart_interface( mconfig, *this ),
m_uart(*this, UART_TAG)
@@ -72,7 +72,7 @@ machine_config_constructor coco_232_device::device_mconfig_additions() const
READ8_MEMBER(coco_232_device::read)
{
- UINT8 result = 0x00;
+ uint8_t result = 0x00;
if ((offset >= 0x28) && (offset <= 0x2F))
result = m_uart->read(space, offset - 0x28);
diff --git a/src/devices/bus/coco/coco_232.h b/src/devices/bus/coco/coco_232.h
index 708d89cccf4..65bf44f6e61 100644
--- a/src/devices/bus/coco/coco_232.h
+++ b/src/devices/bus/coco/coco_232.h
@@ -21,7 +21,7 @@ class coco_232_device :
{
public:
// construction/destruction
- coco_232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ coco_232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/coco/coco_dwsock.cpp b/src/devices/bus/coco/coco_dwsock.cpp
index 6525cbaa97b..afd8e4dad5f 100644
--- a/src/devices/bus/coco/coco_dwsock.cpp
+++ b/src/devices/bus/coco/coco_dwsock.cpp
@@ -64,7 +64,7 @@ INPUT_CHANGED_MEMBER(beckerport_device::drivewire_port_changed)
// beckerport_device - constructor / destructor
//-------------------------------------------------
-beckerport_device::beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+beckerport_device::beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, COCO_DWSOCK, "Virtual Becker Port", tag, owner, clock, "coco_dwsock", __FILE__), m_hostname(nullptr),
m_dwconfigport(*this, DRIVEWIRE_PORT_TAG), m_dwtcpport(0)
{
@@ -91,7 +91,7 @@ void beckerport_device::device_start(void)
osd_printf_verbose("Connecting to Drivewire server on %s:%d... ", m_hostname, m_dwtcpport);
- UINT64 filesize; // unused
+ uint64_t filesize; // unused
osd_file::error filerr = osd_file::open(chAddress, 0, m_pSocket, filesize);
if (filerr != osd_file::error::NONE)
{
diff --git a/src/devices/bus/coco/coco_dwsock.h b/src/devices/bus/coco/coco_dwsock.h
index d3af3fbb525..b8b2e1d3cc4 100644
--- a/src/devices/bus/coco/coco_dwsock.h
+++ b/src/devices/bus/coco/coco_dwsock.h
@@ -25,7 +25,7 @@
class beckerport_device : public device_t
{
public:
- beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~beckerport_device();
// optional information overrides
diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp
index 8e19f273ee0..c80ebc61391 100644
--- a/src/devices/bus/coco/coco_fdc.cpp
+++ b/src/devices/bus/coco/coco_fdc.cpp
@@ -74,7 +74,7 @@ class coco_fdc_device_base : public coco_family_fdc_device_base
{
public:
// construction/destruction
- coco_fdc_device_base(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ coco_fdc_device_base(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
enum class rtc_type
@@ -91,7 +91,7 @@ protected:
// methods
virtual void update_lines() override;
- void dskreg_w(UINT8 data);
+ void dskreg_w(uint8_t data);
rtc_type real_time_clock();
// devices
@@ -168,7 +168,7 @@ void coco_family_fdc_device_base::device_reset()
// coco_family_fdc_device_base::get_cart_base
//-------------------------------------------------
-UINT8* coco_family_fdc_device_base::get_cart_base()
+uint8_t* coco_family_fdc_device_base::get_cart_base()
{
return memregion("eprom")->base();
}
@@ -182,7 +182,7 @@ UINT8* coco_family_fdc_device_base::get_cart_base()
// coco_fdc_device_base - constructor
//-------------------------------------------------
-coco_fdc_device_base::coco_fdc_device_base(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+coco_fdc_device_base::coco_fdc_device_base(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: coco_family_fdc_device_base(mconfig, type, name, tag, owner, clock, shortname, source)
, m_wd17xx(*this, WD_TAG)
, m_ds1315(*this, CLOUD9_TAG)
@@ -246,10 +246,10 @@ void coco_fdc_device_base::update_lines()
// dskreg_w - function to write to CoCo dskreg
//-------------------------------------------------
-void coco_fdc_device_base::dskreg_w(UINT8 data)
+void coco_fdc_device_base::dskreg_w(uint8_t data)
{
- UINT8 drive = 0;
- UINT8 head;
+ uint8_t drive = 0;
+ uint8_t head;
if (LOG_FDC)
{
@@ -310,7 +310,7 @@ void coco_fdc_device_base::dskreg_w(UINT8 data)
READ8_MEMBER(coco_fdc_device_base::read)
{
- UINT8 result = 0;
+ uint8_t result = 0;
switch(offset & 0xEF)
{
@@ -414,7 +414,7 @@ namespace
{
public:
// construction/destruction
- coco_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ coco_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: coco_fdc_device_base(mconfig, COCO_FDC, "CoCo FDC", tag, owner, clock, "coco_fdc", __FILE__)
{
}
@@ -450,7 +450,7 @@ namespace
{
public:
// construction/destruction
- coco_fdc_v11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ coco_fdc_v11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: coco_fdc_device_base(mconfig, COCO_FDC_V11, "CoCo FDC v1.1", tag, owner, clock, "coco_fdc_v11", __FILE__)
{
}
@@ -485,7 +485,7 @@ namespace
{
public:
// construction/destruction
- coco3_hdb1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ coco3_hdb1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: coco_fdc_device_base(mconfig, COCO3_HDB1, "CoCo3 HDB-DOS", tag, owner, clock, "coco3_hdb1", __FILE__)
{
}
@@ -516,7 +516,7 @@ namespace
{
public:
// construction/destruction
- cp400_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ cp400_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: coco_fdc_device_base(mconfig, CP400_FDC, "CP400 FDC", tag, owner, clock, "cp400_fdc", __FILE__)
{
}
diff --git a/src/devices/bus/coco/coco_fdc.h b/src/devices/bus/coco/coco_fdc.h
index 90366b7e3ef..b6a3d7e0834 100644
--- a/src/devices/bus/coco/coco_fdc.h
+++ b/src/devices/bus/coco/coco_fdc.h
@@ -28,7 +28,7 @@ class coco_family_fdc_device_base :
{
public:
// construction/destruction
- coco_family_fdc_device_base(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ coco_family_fdc_device_base(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
, device_cococart_interface(mconfig, *this)
{
@@ -47,7 +47,7 @@ protected:
// FDC overrides
virtual void update_lines() = 0;
- virtual UINT8* get_cart_base() override;
+ virtual uint8_t* get_cart_base() override;
// wrapper for setting the cart line
void cart_set_line(cococart_slot_device::line which, cococart_slot_device::line_value value)
@@ -60,17 +60,17 @@ protected:
}
// accessors
- UINT8 dskreg() const { return m_dskreg; }
+ uint8_t dskreg() const { return m_dskreg; }
bool intrq() const { return m_intrq; }
bool drq() const { return m_drq; }
- void set_dskreg(UINT8 data) { m_dskreg = data; }
+ void set_dskreg(uint8_t data) { m_dskreg = data; }
private:
// internal state
cococart_slot_device *m_owner;
// registers
- UINT8 m_dskreg;
+ uint8_t m_dskreg;
bool m_intrq;
bool m_drq;
};
diff --git a/src/devices/bus/coco/coco_multi.cpp b/src/devices/bus/coco/coco_multi.cpp
index 18033158c45..fcfd764a169 100644
--- a/src/devices/bus/coco/coco_multi.cpp
+++ b/src/devices/bus/coco/coco_multi.cpp
@@ -138,7 +138,7 @@ const device_type COCO_MULTIPAK = &device_creator<coco_multipak_device>;
// coco_multipak_device - constructor
//-------------------------------------------------
-coco_multipak_device::coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+coco_multipak_device::coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, COCO_MULTIPAK, "CoCo Multi-Pak Interface", tag, owner, clock, "coco_multipak", __FILE__),
device_cococart_interface( mconfig, *this ), m_owner(nullptr), m_select(0)
{
@@ -199,7 +199,7 @@ machine_config_constructor coco_multipak_device::device_mconfig_additions() cons
// get_cart_base
//-------------------------------------------------
-UINT8* coco_multipak_device::get_cart_base()
+uint8_t* coco_multipak_device::get_cart_base()
{
return active_cts_slot()->get_cart_base();
}
@@ -243,9 +243,9 @@ WRITE8_MEMBER(coco_multipak_device::ff7f_write)
// set_select
//-------------------------------------------------
-void coco_multipak_device::set_select(UINT8 new_select)
+void coco_multipak_device::set_select(uint8_t new_select)
{
- UINT8 xorval = m_select ^ new_select;
+ uint8_t xorval = m_select ^ new_select;
m_select = new_select;
if (xorval & 0x30)
cart_base_changed();
diff --git a/src/devices/bus/coco/coco_multi.h b/src/devices/bus/coco/coco_multi.h
index 3ffb91413eb..d2bdb996f5a 100644
--- a/src/devices/bus/coco/coco_multi.h
+++ b/src/devices/bus/coco/coco_multi.h
@@ -30,12 +30,12 @@ class coco_multipak_device :
{
public:
// construction/destruction
- coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
- virtual UINT8* get_cart_base() override;
+ virtual uint8_t* get_cart_base() override;
DECLARE_WRITE_LINE_MEMBER(multi_cart_w);
DECLARE_WRITE_LINE_MEMBER(multi_nmi_w);
@@ -53,13 +53,13 @@ private:
cococart_slot_device *m_slots[4];
// internal state
- UINT8 m_select;
+ uint8_t m_select;
// methods
DECLARE_WRITE8_MEMBER(ff7f_write);
cococart_slot_device *active_scs_slot(void);
cococart_slot_device *active_cts_slot(void);
- void set_select(UINT8 new_select);
+ void set_select(uint8_t new_select);
};
diff --git a/src/devices/bus/coco/coco_orch90.cpp b/src/devices/bus/coco/coco_orch90.cpp
index e81b585dfc2..50503d592fa 100644
--- a/src/devices/bus/coco/coco_orch90.cpp
+++ b/src/devices/bus/coco/coco_orch90.cpp
@@ -39,7 +39,7 @@ const device_type COCO_ORCH90 = &device_creator<coco_orch90_device>;
// coco_orch90_device - constructor
//-------------------------------------------------
-coco_orch90_device::coco_orch90_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+coco_orch90_device::coco_orch90_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, COCO_ORCH90, "CoCo Orch-90 PAK", tag, owner, clock, "coco_orch90", __FILE__),
device_cococart_interface(mconfig, *this ),
m_ldac(*this, "ldac"),
diff --git a/src/devices/bus/coco/coco_orch90.h b/src/devices/bus/coco/coco_orch90.h
index a3554d63868..387395777d0 100644
--- a/src/devices/bus/coco/coco_orch90.h
+++ b/src/devices/bus/coco/coco_orch90.h
@@ -21,7 +21,7 @@ class coco_orch90_device :
{
public:
// construction/destruction
- coco_orch90_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ coco_orch90_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/coco/coco_pak.cpp b/src/devices/bus/coco/coco_pak.cpp
index 40c250dd4ac..1cc9e4f5e05 100644
--- a/src/devices/bus/coco/coco_pak.cpp
+++ b/src/devices/bus/coco/coco_pak.cpp
@@ -39,14 +39,14 @@ const device_type COCO_PAK = &device_creator<coco_pak_device>;
//-------------------------------------------------
// coco_pak_device - constructor
//-------------------------------------------------
-coco_pak_device::coco_pak_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+coco_pak_device::coco_pak_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cococart_interface( mconfig, *this ), m_cart(nullptr), m_owner(nullptr),
m_autostart(*this, ":" CART_AUTOSTART_TAG)
{
}
-coco_pak_device::coco_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+coco_pak_device::coco_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, COCO_PAK, "CoCo Program PAK", tag, owner, clock, "cocopak", __FILE__),
device_cococart_interface( mconfig, *this ), m_cart(nullptr), m_owner(nullptr),
m_autostart(*this, ":" CART_AUTOSTART_TAG)
@@ -103,7 +103,7 @@ void coco_pak_device::device_reset()
get_cart_base
-------------------------------------------------*/
-UINT8* coco_pak_device::get_cart_base()
+uint8_t* coco_pak_device::get_cart_base()
{
return memregion(CARTSLOT_TAG)->base();
}
@@ -126,7 +126,7 @@ const device_type COCO_PAK_BANKED = &device_creator<coco_pak_banked_device>;
// coco_pak_device - constructor
//-------------------------------------------------
-coco_pak_banked_device::coco_pak_banked_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+coco_pak_banked_device::coco_pak_banked_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: coco_pak_device(mconfig, COCO_PAK_BANKED, "CoCo Program PAK (Banked)", tag, owner, clock, "cocopak_banked", __FILE__)
{
}
@@ -146,12 +146,12 @@ void coco_pak_banked_device::device_reset()
banked_pak_set_bank - function to set the bank
-------------------------------------------------*/
-void coco_pak_banked_device::banked_pak_set_bank(UINT32 bank)
+void coco_pak_banked_device::banked_pak_set_bank(uint32_t bank)
{
- UINT64 pos;
- UINT32 i;
- UINT8 *rom = memregion(CARTSLOT_TAG)->base();
- UINT32 rom_length = memregion(CARTSLOT_TAG)->bytes();
+ uint64_t pos;
+ uint32_t i;
+ uint8_t *rom = memregion(CARTSLOT_TAG)->base();
+ uint32_t rom_length = memregion(CARTSLOT_TAG)->bytes();
if (m_cart->exists()) {
pos = (bank * 0x4000) % m_cart->length();
diff --git a/src/devices/bus/coco/coco_pak.h b/src/devices/bus/coco/coco_pak.h
index f75b48721ec..f6a93ec459f 100644
--- a/src/devices/bus/coco/coco_pak.h
+++ b/src/devices/bus/coco/coco_pak.h
@@ -20,14 +20,14 @@ class coco_pak_device :
{
public:
// construction/destruction
- coco_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- coco_pak_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ coco_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ coco_pak_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- virtual UINT8* get_cart_base() override;
+ virtual uint8_t* get_cart_base() override;
protected:
// device-level overrides
virtual void device_start() override;
@@ -51,14 +51,14 @@ class coco_pak_banked_device :
{
public:
// construction/destruction
- coco_pak_banked_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ coco_pak_banked_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_reset() override;
virtual DECLARE_WRITE8_MEMBER(write) override;
private:
- void banked_pak_set_bank(UINT32 bank);
+ void banked_pak_set_bank(uint32_t bank);
};
diff --git a/src/devices/bus/coco/cococart.cpp b/src/devices/bus/coco/cococart.cpp
index 0024992c2de..646a9d9d623 100644
--- a/src/devices/bus/coco/cococart.cpp
+++ b/src/devices/bus/coco/cococart.cpp
@@ -34,7 +34,7 @@ const device_type COCOCART_SLOT = &device_creator<cococart_slot_device>;
//-------------------------------------------------
// cococart_slot_device - constructor
//-------------------------------------------------
-cococart_slot_device::cococart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cococart_slot_device::cococart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COCOCART_SLOT, "CoCo Cartridge Slot", tag, owner, clock, "cococart_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this),
@@ -134,7 +134,7 @@ void cococart_slot_device::device_timer(emu_timer &timer, device_timer_id id, in
READ8_MEMBER(cococart_slot_device::read)
{
- UINT8 result = 0x00;
+ uint8_t result = 0x00;
if (m_cart)
result = m_cart->read(space, offset);
return result;
@@ -297,7 +297,7 @@ void cococart_slot_device::cart_set_line(cococart_slot_device::line which, cococ
// get_cart_base
//-------------------------------------------------
-UINT8* cococart_slot_device::get_cart_base()
+uint8_t* cococart_slot_device::get_cart_base()
{
if (m_cart != nullptr)
return m_cart->get_cart_base();
@@ -410,7 +410,7 @@ WRITE8_MEMBER(device_cococart_interface::write)
// get_cart_base
//-------------------------------------------------
-UINT8* device_cococart_interface::get_cart_base()
+uint8_t* device_cococart_interface::get_cart_base()
{
return nullptr;
}
diff --git a/src/devices/bus/coco/cococart.h b/src/devices/bus/coco/cococart.h
index 759bfdf9e85..a82c212132d 100644
--- a/src/devices/bus/coco/cococart.h
+++ b/src/devices/bus/coco/cococart.h
@@ -21,7 +21,7 @@
// ======================> cococart_base_update_delegate
// direct region update handler
-typedef delegate<void (UINT8 *)> cococart_base_update_delegate;
+typedef delegate<void (uint8_t *)> cococart_base_update_delegate;
#define MCFG_COCO_CARTRIDGE_CART_CB(_devcb) \
devcb = &cococart_slot_device::static_set_cart_callback(*device, DEVCB_##_devcb);
@@ -59,7 +59,7 @@ public:
};
// construction/destruction
- cococart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cococart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &static_set_cart_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_cart_callback.set_callback(object); }
template<class _Object> static devcb_base &static_set_nmi_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_nmi_callback.set_callback(object); }
@@ -98,7 +98,7 @@ public:
void twiddle_q_lines();
// cart base
- UINT8* get_cart_base();
+ uint8_t* get_cart_base();
void set_cart_base_update(cococart_base_update_delegate update);
private:
@@ -157,7 +157,7 @@ public:
virtual DECLARE_READ8_MEMBER(read);
virtual DECLARE_WRITE8_MEMBER(write);
- virtual UINT8* get_cart_base();
+ virtual uint8_t* get_cart_base();
void set_cart_base_update(cococart_base_update_delegate update);
protected:
diff --git a/src/devices/bus/coco/dragon_fdc.cpp b/src/devices/bus/coco/dragon_fdc.cpp
index c5247ff59bd..e32bab843e9 100644
--- a/src/devices/bus/coco/dragon_fdc.cpp
+++ b/src/devices/bus/coco/dragon_fdc.cpp
@@ -94,7 +94,7 @@ namespace
{
public:
// construction/destruction
- dragon_fdc_device_base(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ dragon_fdc_device_base(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -109,7 +109,7 @@ namespace
required_device_array<floppy_connector, 4> m_floppies;
// methods
- void dskreg_w(UINT8 data);
+ void dskreg_w(uint8_t data);
};
};
@@ -141,7 +141,7 @@ MACHINE_CONFIG_END
//-------------------------------------------------
// dragon_fdc_device_base - constructor
//-------------------------------------------------
-dragon_fdc_device_base::dragon_fdc_device_base(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+dragon_fdc_device_base::dragon_fdc_device_base(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: coco_family_fdc_device_base(mconfig, type, name, tag, owner, clock, shortname, source)
, m_wd2797(*this, WD2797_TAG)
, m_floppies(*this, WD2797_TAG ":%u", 0)
@@ -180,7 +180,7 @@ void dragon_fdc_device_base::update_lines()
// Dragon dskreg
//-------------------------------------------------
-void dragon_fdc_device_base::dskreg_w(UINT8 data)
+void dragon_fdc_device_base::dskreg_w(uint8_t data)
{
if (LOG_FDC)
{
@@ -218,7 +218,7 @@ void dragon_fdc_device_base::dskreg_w(UINT8 data)
READ8_MEMBER(dragon_fdc_device_base::read)
{
- UINT8 result = 0;
+ uint8_t result = 0;
switch (offset & 0xEF)
{
case 0:
@@ -284,7 +284,7 @@ namespace
{
public:
// construction/destruction
- dragon_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ dragon_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: dragon_fdc_device_base(mconfig, DRAGON_FDC, "Dragon FDC", tag, owner, clock, "dragon_fdc", __FILE__)
{
}
@@ -316,7 +316,7 @@ namespace
{
public:
// construction/destruction
- sdtandy_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ sdtandy_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: dragon_fdc_device_base(mconfig, SDTANDY_FDC, "SDTANDY FDC", tag, owner, clock, "sdtandy_fdc", __FILE__)
{
}
diff --git a/src/devices/bus/coleco/ctrl.cpp b/src/devices/bus/coleco/ctrl.cpp
index 5b53be7c3cf..33359141805 100644
--- a/src/devices/bus/coleco/ctrl.cpp
+++ b/src/devices/bus/coleco/ctrl.cpp
@@ -44,7 +44,7 @@ device_colecovision_control_port_interface::device_colecovision_control_port_int
// colecovision_control_port_device - constructor
//-------------------------------------------------
-colecovision_control_port_device::colecovision_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+colecovision_control_port_device::colecovision_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COLECOVISION_CONTROL_PORT, "ColecoVision control port", tag, owner, clock, "colecovision_control_port", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr),
m_write_irq(*this)
diff --git a/src/devices/bus/coleco/ctrl.h b/src/devices/bus/coleco/ctrl.h
index a8c82ee23c4..6acabc2b8a1 100644
--- a/src/devices/bus/coleco/ctrl.h
+++ b/src/devices/bus/coleco/ctrl.h
@@ -48,7 +48,7 @@ public:
device_colecovision_control_port_interface(const machine_config &mconfig, device_t &device);
virtual ~device_colecovision_control_port_interface() { }
- virtual UINT8 joy_r() { return 0xff; };
+ virtual uint8_t joy_r() { return 0xff; };
virtual void common0_w(int state) { m_common0 = state; };
virtual void common1_w(int state) { m_common1 = state; };
@@ -67,14 +67,14 @@ class colecovision_control_port_device : public device_t,
{
public:
// construction/destruction
- colecovision_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ colecovision_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~colecovision_control_port_device() { }
// static configuration helpers
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<colecovision_control_port_device &>(device).m_write_irq.set_callback(object); }
// computer interface
- UINT8 read() { UINT8 data = 0xff; if (exists()) data = m_device->joy_r(); return data; }
+ uint8_t read() { uint8_t data = 0xff; if (exists()) data = m_device->joy_r(); return data; }
DECLARE_READ8_MEMBER( read ) { return read(); }
DECLARE_WRITE_LINE_MEMBER( common0_w ) { if (exists()) m_device->common0_w(state); }
diff --git a/src/devices/bus/coleco/exp.cpp b/src/devices/bus/coleco/exp.cpp
index c80af2f879d..3d93ae777b1 100644
--- a/src/devices/bus/coleco/exp.cpp
+++ b/src/devices/bus/coleco/exp.cpp
@@ -52,7 +52,7 @@ void device_colecovision_cartridge_interface::rom_alloc(size_t size)
// colecovision_cartridge_slot_device - constructor
//-------------------------------------------------
-colecovision_cartridge_slot_device::colecovision_cartridge_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+colecovision_cartridge_slot_device::colecovision_cartridge_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COLECOVISION_CARTRIDGE_SLOT, "ColecoVision cartridge port", tag, owner, clock, "coleco_cartridge_port", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this), m_card(nullptr)
@@ -104,7 +104,7 @@ std::string colecovision_cartridge_slot_device::get_default_card_software()
{
if (open_image_file(mconfig().options()))
{
- UINT32 length = m_file->size();
+ uint32_t length = m_file->size();
if (length == 0x100000 || length == 0x200000)
return software_get_default_slot("xin1");
}
@@ -116,7 +116,7 @@ std::string colecovision_cartridge_slot_device::get_default_card_software()
// bd_r - cartridge data read
//-------------------------------------------------
-UINT8 colecovision_cartridge_slot_device::bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000)
+uint8_t colecovision_cartridge_slot_device::bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000)
{
if (m_card != nullptr)
{
diff --git a/src/devices/bus/coleco/exp.h b/src/devices/bus/coleco/exp.h
index 19fa5b5e69c..58e75252dfd 100644
--- a/src/devices/bus/coleco/exp.h
+++ b/src/devices/bus/coleco/exp.h
@@ -66,11 +66,11 @@ class colecovision_cartridge_slot_device : public device_t,
{
public:
// construction/destruction
- colecovision_cartridge_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ colecovision_cartridge_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~colecovision_cartridge_slot_device() { }
// computer interface
- UINT8 bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000);
+ uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000);
protected:
// device-level overrides
@@ -109,12 +109,12 @@ public:
device_colecovision_cartridge_interface(const machine_config &mconfig, device_t &device);
virtual ~device_colecovision_cartridge_interface() { }
- virtual UINT8 bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000) { return 0xff; }
+ virtual uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) { return 0xff; }
void rom_alloc(size_t size);
protected:
- UINT8 *m_rom;
+ uint8_t *m_rom;
size_t m_rom_size;
colecovision_cartridge_slot_device *m_slot;
diff --git a/src/devices/bus/coleco/hand.cpp b/src/devices/bus/coleco/hand.cpp
index a00a1d89f4c..ce53e4246c2 100644
--- a/src/devices/bus/coleco/hand.cpp
+++ b/src/devices/bus/coleco/hand.cpp
@@ -19,8 +19,8 @@ const device_type COLECO_HAND_CONTROLLER = &device_creator<coleco_hand_controlle
CUSTOM_INPUT_MEMBER( coleco_hand_controller_t::keypad_r )
{
- UINT8 data = 0xf;
- UINT16 keypad = m_io_keypad->read();
+ uint8_t data = 0xf;
+ uint16_t keypad = m_io_keypad->read();
if (!BIT(keypad, 0)) data &= 0x0a;
if (!BIT(keypad, 1)) data &= 0x0d;
@@ -89,7 +89,7 @@ ioport_constructor coleco_hand_controller_t::device_input_ports() const
// coleco_hand_controller_t - constructor
//-------------------------------------------------
-coleco_hand_controller_t::coleco_hand_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+coleco_hand_controller_t::coleco_hand_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COLECO_HAND_CONTROLLER, "ColecoVision Hand Controller", tag, owner, clock, "coleco_hand", __FILE__),
device_colecovision_control_port_interface(mconfig, *this),
m_io_common0(*this, "COMMON0"),
@@ -115,9 +115,9 @@ void coleco_hand_controller_t::device_start()
// joy_r - joystick read
//-------------------------------------------------
-UINT8 coleco_hand_controller_t::joy_r()
+uint8_t coleco_hand_controller_t::joy_r()
{
- UINT8 data = 0x7f;
+ uint8_t data = 0x7f;
if (!m_common0) data &= m_io_common0->read();
if (!m_common1) data &= m_io_common1->read();
diff --git a/src/devices/bus/coleco/hand.h b/src/devices/bus/coleco/hand.h
index a43632e66db..e51296ce499 100644
--- a/src/devices/bus/coleco/hand.h
+++ b/src/devices/bus/coleco/hand.h
@@ -27,7 +27,7 @@ class coleco_hand_controller_t : public device_t,
{
public:
// construction/destruction
- coleco_hand_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ coleco_hand_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -39,7 +39,7 @@ protected:
virtual void device_start() override;
// device_vcs_control_port_interface overrides
- virtual UINT8 joy_r() override;
+ virtual uint8_t joy_r() override;
private:
required_ioport m_io_common0;
diff --git a/src/devices/bus/coleco/sac.cpp b/src/devices/bus/coleco/sac.cpp
index 01a62b49323..ba05d15683e 100644
--- a/src/devices/bus/coleco/sac.cpp
+++ b/src/devices/bus/coleco/sac.cpp
@@ -19,8 +19,8 @@ const device_type COLECO_SUPER_ACTION_CONTROLLER = &device_creator<coleco_super_
CUSTOM_INPUT_MEMBER( coleco_super_action_controller_t::keypad_r )
{
- UINT8 data = 0xf;
- UINT16 keypad = m_io_keypad->read();
+ uint8_t data = 0xf;
+ uint16_t keypad = m_io_keypad->read();
if (!BIT(keypad, 0)) data &= 0x0a;
if (!BIT(keypad, 1)) data &= 0x0d;
@@ -101,7 +101,7 @@ ioport_constructor coleco_super_action_controller_t::device_input_ports() const
// coleco_super_action_controller_t - constructor
//-------------------------------------------------
-coleco_super_action_controller_t::coleco_super_action_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+coleco_super_action_controller_t::coleco_super_action_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COLECO_SUPER_ACTION_CONTROLLER, "ColecoVision Super Action Controller", tag, owner, clock, "coleco_sac", __FILE__),
device_colecovision_control_port_interface(mconfig, *this),
m_io_common0(*this, "COMMON0"),
@@ -127,9 +127,9 @@ void coleco_super_action_controller_t::device_start()
// joy_r - joystick read
//-------------------------------------------------
-UINT8 coleco_super_action_controller_t::joy_r()
+uint8_t coleco_super_action_controller_t::joy_r()
{
- UINT8 data = 0x7f;
+ uint8_t data = 0x7f;
if (!m_common0) data &= m_io_common0->read();
if (!m_common1) data &= m_io_common1->read();
diff --git a/src/devices/bus/coleco/sac.h b/src/devices/bus/coleco/sac.h
index 51dcfae357f..4f90e225374 100644
--- a/src/devices/bus/coleco/sac.h
+++ b/src/devices/bus/coleco/sac.h
@@ -27,7 +27,7 @@ class coleco_super_action_controller_t : public device_t,
{
public:
// construction/destruction
- coleco_super_action_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ coleco_super_action_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -40,7 +40,7 @@ protected:
virtual void device_start() override;
// device_vcs_control_port_interface overrides
- virtual UINT8 joy_r() override;
+ virtual uint8_t joy_r() override;
private:
required_ioport m_io_common0;
diff --git a/src/devices/bus/coleco/std.cpp b/src/devices/bus/coleco/std.cpp
index f66a0463eae..f8842a4aa9e 100644
--- a/src/devices/bus/coleco/std.cpp
+++ b/src/devices/bus/coleco/std.cpp
@@ -26,7 +26,7 @@ const device_type COLECOVISION_STANDARD = &device_creator<colecovision_standard_
// colecovision_standard_cartridge_device - constructor
//-------------------------------------------------
-colecovision_standard_cartridge_device::colecovision_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+colecovision_standard_cartridge_device::colecovision_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COLECOVISION_STANDARD, "ColecoVision standard cartridge", tag, owner, clock, "colecovision_standard", __FILE__),
device_colecovision_cartridge_interface(mconfig, *this)
{
@@ -46,7 +46,7 @@ void colecovision_standard_cartridge_device::device_start()
// read - cartridge data read
//-------------------------------------------------
-UINT8 colecovision_standard_cartridge_device::bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000)
+uint8_t colecovision_standard_cartridge_device::bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000)
{
if (!_8000 || !_a000 || !_c000 || !_e000)
{
diff --git a/src/devices/bus/coleco/std.h b/src/devices/bus/coleco/std.h
index 4afde3809c9..ee3cb2adf1f 100644
--- a/src/devices/bus/coleco/std.h
+++ b/src/devices/bus/coleco/std.h
@@ -26,14 +26,14 @@ class colecovision_standard_cartridge_device : public device_t,
{
public:
// construction/destruction
- colecovision_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ colecovision_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_colecovision_expansion_card_interface overrides
- virtual UINT8 bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000) override;
+ virtual uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) override;
};
diff --git a/src/devices/bus/coleco/xin1.cpp b/src/devices/bus/coleco/xin1.cpp
index e46b65eeadd..77e55098156 100644
--- a/src/devices/bus/coleco/xin1.cpp
+++ b/src/devices/bus/coleco/xin1.cpp
@@ -26,7 +26,7 @@ const device_type COLECOVISION_XIN1 = &device_creator<colecovision_xin1_cartridg
// colecovision_xin1_cartridge_device - constructor
//-------------------------------------------------
-colecovision_xin1_cartridge_device::colecovision_xin1_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+colecovision_xin1_cartridge_device::colecovision_xin1_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COLECOVISION_XIN1, "ColecoVision X-in-1 cartridge", tag, owner, clock, "colecovision_xin1", __FILE__),
device_colecovision_cartridge_interface(mconfig, *this),
m_current_offset(0)
@@ -57,7 +57,7 @@ void colecovision_xin1_cartridge_device::device_reset()
// read - cartridge data read
//-------------------------------------------------
-UINT8 colecovision_xin1_cartridge_device::bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000)
+uint8_t colecovision_xin1_cartridge_device::bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000)
{
if (!_8000 || !_a000 || !_c000 || !_e000)
{
diff --git a/src/devices/bus/coleco/xin1.h b/src/devices/bus/coleco/xin1.h
index defe4d8d4fa..14802eb95da 100644
--- a/src/devices/bus/coleco/xin1.h
+++ b/src/devices/bus/coleco/xin1.h
@@ -26,7 +26,7 @@ class colecovision_xin1_cartridge_device : public device_t,
{
public:
// construction/destruction
- colecovision_xin1_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ colecovision_xin1_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -34,10 +34,10 @@ protected:
virtual void device_reset() override;
// device_colecovision_expansion_card_interface overrides
- virtual UINT8 bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000) override;
+ virtual uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) override;
private:
- UINT32 m_current_offset;
+ uint32_t m_current_offset;
};
diff --git a/src/devices/bus/compis/graphics.cpp b/src/devices/bus/compis/graphics.cpp
index b35b2cd9517..c426c943260 100644
--- a/src/devices/bus/compis/graphics.cpp
+++ b/src/devices/bus/compis/graphics.cpp
@@ -37,7 +37,7 @@ device_compis_graphics_card_interface::device_compis_graphics_card_interface(con
// compis_graphics_slot_t - constructor
//-------------------------------------------------
-compis_graphics_slot_t::compis_graphics_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+compis_graphics_slot_t::compis_graphics_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COMPIS_GRAPHICS_SLOT, "Compis graphics slot", tag, owner, clock, "isbx_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_write_dma_request(*this),
diff --git a/src/devices/bus/compis/graphics.h b/src/devices/bus/compis/graphics.h
index bc2f5be6ad2..aeef41ceac9 100644
--- a/src/devices/bus/compis/graphics.h
+++ b/src/devices/bus/compis/graphics.h
@@ -45,16 +45,16 @@ public:
// construction/destruction
device_compis_graphics_card_interface(const machine_config &mconfig, device_t &device);
- virtual UINT8 mcs0_r(address_space &space, offs_t offset) { return 0xff; }
- virtual void mcs0_w(address_space &space, offs_t offset, UINT8 data) { }
- virtual UINT8 mcs1_r(address_space &space, offs_t offset) { return 0xff; }
- virtual void mcs1_w(address_space &space, offs_t offset, UINT8 data) { }
- virtual UINT16 pcs3_r(address_space &space, offs_t offset) { return 0xff; }
- virtual void pcs3_w(address_space &space, offs_t offset, UINT16 data) { }
- virtual UINT8 pcs6_6_r(address_space &space, offs_t offset) { return 0xff; }
- virtual void pcs6_6_w(address_space &space, offs_t offset, UINT8 data) { }
- virtual UINT8 dma_ack_r(address_space &space, offs_t offset) { return 0xff; }
- virtual void dma_ack_w(address_space &space, offs_t offset, UINT8 data) { }
+ virtual uint8_t mcs0_r(address_space &space, offs_t offset) { return 0xff; }
+ virtual void mcs0_w(address_space &space, offs_t offset, uint8_t data) { }
+ virtual uint8_t mcs1_r(address_space &space, offs_t offset) { return 0xff; }
+ virtual void mcs1_w(address_space &space, offs_t offset, uint8_t data) { }
+ virtual uint16_t pcs3_r(address_space &space, offs_t offset) { return 0xff; }
+ virtual void pcs3_w(address_space &space, offs_t offset, uint16_t data) { }
+ virtual uint8_t pcs6_6_r(address_space &space, offs_t offset) { return 0xff; }
+ virtual void pcs6_6_w(address_space &space, offs_t offset, uint8_t data) { }
+ virtual uint8_t dma_ack_r(address_space &space, offs_t offset) { return 0xff; }
+ virtual void dma_ack_w(address_space &space, offs_t offset, uint8_t data) { }
protected:
compis_graphics_slot_t *m_slot;
@@ -68,7 +68,7 @@ class compis_graphics_slot_t : public device_t,
{
public:
// construction/destruction
- compis_graphics_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ compis_graphics_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _dma_request> void set_dma_request_callback(_dma_request dma_request) { m_write_dma_request.set_callback(dma_request); }
diff --git a/src/devices/bus/compis/hrg.cpp b/src/devices/bus/compis/hrg.cpp
index 0f77a04caf6..839ee7e53e2 100644
--- a/src/devices/bus/compis/hrg.cpp
+++ b/src/devices/bus/compis/hrg.cpp
@@ -47,7 +47,7 @@ ADDRESS_MAP_END
UPD7220_DISPLAY_PIXELS_MEMBER( compis_hrg_t::display_pixels )
{
- UINT16 i,gfx = m_video_ram[(address & 0x7fff) >> 1];
+ uint16_t i,gfx = m_video_ram[(address & 0x7fff) >> 1];
const pen_t *pen = m_palette->pens();
for(i=0; i<16; i++)
@@ -61,7 +61,7 @@ UPD7220_DISPLAY_PIXELS_MEMBER( compis_hrg_t::display_pixels )
UPD7220_DISPLAY_PIXELS_MEMBER( compis_uhrg_t::display_pixels )
{
- UINT16 i,gfx = m_video_ram[(address & 0x1ffff) >> 1];
+ uint16_t i,gfx = m_video_ram[(address & 0x1ffff) >> 1];
const pen_t *pen = m_palette->pens();
for(i=0; i<16; i++)
@@ -144,7 +144,7 @@ machine_config_constructor compis_uhrg_t::device_mconfig_additions() const
// compis_hrg_t - constructor
//-------------------------------------------------
-compis_hrg_t::compis_hrg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+compis_hrg_t::compis_hrg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_compis_graphics_card_interface(mconfig, *this),
m_crtc(*this, UPD7220_TAG),
@@ -153,12 +153,12 @@ compis_hrg_t::compis_hrg_t(const machine_config &mconfig, device_type type, cons
{
}
-compis_hrg_t::compis_hrg_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+compis_hrg_t::compis_hrg_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
compis_hrg_t(mconfig, COMPIS_HRG, "Compis HRG", tag, owner, clock, "compis_hrg", __FILE__)
{
}
-compis_uhrg_t::compis_uhrg_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+compis_uhrg_t::compis_uhrg_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
compis_hrg_t(mconfig, COMPIS_UHRG, "Compis UHRG", tag, owner, clock, "compis_uhrg", __FILE__)
{
}
@@ -186,9 +186,9 @@ void compis_hrg_t::device_reset()
// pcs6_6_r -
//-------------------------------------------------
-UINT8 compis_hrg_t::pcs6_6_r(address_space &space, offs_t offset)
+uint8_t compis_hrg_t::pcs6_6_r(address_space &space, offs_t offset)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (offset < 2)
data = m_crtc->read(space, offset & 0x01);
@@ -223,7 +223,7 @@ UINT8 compis_hrg_t::pcs6_6_r(address_space &space, offs_t offset)
// pcs6_6_w -
//-------------------------------------------------
-void compis_hrg_t::pcs6_6_w(address_space &space, offs_t offset, UINT8 data)
+void compis_hrg_t::pcs6_6_w(address_space &space, offs_t offset, uint8_t data)
{
//logerror("%s PCS 6:6 write %04x : %02x\n", machine().describe_context(), offset, data);
diff --git a/src/devices/bus/compis/hrg.h b/src/devices/bus/compis/hrg.h
index c5443d2df1e..ad2e8998570 100644
--- a/src/devices/bus/compis/hrg.h
+++ b/src/devices/bus/compis/hrg.h
@@ -28,8 +28,8 @@ class compis_hrg_t : public device_t,
{
public:
// construction/destruction
- compis_hrg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- compis_hrg_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ compis_hrg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ compis_hrg_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -42,14 +42,14 @@ protected:
virtual void device_reset() override;
// device_compis_graphics_card_interface overrides
- virtual UINT8 pcs6_6_r(address_space &space, offs_t offset) override;
- virtual void pcs6_6_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t pcs6_6_r(address_space &space, offs_t offset) override;
+ virtual void pcs6_6_w(address_space &space, offs_t offset, uint8_t data) override;
required_device<upd7220_device> m_crtc;
required_device<palette_device> m_palette;
- required_shared_ptr<UINT16> m_video_ram;
+ required_shared_ptr<uint16_t> m_video_ram;
- UINT8 m_unk_video;
+ uint8_t m_unk_video;
};
@@ -59,7 +59,7 @@ class compis_uhrg_t : public compis_hrg_t
{
public:
// construction/destruction
- compis_uhrg_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ compis_uhrg_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/compucolor/floppy.cpp b/src/devices/bus/compucolor/floppy.cpp
index b69bbe014b0..6c817f6ef67 100644
--- a/src/devices/bus/compucolor/floppy.cpp
+++ b/src/devices/bus/compucolor/floppy.cpp
@@ -84,7 +84,7 @@ device_compucolor_floppy_port_interface::device_compucolor_floppy_port_interface
// compucolor_floppy_port_device - constructor
//-------------------------------------------------
-compucolor_floppy_port_device::compucolor_floppy_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+compucolor_floppy_port_device::compucolor_floppy_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: rs232_port_device(mconfig, COMPUCOLOR_FLOPPY_PORT, "Compucolor Floppy Port", tag, owner, clock, "compclr_flp_port", __FILE__), m_dev(nullptr)
{
}
@@ -94,7 +94,7 @@ compucolor_floppy_port_device::compucolor_floppy_port_device(const machine_confi
// compucolor_floppy_device - constructor
//-------------------------------------------------
-compucolor_floppy_device::compucolor_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+compucolor_floppy_device::compucolor_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, COMPUCOLOR_FLOPPY, "Compucolor floppy", tag, owner, clock, "compclr_flp", __FILE__),
device_compucolor_floppy_port_interface(mconfig, *this),
m_floppy(*this, "floppy:525sssd"),
@@ -159,7 +159,7 @@ void compucolor_floppy_device::device_timer(emu_timer &timer, device_timer_id id
// tx_w -
//-------------------------------------------------
-void compucolor_floppy_device::tx(UINT8 state)
+void compucolor_floppy_device::tx(uint8_t state)
{
if (!m_sel && m_rw)
{
@@ -187,7 +187,7 @@ void compucolor_floppy_device::rw_w(int state)
// stepper_w -
//-------------------------------------------------
-void compucolor_floppy_device::stepper_w(UINT8 data)
+void compucolor_floppy_device::stepper_w(uint8_t data)
{
if (!m_sel)
{
diff --git a/src/devices/bus/compucolor/floppy.h b/src/devices/bus/compucolor/floppy.h
index f17772c88fe..22a716457f3 100644
--- a/src/devices/bus/compucolor/floppy.h
+++ b/src/devices/bus/compucolor/floppy.h
@@ -40,7 +40,7 @@ public:
virtual ~device_compucolor_floppy_port_interface() { }
virtual void rw_w(int state) = 0;
- virtual void stepper_w(UINT8 data) = 0;
+ virtual void stepper_w(uint8_t data) = 0;
virtual void select_w(int state) = 0;
};
@@ -50,11 +50,11 @@ public:
class compucolor_floppy_port_device : public rs232_port_device
{
public:
- compucolor_floppy_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ compucolor_floppy_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~compucolor_floppy_port_device() { }
DECLARE_WRITE_LINE_MEMBER( rw_w ) { if (m_dev) m_dev->rw_w(state); }
- void stepper_w(UINT8 data) { if (m_dev) m_dev->stepper_w(data); }
+ void stepper_w(uint8_t data) { if (m_dev) m_dev->stepper_w(data); }
DECLARE_WRITE_LINE_MEMBER( select_w ) { if (m_dev) m_dev->select_w(state); }
protected:
@@ -74,7 +74,7 @@ class compucolor_floppy_device : public device_t,
{
public:
// construction/destruction
- compucolor_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ compucolor_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_FLOPPY_FORMATS( floppy_formats );
@@ -87,11 +87,11 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
// device_serial_port_interface overrides
- virtual void tx(UINT8 state);
+ virtual void tx(uint8_t state);
// device_compucolor_floppy_port_interface overrides
virtual void rw_w(int state) override;
- virtual void stepper_w(UINT8 data) override;
+ virtual void stepper_w(uint8_t data) override;
virtual void select_w(int state) override;
private:
diff --git a/src/devices/bus/comx35/clm.cpp b/src/devices/bus/comx35/clm.cpp
index 513a123086a..294c9042ece 100644
--- a/src/devices/bus/comx35/clm.cpp
+++ b/src/devices/bus/comx35/clm.cpp
@@ -101,9 +101,9 @@ MC6845_UPDATE_ROW( comx_clm_device::crtc_update_row )
{
for (int column = 0; column < x_count; column++)
{
- UINT8 code = m_video_ram[((ma + column) & 0x7ff)];
- UINT16 addr = (code << 3) | (ra & 0x07);
- UINT8 data = m_char_rom->base()[addr & 0x7ff];
+ uint8_t code = m_video_ram[((ma + column) & 0x7ff)];
+ uint16_t addr = (code << 3) | (ra & 0x07);
+ uint8_t data = m_char_rom->base()[addr & 0x7ff];
if (BIT(ra, 3) && column == cursor_x)
{
@@ -172,7 +172,7 @@ machine_config_constructor comx_clm_device::device_mconfig_additions() const
// comx_clm_device - constructor
//-------------------------------------------------
-comx_clm_device::comx_clm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_clm_device::comx_clm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COMX_CLM, "COMX 80 Column Card", tag, owner, clock, "comx_clm", __FILE__),
device_comx_expansion_card_interface(mconfig, *this),
device_gfx_interface(mconfig, *this, nullptr, "palette"),
@@ -222,9 +222,9 @@ int comx_clm_device::comx_ef4_r()
// comx_mrd_r - memory read
//-------------------------------------------------
-UINT8 comx_clm_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom)
+uint8_t comx_clm_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (offset >= 0xc000 && offset < 0xc800)
{
@@ -247,7 +247,7 @@ UINT8 comx_clm_device::comx_mrd_r(address_space &space, offs_t offset, int *extr
// comx_mwr_w - memory write
//-------------------------------------------------
-void comx_clm_device::comx_mwr_w(address_space &space, offs_t offset, UINT8 data)
+void comx_clm_device::comx_mwr_w(address_space &space, offs_t offset, uint8_t data)
{
if (offset >= 0xd000 && offset < 0xd800)
{
diff --git a/src/devices/bus/comx35/clm.h b/src/devices/bus/comx35/clm.h
index 0a71c1afb21..0890c307391 100644
--- a/src/devices/bus/comx35/clm.h
+++ b/src/devices/bus/comx35/clm.h
@@ -29,7 +29,7 @@ class comx_clm_device : public device_t,
{
public:
// construction/destruction
- comx_clm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_clm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -45,15 +45,15 @@ protected:
// device_comx_expansion_card_interface overrides
virtual int comx_ef4_r() override;
- virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom) override;
- virtual void comx_mwr_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t comx_mrd_r(address_space &space, offs_t offset, int *extrom) override;
+ virtual void comx_mwr_w(address_space &space, offs_t offset, uint8_t data) override;
private:
required_device<mc6845_device> m_crtc;
required_device<palette_device> m_palette;
required_memory_region m_rom;
required_memory_region m_char_rom;
- optional_shared_ptr<UINT8> m_video_ram;
+ optional_shared_ptr<uint8_t> m_video_ram;
};
diff --git a/src/devices/bus/comx35/eprom.cpp b/src/devices/bus/comx35/eprom.cpp
index 505b81ebb29..9261e27b970 100644
--- a/src/devices/bus/comx35/eprom.cpp
+++ b/src/devices/bus/comx35/eprom.cpp
@@ -56,7 +56,7 @@ const tiny_rom_entry *comx_epr_device::device_rom_region() const
// comx_epr_device - constructor
//-------------------------------------------------
-comx_epr_device::comx_epr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_epr_device::comx_epr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COMX_EPR, "COMX-35 F&M EPROM Switchboard", tag, owner, clock, "comx_epr", __FILE__),
device_comx_expansion_card_interface(mconfig, *this),
m_rom(*this, "f800"),
@@ -90,9 +90,9 @@ void comx_epr_device::device_reset()
// comx_mrd_r - memory read
//-------------------------------------------------
-UINT8 comx_epr_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom)
+uint8_t comx_epr_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (offset >= 0xc000 && offset < 0xe000)
{
@@ -112,7 +112,7 @@ UINT8 comx_epr_device::comx_mrd_r(address_space &space, offs_t offset, int *extr
// comx_io_w - I/O write
//-------------------------------------------------
-void comx_epr_device::comx_io_w(address_space &space, offs_t offset, UINT8 data)
+void comx_epr_device::comx_io_w(address_space &space, offs_t offset, uint8_t data)
{
if (offset == 1)
{
diff --git a/src/devices/bus/comx35/eprom.h b/src/devices/bus/comx35/eprom.h
index db6823f7ac3..ae9b4ce474b 100644
--- a/src/devices/bus/comx35/eprom.h
+++ b/src/devices/bus/comx35/eprom.h
@@ -27,7 +27,7 @@ class comx_epr_device : public device_t,
{
public:
// construction/destruction
- comx_epr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_epr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -38,14 +38,14 @@ protected:
virtual void device_reset() override;
// device_comx_expansion_card_interface overrides
- virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom) override;
- virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t comx_mrd_r(address_space &space, offs_t offset, int *extrom) override;
+ virtual void comx_io_w(address_space &space, offs_t offset, uint8_t data) override;
private:
required_memory_region m_rom;
required_memory_region m_eprom;
- UINT8 m_select;
+ uint8_t m_select;
};
diff --git a/src/devices/bus/comx35/exp.cpp b/src/devices/bus/comx35/exp.cpp
index cd64a1b49a8..a8495681f21 100644
--- a/src/devices/bus/comx35/exp.cpp
+++ b/src/devices/bus/comx35/exp.cpp
@@ -42,7 +42,7 @@ device_comx_expansion_card_interface::device_comx_expansion_card_interface(const
// comx_expansion_slot_device - constructor
//-------------------------------------------------
-comx_expansion_slot_device::comx_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_expansion_slot_device::comx_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COMX_EXPANSION_SLOT, "COMX-35 expansion slot", tag, owner, clock, "comx_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_write_irq(*this), m_card(nullptr)
@@ -67,9 +67,9 @@ void comx_expansion_slot_device::device_start()
// mrd_r - memory read
//-------------------------------------------------
-UINT8 comx_expansion_slot_device::mrd_r(address_space &space, offs_t offset, int *extrom)
+uint8_t comx_expansion_slot_device::mrd_r(address_space &space, offs_t offset, int *extrom)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_card != nullptr)
{
@@ -84,7 +84,7 @@ UINT8 comx_expansion_slot_device::mrd_r(address_space &space, offs_t offset, int
// mwr_w - memory write
//-------------------------------------------------
-void comx_expansion_slot_device::mwr_w(address_space &space, offs_t offset, UINT8 data)
+void comx_expansion_slot_device::mwr_w(address_space &space, offs_t offset, uint8_t data)
{
if (m_card != nullptr)
{
@@ -97,9 +97,9 @@ void comx_expansion_slot_device::mwr_w(address_space &space, offs_t offset, UINT
// io_r - I/O read
//-------------------------------------------------
-UINT8 comx_expansion_slot_device::io_r(address_space &space, offs_t offset)
+uint8_t comx_expansion_slot_device::io_r(address_space &space, offs_t offset)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_card != nullptr)
{
@@ -114,7 +114,7 @@ UINT8 comx_expansion_slot_device::io_r(address_space &space, offs_t offset)
// sout_w - I/O write
//-------------------------------------------------
-void comx_expansion_slot_device::io_w(address_space &space, offs_t offset, UINT8 data)
+void comx_expansion_slot_device::io_w(address_space &space, offs_t offset, uint8_t data)
{
if (m_card != nullptr)
{
diff --git a/src/devices/bus/comx35/exp.h b/src/devices/bus/comx35/exp.h
index 02325753396..ec1ccb673e9 100644
--- a/src/devices/bus/comx35/exp.h
+++ b/src/devices/bus/comx35/exp.h
@@ -75,16 +75,16 @@ class comx_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- comx_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~comx_expansion_slot_device() { }
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<comx_expansion_slot_device &>(device).m_write_irq.set_callback(object); }
- UINT8 mrd_r(address_space &space, offs_t offset, int *extrom);
- void mwr_w(address_space &space, offs_t offset, UINT8 data);
+ uint8_t mrd_r(address_space &space, offs_t offset, int *extrom);
+ void mwr_w(address_space &space, offs_t offset, uint8_t data);
- UINT8 io_r(address_space &space, offs_t offset);
- void io_w(address_space &space, offs_t offset, UINT8 data);
+ uint8_t io_r(address_space &space, offs_t offset);
+ void io_w(address_space &space, offs_t offset, uint8_t data);
DECLARE_READ_LINE_MEMBER( ef4_r );
@@ -122,12 +122,12 @@ protected:
virtual void comx_q_w(int state) { };
// memory access
- virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom) { return 0; };
- virtual void comx_mwr_w(address_space &space, offs_t offset, UINT8 data) { };
+ virtual uint8_t comx_mrd_r(address_space &space, offs_t offset, int *extrom) { return 0; };
+ virtual void comx_mwr_w(address_space &space, offs_t offset, uint8_t data) { };
// I/O access
- virtual UINT8 comx_io_r(address_space &space, offs_t offset) { return 0; };
- virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data) { };
+ virtual uint8_t comx_io_r(address_space &space, offs_t offset) { return 0; };
+ virtual void comx_io_w(address_space &space, offs_t offset, uint8_t data) { };
comx_expansion_slot_device *m_slot;
diff --git a/src/devices/bus/comx35/expbox.cpp b/src/devices/bus/comx35/expbox.cpp
index dac3ffc95c3..cc38f7f81a7 100644
--- a/src/devices/bus/comx35/expbox.cpp
+++ b/src/devices/bus/comx35/expbox.cpp
@@ -129,7 +129,7 @@ machine_config_constructor comx_eb_device::device_mconfig_additions() const
// comx_eb_device - constructor
//-------------------------------------------------
-comx_eb_device::comx_eb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_eb_device::comx_eb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COMX_EB, "COMX-35E Expansion Box", tag, owner, clock, "comx_eb", __FILE__),
device_comx_expansion_card_interface(mconfig, *this),
m_rom(*this, "e000"),
@@ -213,9 +213,9 @@ void comx_eb_device::comx_q_w(int state)
// comx_mrd_r - memory read
//-------------------------------------------------
-UINT8 comx_eb_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom)
+uint8_t comx_eb_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (offset >= 0x1000 && offset < 0x1800)
{
@@ -245,7 +245,7 @@ UINT8 comx_eb_device::comx_mrd_r(address_space &space, offs_t offset, int *extro
// comx_mwr_w - memory write
//-------------------------------------------------
-void comx_eb_device::comx_mwr_w(address_space &space, offs_t offset, UINT8 data)
+void comx_eb_device::comx_mwr_w(address_space &space, offs_t offset, uint8_t data)
{
for (int slot = 0; slot < MAX_EB_SLOTS; slot++)
{
@@ -261,9 +261,9 @@ void comx_eb_device::comx_mwr_w(address_space &space, offs_t offset, UINT8 data)
// comx_io_r - I/O read
//-------------------------------------------------
-UINT8 comx_eb_device::comx_io_r(address_space &space, offs_t offset)
+uint8_t comx_eb_device::comx_io_r(address_space &space, offs_t offset)
{
- UINT8 data = 0;
+ uint8_t data = 0;
for (int slot = 0; slot < MAX_EB_SLOTS; slot++)
{
@@ -281,7 +281,7 @@ UINT8 comx_eb_device::comx_io_r(address_space &space, offs_t offset)
// comx_io_w - I/O write
//-------------------------------------------------
-void comx_eb_device::comx_io_w(address_space &space, offs_t offset, UINT8 data)
+void comx_eb_device::comx_io_w(address_space &space, offs_t offset, uint8_t data)
{
if (offset == 1 && !(BIT(data, 0)))
{
diff --git a/src/devices/bus/comx35/expbox.h b/src/devices/bus/comx35/expbox.h
index 72bc7fc5a59..00febcb6188 100644
--- a/src/devices/bus/comx35/expbox.h
+++ b/src/devices/bus/comx35/expbox.h
@@ -34,7 +34,7 @@ class comx_eb_device : public device_t,
{
public:
// construction/destruction
- comx_eb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_eb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_WRITE_LINE_MEMBER( slot1_irq_w ) { m_irq[0] = state; set_irq(); }
DECLARE_WRITE_LINE_MEMBER( slot2_irq_w ) { m_irq[1] = state; set_irq(); }
@@ -53,10 +53,10 @@ protected:
// device_comx_expansion_card_interface overrides
virtual int comx_ef4_r() override;
virtual void comx_q_w(int state) override;
- virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom) override;
- virtual void comx_mwr_w(address_space &space, offs_t offset, UINT8 data) override;
- virtual UINT8 comx_io_r(address_space &space, offs_t offset) override;
- virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t comx_mrd_r(address_space &space, offs_t offset, int *extrom) override;
+ virtual void comx_mwr_w(address_space &space, offs_t offset, uint8_t data) override;
+ virtual uint8_t comx_io_r(address_space &space, offs_t offset) override;
+ virtual void comx_io_w(address_space &space, offs_t offset, uint8_t data) override;
void set_irq() { m_slot->irq_w(m_irq[0] || m_irq[1] || m_irq[2] || m_irq[3]); }
@@ -66,7 +66,7 @@ private:
comx_expansion_slot_device *m_expansion_slot[MAX_EB_SLOTS];
int m_irq[MAX_EB_SLOTS];
- UINT8 m_select;
+ uint8_t m_select;
};
diff --git a/src/devices/bus/comx35/fdc.cpp b/src/devices/bus/comx35/fdc.cpp
index 30693eb3738..b5003e194fc 100644
--- a/src/devices/bus/comx35/fdc.cpp
+++ b/src/devices/bus/comx35/fdc.cpp
@@ -122,7 +122,7 @@ machine_config_constructor comx_fd_device::device_mconfig_additions() const
// comx_fd_device - constructor
//-------------------------------------------------
-comx_fd_device::comx_fd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_fd_device::comx_fd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COMX_FD, "COMX FD", tag, owner, clock, "comx_fd", __FILE__),
device_comx_expansion_card_interface(mconfig, *this),
m_fdc(*this, WD1770_TAG),
@@ -196,9 +196,9 @@ void comx_fd_device::comx_q_w(int state)
// comx_mrd_r - memory read
//-------------------------------------------------
-UINT8 comx_fd_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom)
+uint8_t comx_fd_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (offset >= 0x0dd0 && offset < 0x0de0)
{
@@ -218,9 +218,9 @@ UINT8 comx_fd_device::comx_mrd_r(address_space &space, offs_t offset, int *extro
// comx_io_r - I/O read
//-------------------------------------------------
-UINT8 comx_fd_device::comx_io_r(address_space &space, offs_t offset)
+uint8_t comx_fd_device::comx_io_r(address_space &space, offs_t offset)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (offset == 2)
{
@@ -243,7 +243,7 @@ UINT8 comx_fd_device::comx_io_r(address_space &space, offs_t offset)
// comx_io_w - I/O write
//-------------------------------------------------
-void comx_fd_device::comx_io_w(address_space &space, offs_t offset, UINT8 data)
+void comx_fd_device::comx_io_w(address_space &space, offs_t offset, uint8_t data)
{
if (offset == 2)
{
diff --git a/src/devices/bus/comx35/fdc.h b/src/devices/bus/comx35/fdc.h
index 0d8cddd7e60..70ce499a2f3 100644
--- a/src/devices/bus/comx35/fdc.h
+++ b/src/devices/bus/comx35/fdc.h
@@ -29,7 +29,7 @@ class comx_fd_device : public device_t,
{
public:
// construction/destruction
- comx_fd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_fd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -45,9 +45,9 @@ protected:
// device_comx_expansion_card_interface overrides
virtual int comx_ef4_r() override;
virtual void comx_q_w(int state) override;
- virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom) override;
- virtual UINT8 comx_io_r(address_space &space, offs_t offset) override;
- virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t comx_mrd_r(address_space &space, offs_t offset, int *extrom) override;
+ virtual uint8_t comx_io_r(address_space &space, offs_t offset) override;
+ virtual void comx_io_w(address_space &space, offs_t offset, uint8_t data) override;
private:
// internal state
diff --git a/src/devices/bus/comx35/joycard.cpp b/src/devices/bus/comx35/joycard.cpp
index 2408693f1b8..243dccc2885 100644
--- a/src/devices/bus/comx35/joycard.cpp
+++ b/src/devices/bus/comx35/joycard.cpp
@@ -66,7 +66,7 @@ ioport_constructor comx_joy_device::device_input_ports() const
// comx_joy_device - constructor
//-------------------------------------------------
-comx_joy_device::comx_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_joy_device::comx_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COMX_JOY, "COMX JoyCard", tag, owner, clock, "comx_joy", __FILE__),
device_comx_expansion_card_interface(mconfig, *this),
m_joy1(*this, "JOY1"),
@@ -97,9 +97,9 @@ void comx_joy_device::device_reset()
// comx_mrd_r - I/O read
//-------------------------------------------------
-UINT8 comx_joy_device::comx_io_r(address_space &space, offs_t offset)
+uint8_t comx_joy_device::comx_io_r(address_space &space, offs_t offset)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (offset == 2)
{
diff --git a/src/devices/bus/comx35/joycard.h b/src/devices/bus/comx35/joycard.h
index 318c5265069..b171890e70e 100644
--- a/src/devices/bus/comx35/joycard.h
+++ b/src/devices/bus/comx35/joycard.h
@@ -27,7 +27,7 @@ class comx_joy_device : public device_t,
{
public:
// construction/destruction
- comx_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -38,7 +38,7 @@ protected:
virtual void device_reset() override;
// device_comx_expansion_card_interface overrides
- virtual UINT8 comx_io_r(address_space &space, offs_t offset) override;
+ virtual uint8_t comx_io_r(address_space &space, offs_t offset) override;
private:
required_ioport m_joy1;
diff --git a/src/devices/bus/comx35/printer.cpp b/src/devices/bus/comx35/printer.cpp
index 5d0cb050f70..1625c5b4580 100644
--- a/src/devices/bus/comx35/printer.cpp
+++ b/src/devices/bus/comx35/printer.cpp
@@ -86,7 +86,7 @@ machine_config_constructor comx_prn_device::device_mconfig_additions() const
// comx_prn_device - constructor
//-------------------------------------------------
-comx_prn_device::comx_prn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_prn_device::comx_prn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COMX_PRN, "COMX-35 Printer Card", tag, owner, clock, "comx_prn", __FILE__),
device_comx_expansion_card_interface(mconfig, *this),
m_centronics(*this, CENTRONICS_TAG),
@@ -119,9 +119,9 @@ void comx_prn_device::device_reset()
// comx_mrd_r - memory read
//-------------------------------------------------
-UINT8 comx_prn_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom)
+uint8_t comx_prn_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (offset >= 0xc000 && offset < 0xe000)
{
@@ -136,7 +136,7 @@ UINT8 comx_prn_device::comx_mrd_r(address_space &space, offs_t offset, int *extr
// comx_io_r - I/O read
//-------------------------------------------------
-UINT8 comx_prn_device::comx_io_r(address_space &space, offs_t offset)
+uint8_t comx_prn_device::comx_io_r(address_space &space, offs_t offset)
{
/*
Parallel:
@@ -175,7 +175,7 @@ UINT8 comx_prn_device::comx_io_r(address_space &space, offs_t offset)
// comx_io_w - I/O write
//-------------------------------------------------
-void comx_prn_device::comx_io_w(address_space &space, offs_t offset, UINT8 data)
+void comx_prn_device::comx_io_w(address_space &space, offs_t offset, uint8_t data)
{
/*
Parallel:
diff --git a/src/devices/bus/comx35/printer.h b/src/devices/bus/comx35/printer.h
index f5b4d86b5a0..63cd21f3ae5 100644
--- a/src/devices/bus/comx35/printer.h
+++ b/src/devices/bus/comx35/printer.h
@@ -29,7 +29,7 @@ class comx_prn_device : public device_t,
{
public:
// construction/destruction
- comx_prn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_prn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -41,9 +41,9 @@ protected:
virtual void device_reset() override;
// device_comx_expansion_card_interface overrides
- virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom) override;
- virtual UINT8 comx_io_r(address_space &space, offs_t offset) override;
- virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t comx_mrd_r(address_space &space, offs_t offset, int *extrom) override;
+ virtual uint8_t comx_io_r(address_space &space, offs_t offset) override;
+ virtual void comx_io_w(address_space &space, offs_t offset, uint8_t data) override;
private:
required_device<centronics_device> m_centronics;
diff --git a/src/devices/bus/comx35/ram.cpp b/src/devices/bus/comx35/ram.cpp
index 0e096c5dc15..395dfb1e1c0 100644
--- a/src/devices/bus/comx35/ram.cpp
+++ b/src/devices/bus/comx35/ram.cpp
@@ -33,7 +33,7 @@ const device_type COMX_RAM = &device_creator<comx_ram_device>;
// comx_ram_device - constructor
//-------------------------------------------------
-comx_ram_device::comx_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_ram_device::comx_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COMX_RAM, "COMX-35 RAM Card", tag, owner, clock, "comx_ram", __FILE__),
device_comx_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram"),
@@ -65,9 +65,9 @@ void comx_ram_device::device_reset()
// comx_mrd_r - memory read
//-------------------------------------------------
-UINT8 comx_ram_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom)
+uint8_t comx_ram_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (offset >= 0xc000 && offset < 0xd000)
{
@@ -82,7 +82,7 @@ UINT8 comx_ram_device::comx_mrd_r(address_space &space, offs_t offset, int *extr
// comx_mwr_w - memory write
//-------------------------------------------------
-void comx_ram_device::comx_mwr_w(address_space &space, offs_t offset, UINT8 data)
+void comx_ram_device::comx_mwr_w(address_space &space, offs_t offset, uint8_t data)
{
if (offset >= 0xc000 && offset < 0xd000)
{
@@ -95,7 +95,7 @@ void comx_ram_device::comx_mwr_w(address_space &space, offs_t offset, UINT8 data
// comx_io_w - I/O write
//-------------------------------------------------
-void comx_ram_device::comx_io_w(address_space &space, offs_t offset, UINT8 data)
+void comx_ram_device::comx_io_w(address_space &space, offs_t offset, uint8_t data)
{
if (offset == 1)
{
diff --git a/src/devices/bus/comx35/ram.h b/src/devices/bus/comx35/ram.h
index c74a54066f4..848b38ccfdf 100644
--- a/src/devices/bus/comx35/ram.h
+++ b/src/devices/bus/comx35/ram.h
@@ -27,7 +27,7 @@ class comx_ram_device : public device_t,
{
public:
// construction/destruction
- comx_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -35,12 +35,12 @@ protected:
virtual void device_reset() override;
// device_comx_expansion_card_interface overrides
- virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom) override;
- virtual void comx_mwr_w(address_space &space, offs_t offset, UINT8 data) override;
- virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t comx_mrd_r(address_space &space, offs_t offset, int *extrom) override;
+ virtual void comx_mwr_w(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void comx_io_w(address_space &space, offs_t offset, uint8_t data) override;
private:
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
int m_bank;
};
diff --git a/src/devices/bus/comx35/thermal.cpp b/src/devices/bus/comx35/thermal.cpp
index 87945343580..82d4ab51fb2 100644
--- a/src/devices/bus/comx35/thermal.cpp
+++ b/src/devices/bus/comx35/thermal.cpp
@@ -51,7 +51,7 @@ const tiny_rom_entry *comx_thm_device::device_rom_region() const
// comx_thm_device - constructor
//-------------------------------------------------
-comx_thm_device::comx_thm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+comx_thm_device::comx_thm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COMX_THM, "COMX-35 Thermal Printer Card", tag, owner, clock, "comx_thm", __FILE__),
device_comx_expansion_card_interface(mconfig, *this),
m_rom(*this, "c000")
@@ -81,9 +81,9 @@ void comx_thm_device::device_reset()
// comx_mrd_r - memory read
//-------------------------------------------------
-UINT8 comx_thm_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom)
+uint8_t comx_thm_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (offset >= 0xc000 && offset < 0xd000)
{
@@ -98,7 +98,7 @@ UINT8 comx_thm_device::comx_mrd_r(address_space &space, offs_t offset, int *extr
// comx_io_r - I/O read
//-------------------------------------------------
-UINT8 comx_thm_device::comx_io_r(address_space &space, offs_t offset)
+uint8_t comx_thm_device::comx_io_r(address_space &space, offs_t offset)
{
/*
INP 2 is used for the printer status, where:
@@ -115,7 +115,7 @@ UINT8 comx_thm_device::comx_io_r(address_space &space, offs_t offset)
// comx_io_w - I/O write
//-------------------------------------------------
-void comx_thm_device::comx_io_w(address_space &space, offs_t offset, UINT8 data)
+void comx_thm_device::comx_io_w(address_space &space, offs_t offset, uint8_t data)
{
/*
OUT 2 is used to control the thermal printer where:
diff --git a/src/devices/bus/comx35/thermal.h b/src/devices/bus/comx35/thermal.h
index e2cadb511a8..111a6a64848 100644
--- a/src/devices/bus/comx35/thermal.h
+++ b/src/devices/bus/comx35/thermal.h
@@ -27,7 +27,7 @@ class comx_thm_device : public device_t,
{
public:
// construction/destruction
- comx_thm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ comx_thm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -38,9 +38,9 @@ protected:
virtual void device_reset() override;
// device_comx_expansion_card_interface overrides
- virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom) override;
- virtual UINT8 comx_io_r(address_space &space, offs_t offset) override;
- virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t comx_mrd_r(address_space &space, offs_t offset, int *extrom) override;
+ virtual uint8_t comx_io_r(address_space &space, offs_t offset) override;
+ virtual void comx_io_w(address_space &space, offs_t offset, uint8_t data) override;
private:
required_memory_region m_rom;
diff --git a/src/devices/bus/cpc/amdrum.cpp b/src/devices/bus/cpc/amdrum.cpp
index 072e7e117c4..3ed2f019655 100644
--- a/src/devices/bus/cpc/amdrum.cpp
+++ b/src/devices/bus/cpc/amdrum.cpp
@@ -36,7 +36,7 @@ machine_config_constructor cpc_amdrum_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-cpc_amdrum_device::cpc_amdrum_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_amdrum_device::cpc_amdrum_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CPC_AMDRUM, "Amdrum", tag, owner, clock, "cpc_amdrum", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this),
m_slot(nullptr),
diff --git a/src/devices/bus/cpc/amdrum.h b/src/devices/bus/cpc/amdrum.h
index 9f0b753f763..ce9643011fa 100644
--- a/src/devices/bus/cpc/amdrum.h
+++ b/src/devices/bus/cpc/amdrum.h
@@ -24,7 +24,7 @@ class cpc_amdrum_device : public device_t,
{
public:
// construction/destruction
- cpc_amdrum_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_amdrum_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cpc/brunword4.cpp b/src/devices/bus/cpc/brunword4.cpp
index a6ee0d9540c..134f3171460 100644
--- a/src/devices/bus/cpc/brunword4.cpp
+++ b/src/devices/bus/cpc/brunword4.cpp
@@ -62,7 +62,7 @@ const tiny_rom_entry *cpc_brunword4_device::device_rom_region() const
return ROM_NAME( cpc_brunword4 );
}
-cpc_brunword4_device::cpc_brunword4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_brunword4_device::cpc_brunword4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CPC_BRUNWORD_MK4, "Brunword Elite MK4", tag, owner, clock, "cpc_brunword4", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_rombank_active(false), m_bank_sel(0)
{
@@ -98,14 +98,14 @@ WRITE8_MEMBER(cpc_brunword4_device::rombank_w)
m_slot->rom_select(space,0,data & 0x3f); // repeats every 64 ROMs, this breaks upper cart ROM selection on the Plus
}
-void cpc_brunword4_device::set_mapping(UINT8 type)
+void cpc_brunword4_device::set_mapping(uint8_t type)
{
if(type != MAP_OTHER)
return;
if(m_rombank_active)
{
- UINT8* ROM = memregion("mk4_roms")->base();
- UINT8 bank = ((m_bank_sel & 0x38) >> 1) | (m_bank_sel & 0x03);
+ uint8_t* ROM = memregion("mk4_roms")->base();
+ uint8_t bank = ((m_bank_sel & 0x38) >> 1) | (m_bank_sel & 0x03);
membank(":bank3")->set_base(ROM+(bank*0x4000));
membank(":bank4")->set_base(ROM+((bank*0x4000) + 0x2000));
}
diff --git a/src/devices/bus/cpc/brunword4.h b/src/devices/bus/cpc/brunword4.h
index 009de694767..995fc698f4e 100644
--- a/src/devices/bus/cpc/brunword4.h
+++ b/src/devices/bus/cpc/brunword4.h
@@ -14,13 +14,13 @@ class cpc_brunword4_device : public device_t,
{
public:
// construction/destruction
- cpc_brunword4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_brunword4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
DECLARE_WRITE8_MEMBER(rombank_w);
- virtual void set_mapping(UINT8 type) override;
+ virtual void set_mapping(uint8_t type) override;
protected:
// device-level overrides
@@ -31,7 +31,7 @@ private:
cpc_expansion_slot_device *m_slot;
bool m_rombank_active;
- UINT8 m_bank_sel;
+ uint8_t m_bank_sel;
};
// device type definition
diff --git a/src/devices/bus/cpc/cpc_pds.cpp b/src/devices/bus/cpc/cpc_pds.cpp
index 292efd3f7cf..311bca693cb 100644
--- a/src/devices/bus/cpc/cpc_pds.cpp
+++ b/src/devices/bus/cpc/cpc_pds.cpp
@@ -35,7 +35,7 @@ machine_config_constructor cpc_pds_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-cpc_pds_device::cpc_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_pds_device::cpc_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CPC_PDS, "Programmers Development System (CPC Target)", tag, owner, clock, "cpc_pds", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr),
m_pio(*this,"pio")
diff --git a/src/devices/bus/cpc/cpc_pds.h b/src/devices/bus/cpc/cpc_pds.h
index 54d68e431fd..9111889cfcc 100644
--- a/src/devices/bus/cpc/cpc_pds.h
+++ b/src/devices/bus/cpc/cpc_pds.h
@@ -33,7 +33,7 @@ class cpc_pds_device : public device_t,
{
public:
// construction/destruction
- cpc_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cpc/cpc_rom.cpp b/src/devices/bus/cpc/cpc_rom.cpp
index 9b68acbe422..766c6b8277e 100644
--- a/src/devices/bus/cpc/cpc_rom.cpp
+++ b/src/devices/bus/cpc/cpc_rom.cpp
@@ -47,7 +47,7 @@ machine_config_constructor cpc_rom_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-cpc_rom_device::cpc_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_rom_device::cpc_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CPC_ROM, "ROM Box", tag, owner, clock, "cpc_rom", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this)
{
@@ -79,7 +79,7 @@ const device_type ROMSLOT = &device_creator<rom_image_device>;
// rom_image_device - constructor
//-------------------------------------------------
-rom_image_device::rom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+rom_image_device::rom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ROMSLOT, "ROM image", tag, owner, clock, "rom_image", __FILE__),
device_image_interface(mconfig, *this), m_base(nullptr)
{
@@ -108,9 +108,9 @@ void rom_image_device::device_start()
image_init_result rom_image_device::call_load()
{
device_image_interface* image = this;
- UINT64 size = image->length();
+ uint64_t size = image->length();
- m_base = std::make_unique<UINT8[]>(16384);
+ m_base = std::make_unique<uint8_t[]>(16384);
if(size <= 16384)
{
image->fread(m_base.get(),size);
diff --git a/src/devices/bus/cpc/cpc_rom.h b/src/devices/bus/cpc/cpc_rom.h
index 86cd429cbcd..f20cbd2dbb7 100644
--- a/src/devices/bus/cpc/cpc_rom.h
+++ b/src/devices/bus/cpc/cpc_rom.h
@@ -21,7 +21,7 @@ class rom_image_device : public device_t,
{
public:
// construction/destruction
- rom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~rom_image_device();
// image-level overrides
@@ -38,7 +38,7 @@ public:
virtual const char *image_interface() const override { return "cpc_rom"; }
virtual const char *file_extensions() const override { return "rom,bin"; }
- UINT8* base() { return m_base.get(); }
+ uint8_t* base() { return m_base.get(); }
protected:
// device-level overrides
@@ -46,7 +46,7 @@ protected:
virtual void device_start() override;
private:
- std::unique_ptr<UINT8[]> m_base;
+ std::unique_ptr<uint8_t[]> m_base;
};
@@ -64,12 +64,12 @@ class cpc_rom_device : public device_t,
{
public:
// construction/destruction
- cpc_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
- UINT8* base(UINT8 slot) { if(slot >=1 && slot <= 8) return m_rom[slot]->base(); else return nullptr; }
+ uint8_t* base(uint8_t slot) { if(slot >=1 && slot <= 8) return m_rom[slot]->base(); else return nullptr; }
protected:
// device-level overrides
diff --git a/src/devices/bus/cpc/cpc_rs232.cpp b/src/devices/bus/cpc/cpc_rs232.cpp
index 225c83c79d1..00090ace9aa 100644
--- a/src/devices/bus/cpc/cpc_rs232.cpp
+++ b/src/devices/bus/cpc/cpc_rs232.cpp
@@ -80,7 +80,7 @@ const tiny_rom_entry *cpc_ams_rs232_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CPC_RS232, "Pace RS232C interface", tag, owner, clock, "cpc_ser", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this),
m_pit(*this,"pit"),
@@ -89,7 +89,7 @@ cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, const char *ta
{
}
-cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cpc_expansion_card_interface(mconfig, *this),
m_pit(*this,"pit"),
@@ -98,7 +98,7 @@ cpc_rs232_device::cpc_rs232_device(const machine_config &mconfig, device_type ty
{
}
-cpc_ams_rs232_device::cpc_ams_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_ams_rs232_device::cpc_ams_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
cpc_rs232_device(mconfig, CPC_RS232_AMS, "Amstrad RS232C interface", tag, owner, clock, "cpc_serams", __FILE__)
{
}
diff --git a/src/devices/bus/cpc/cpc_rs232.h b/src/devices/bus/cpc/cpc_rs232.h
index e21d6357d88..816e8315f0a 100644
--- a/src/devices/bus/cpc/cpc_rs232.h
+++ b/src/devices/bus/cpc/cpc_rs232.h
@@ -20,8 +20,8 @@ class cpc_rs232_device : public device_t,
{
public:
// construction/destruction
- cpc_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- cpc_rs232_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ cpc_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cpc_rs232_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -52,7 +52,7 @@ class cpc_ams_rs232_device : public cpc_rs232_device
{
public:
// construction/destruction
- cpc_ams_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_ams_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cpc/cpc_ssa1.cpp b/src/devices/bus/cpc/cpc_ssa1.cpp
index f2f0f61cb56..9779f4b96da 100644
--- a/src/devices/bus/cpc/cpc_ssa1.cpp
+++ b/src/devices/bus/cpc/cpc_ssa1.cpp
@@ -25,7 +25,7 @@ const device_type CPC_DKSPEECH = &device_creator<cpc_dkspeech_device>;
READ8_MEMBER(cpc_ssa1_device::ssa1_r)
{
- UINT8 ret = 0xff;
+ uint8_t ret = 0xff;
if(get_sby() == 0)
ret &= ~0x80;
@@ -43,7 +43,7 @@ WRITE8_MEMBER(cpc_ssa1_device::ssa1_w)
READ8_MEMBER(cpc_dkspeech_device::dkspeech_r)
{
- UINT8 ret = 0xff;
+ uint8_t ret = 0xff;
// SBY is not connected
@@ -158,7 +158,7 @@ machine_config_constructor cpc_dkspeech_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-cpc_ssa1_device::cpc_ssa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_ssa1_device::cpc_ssa1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CPC_SSA1, "SSA-1", tag, owner, clock, "cpc_ssa1", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_rom(nullptr),
m_lrq(1), m_sby(0),
@@ -166,7 +166,7 @@ cpc_ssa1_device::cpc_ssa1_device(const machine_config &mconfig, const char *tag,
{
}
-cpc_dkspeech_device::cpc_dkspeech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_dkspeech_device::cpc_dkspeech_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CPC_DKSPEECH, "DK'Tronics Speech Synthesiser", tag, owner, clock, "cpc_dkspeech", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_rom(nullptr),
m_lrq(1), m_sby(0),
diff --git a/src/devices/bus/cpc/cpc_ssa1.h b/src/devices/bus/cpc/cpc_ssa1.h
index 813d304a9e4..d437091006a 100644
--- a/src/devices/bus/cpc/cpc_ssa1.h
+++ b/src/devices/bus/cpc/cpc_ssa1.h
@@ -53,16 +53,16 @@ class cpc_ssa1_device : public device_t,
{
public:
// construction/destruction
- cpc_ssa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_ssa1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
- void set_lrq(UINT8 state) { m_lrq = state; }
- UINT8 get_lrq() { return m_lrq; }
- void set_sby(UINT8 state) { m_sby = state; }
- UINT8 get_sby() { return m_sby; }
+ void set_lrq(uint8_t state) { m_lrq = state; }
+ uint8_t get_lrq() { return m_lrq; }
+ void set_sby(uint8_t state) { m_sby = state; }
+ uint8_t get_sby() { return m_sby; }
DECLARE_READ8_MEMBER(ssa1_r);
DECLARE_WRITE8_MEMBER(ssa1_w);
@@ -77,9 +77,9 @@ protected:
private:
cpc_expansion_slot_device *m_slot;
- UINT8 *m_rom;
- UINT8 m_lrq;
- UINT8 m_sby;
+ uint8_t *m_rom;
+ uint8_t m_lrq;
+ uint8_t m_sby;
required_device<sp0256_device> m_sp0256_device;
};
@@ -89,16 +89,16 @@ class cpc_dkspeech_device : public device_t,
{
public:
// construction/destruction
- cpc_dkspeech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_dkspeech_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
- void set_lrq(UINT8 state) { m_lrq = state; }
- UINT8 get_lrq() { return m_lrq; }
- void set_sby(UINT8 state) { m_sby = state; }
- UINT8 get_sby() { return m_sby; }
+ void set_lrq(uint8_t state) { m_lrq = state; }
+ uint8_t get_lrq() { return m_lrq; }
+ void set_sby(uint8_t state) { m_sby = state; }
+ uint8_t get_sby() { return m_sby; }
DECLARE_READ8_MEMBER(dkspeech_r);
DECLARE_WRITE8_MEMBER(dkspeech_w);
@@ -113,9 +113,9 @@ protected:
private:
cpc_expansion_slot_device *m_slot;
- UINT8 *m_rom;
- UINT8 m_lrq;
- UINT8 m_sby;
+ uint8_t *m_rom;
+ uint8_t m_lrq;
+ uint8_t m_sby;
required_device<sp0256_device> m_sp0256_device;
};
diff --git a/src/devices/bus/cpc/cpcexp.cpp b/src/devices/bus/cpc/cpcexp.cpp
index 43b35ac57f2..2e4f0c558a3 100644
--- a/src/devices/bus/cpc/cpcexp.cpp
+++ b/src/devices/bus/cpc/cpcexp.cpp
@@ -41,7 +41,7 @@ device_cpc_expansion_card_interface::~device_cpc_expansion_card_interface()
// LIVE DEVICE
//**************************************************************************
-cpc_expansion_slot_device::cpc_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_expansion_slot_device::cpc_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CPC_EXPANSION_SLOT, "Amstrad CPC expansion port", tag, owner, clock, "cpc_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_out_irq_cb(*this),
diff --git a/src/devices/bus/cpc/cpcexp.h b/src/devices/bus/cpc/cpcexp.h
index ffde80ef655..7825dfefbca 100644
--- a/src/devices/bus/cpc/cpcexp.h
+++ b/src/devices/bus/cpc/cpcexp.h
@@ -101,12 +101,12 @@ public:
virtual WRITE_LINE_MEMBER( cursor_w ) { };
virtual WRITE_LINE_MEMBER( romen_w ) { };
- void set_rom_bank(UINT8 sel) { m_rom_sel = sel; } // tell device the currently selected ROM
- UINT8 get_rom_bank() { return m_rom_sel; }
- virtual void set_mapping(UINT8 type) { };
+ void set_rom_bank(uint8_t sel) { m_rom_sel = sel; } // tell device the currently selected ROM
+ uint8_t get_rom_bank() { return m_rom_sel; }
+ virtual void set_mapping(uint8_t type) { };
private:
- UINT8 m_rom_sel; // currently selected ROM
+ uint8_t m_rom_sel; // currently selected ROM
};
@@ -117,7 +117,7 @@ class cpc_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- cpc_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~cpc_expansion_slot_device();
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_irq_cb.set_callback(object); }
@@ -132,8 +132,8 @@ public:
DECLARE_WRITE_LINE_MEMBER( romdis_w );
DECLARE_WRITE8_MEMBER( rom_select );
- void set_rom_bank(UINT8 sel) { if(m_card) m_card->set_rom_bank(sel); } // tell device the currently selected ROM
- void set_mapping(UINT8 type) { if(m_card) m_card->set_mapping(type); } // tell device to enable any ROM or RAM mapping
+ void set_rom_bank(uint8_t sel) { if(m_card) m_card->set_rom_bank(sel); } // tell device the currently selected ROM
+ void set_mapping(uint8_t type) { if(m_card) m_card->set_mapping(type); } // tell device to enable any ROM or RAM mapping
DECLARE_WRITE_LINE_MEMBER( cursor_w ) { if(m_card) m_card->cursor_w(state); } // pass on CRTC Cursor signal
DECLARE_WRITE_LINE_MEMBER( romen_w ) { if(m_card) m_card->romen_w(state); } // pass on /ROMEN signal
diff --git a/src/devices/bus/cpc/ddi1.cpp b/src/devices/bus/cpc/ddi1.cpp
index f0bf519a2e5..ef21cb9f319 100644
--- a/src/devices/bus/cpc/ddi1.cpp
+++ b/src/devices/bus/cpc/ddi1.cpp
@@ -61,7 +61,7 @@ machine_config_constructor cpc_ddi1_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-cpc_ddi1_device::cpc_ddi1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_ddi1_device::cpc_ddi1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CPC_DDI1, "DDI-1", tag, owner, clock, "cpc_ddi1", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr),
m_fdc(*this,"upd765"),
@@ -127,7 +127,7 @@ WRITE8_MEMBER(cpc_ddi1_device::fdc_w)
READ8_MEMBER(cpc_ddi1_device::fdc_r)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
switch(offset)
{
@@ -150,13 +150,13 @@ WRITE8_MEMBER(cpc_ddi1_device::rombank_w)
m_slot->rom_select(space,0,data);
}
-void cpc_ddi1_device::set_mapping(UINT8 type)
+void cpc_ddi1_device::set_mapping(uint8_t type)
{
if(type != MAP_UPPER)
return;
if(m_rom_active)
{
- UINT8* ROM = memregion("disc_rom")->base();
+ uint8_t* ROM = memregion("disc_rom")->base();
membank(":bank7")->set_base(ROM);
membank(":bank8")->set_base(ROM+0x2000);
}
diff --git a/src/devices/bus/cpc/ddi1.h b/src/devices/bus/cpc/ddi1.h
index 776bb833b7f..fbe6de3605e 100644
--- a/src/devices/bus/cpc/ddi1.h
+++ b/src/devices/bus/cpc/ddi1.h
@@ -20,12 +20,12 @@ class cpc_ddi1_device : public device_t,
{
public:
// construction/destruction
- cpc_ddi1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_ddi1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
- virtual void set_mapping(UINT8 type) override;
+ virtual void set_mapping(uint8_t type) override;
virtual WRITE_LINE_MEMBER( romen_w ) override { m_romen = state; }
DECLARE_WRITE8_MEMBER(motor_w);
diff --git a/src/devices/bus/cpc/doubler.cpp b/src/devices/bus/cpc/doubler.cpp
index 632130dc08f..79d47383b6c 100644
--- a/src/devices/bus/cpc/doubler.cpp
+++ b/src/devices/bus/cpc/doubler.cpp
@@ -36,7 +36,7 @@ machine_config_constructor cpc_doubler_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-cpc_doubler_device::cpc_doubler_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_doubler_device::cpc_doubler_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CPC_DOUBLER, "Draysoft Doubler", tag, owner, clock, "cpc_doubler", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr),
m_tape(*this,"doubler_tape")
@@ -67,7 +67,7 @@ void cpc_doubler_device::device_reset()
READ8_MEMBER(cpc_doubler_device::ext_tape_r)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if(m_tape->input() > 0.03)
data |= 0x20;
return data;
diff --git a/src/devices/bus/cpc/doubler.h b/src/devices/bus/cpc/doubler.h
index 6c429618789..6685698f4a6 100644
--- a/src/devices/bus/cpc/doubler.h
+++ b/src/devices/bus/cpc/doubler.h
@@ -21,7 +21,7 @@ class cpc_doubler_device : public device_t,
{
public:
// construction/destruction
- cpc_doubler_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_doubler_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cpc/hd20.cpp b/src/devices/bus/cpc/hd20.cpp
index 58ce8a8658b..163687d41c7 100644
--- a/src/devices/bus/cpc/hd20.cpp
+++ b/src/devices/bus/cpc/hd20.cpp
@@ -48,7 +48,7 @@ const tiny_rom_entry *cpc_hd20_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-cpc_hd20_device::cpc_hd20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_hd20_device::cpc_hd20_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CPC_HD20, "Dobbertin HD20", tag, owner, clock, "cpc_hd20", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr),
m_hdc(*this,"hdc")
@@ -80,7 +80,7 @@ void cpc_hd20_device::device_reset()
READ8_MEMBER(cpc_hd20_device::hdc_r)
{
- UINT8 ret = 0x00;
+ uint8_t ret = 0x00;
switch(offset)
{
diff --git a/src/devices/bus/cpc/hd20.h b/src/devices/bus/cpc/hd20.h
index 69a3afdb5ff..467a28646dc 100644
--- a/src/devices/bus/cpc/hd20.h
+++ b/src/devices/bus/cpc/hd20.h
@@ -23,7 +23,7 @@ class cpc_hd20_device : public device_t,
{
public:
// construction/destruction
- cpc_hd20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_hd20_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cpc/magicsound.cpp b/src/devices/bus/cpc/magicsound.cpp
index 711c7978aa3..b80b9218884 100644
--- a/src/devices/bus/cpc/magicsound.cpp
+++ b/src/devices/bus/cpc/magicsound.cpp
@@ -72,7 +72,7 @@ machine_config_constructor al_magicsound_device::device_mconfig_additions() cons
// LIVE DEVICE
//**************************************************************************
-al_magicsound_device::al_magicsound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+al_magicsound_device::al_magicsound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, AL_MAGICSOUND, "Magic Sound Board", tag, owner, clock, "al_magicsound", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr),
m_dac(*this,"dac"),
@@ -142,8 +142,8 @@ WRITE8_MEMBER(al_magicsound_device::volume_w)
WRITE8_MEMBER(al_magicsound_device::mapper_w)
{
- UINT8 channel = (offset & 0x0c) >> 2;
- UINT8 page = offset & 0x03;
+ uint8_t channel = (offset & 0x0c) >> 2;
+ uint8_t page = offset & 0x03;
m_page[channel][page] = (~(data) & 0x3f) * 0x4000;
set_timer_gate(true);
}
@@ -167,8 +167,8 @@ WRITE_LINE_MEMBER(al_magicsound_device::sam3_w) { m_current_channel = 3; if(m_da
READ8_MEMBER(al_magicsound_device::dma_read_byte)
{
- UINT8 ret = 0xff;
- UINT8 page = (offset & 0xc000) >> 14;
+ uint8_t ret = 0xff;
+ uint8_t page = (offset & 0xc000) >> 14;
if(m_current_channel != -1)
ret = m_ramptr->read(m_page[m_current_channel][page] + (offset & 0x3fff));
diff --git a/src/devices/bus/cpc/magicsound.h b/src/devices/bus/cpc/magicsound.h
index 1c52a186f54..22ab6e2c055 100644
--- a/src/devices/bus/cpc/magicsound.h
+++ b/src/devices/bus/cpc/magicsound.h
@@ -38,7 +38,7 @@ class al_magicsound_device : public device_t,
{
public:
// construction/destruction
- al_magicsound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ al_magicsound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -75,13 +75,13 @@ private:
void set_timer_gate(bool state);
- UINT8 m_volume[4];
- UINT32 m_page[4][4];
- UINT8 m_output[4];
+ uint8_t m_volume[4];
+ uint32_t m_page[4][4];
+ uint8_t m_output[4];
bool m_dack[4];
- INT8 m_current_channel;
+ int8_t m_current_channel;
ram_device* m_ramptr;
- UINT8 m_current_output;
+ uint8_t m_current_output;
};
// device type definition
diff --git a/src/devices/bus/cpc/mface2.cpp b/src/devices/bus/cpc/mface2.cpp
index 6d9f9e6324f..769b2c82fa2 100644
--- a/src/devices/bus/cpc/mface2.cpp
+++ b/src/devices/bus/cpc/mface2.cpp
@@ -163,7 +163,7 @@ void cpc_multiface2_device::multiface_stop()
}
/* any io writes are passed through here */
-int cpc_multiface2_device::multiface_io_write(UINT16 offset, UINT8 data)
+int cpc_multiface2_device::multiface_io_write(uint16_t offset, uint8_t data)
{
int ret = 0;
@@ -308,7 +308,7 @@ ioport_constructor cpc_multiface2_device::device_input_ports() const
// LIVE DEVICE
//**************************************************************************
-cpc_multiface2_device::cpc_multiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_multiface2_device::cpc_multiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CPC_MFACE2, "Multiface II", tag, owner, clock, "cpc_mf2", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_multiface_ram(nullptr), m_multiface_flags(0), m_romdis(0)
{
@@ -326,7 +326,7 @@ void cpc_multiface2_device::device_start()
m_multiface_flags = MULTIFACE_VISIBLE;
/* allocate ram */
- m_multiface_ram = std::make_unique<UINT8[]>(8192);
+ m_multiface_ram = std::make_unique<uint8_t[]>(8192);
}
//-------------------------------------------------
diff --git a/src/devices/bus/cpc/mface2.h b/src/devices/bus/cpc/mface2.h
index 8ed2724034d..513af2ee3c5 100644
--- a/src/devices/bus/cpc/mface2.h
+++ b/src/devices/bus/cpc/mface2.h
@@ -36,7 +36,7 @@ class cpc_multiface2_device : public device_t,
{
public:
// construction/destruction
- cpc_multiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_multiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -46,7 +46,7 @@ public:
int multiface_hardware_enabled();
void multiface_rethink_memory();
void multiface_stop();
- int multiface_io_write(UINT16 offset, UINT8 data);
+ int multiface_io_write(uint16_t offset, uint8_t data);
void check_button_state();
protected:
// device-level overrides
@@ -59,10 +59,10 @@ private:
DIRECT_UPDATE_MEMBER( amstrad_default );
DIRECT_UPDATE_MEMBER( amstrad_multiface_directoverride );
- std::unique_ptr<UINT8[]> m_multiface_ram;
+ std::unique_ptr<uint8_t[]> m_multiface_ram;
unsigned long m_multiface_flags;
- UINT8 m_romdis;
+ uint8_t m_romdis;
};
// device type definition
diff --git a/src/devices/bus/cpc/playcity.cpp b/src/devices/bus/cpc/playcity.cpp
index 181a8fb3b0b..eece3a9c2d7 100644
--- a/src/devices/bus/cpc/playcity.cpp
+++ b/src/devices/bus/cpc/playcity.cpp
@@ -52,7 +52,7 @@ machine_config_constructor cpc_playcity_device::device_mconfig_additions() const
// LIVE DEVICE
//**************************************************************************
-cpc_playcity_device::cpc_playcity_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_playcity_device::cpc_playcity_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CPC_PLAYCITY, "PlayCity", tag, owner, clock, "cpc_playcity", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr),
m_ctc(*this,"ctc"),
@@ -132,8 +132,8 @@ READ8_MEMBER(cpc_playcity_device::ymz2_data_r)
void cpc_playcity_device::update_ymz_clock()
{
// Bit of a hack job here, since there is no way currently to connect the CTC channel output directly to the YMZ clocks.
- UINT8 rate = m_ctc->get_channel_constant(0);
- UINT32 clk = XTAL_4MHz;
+ uint8_t rate = m_ctc->get_channel_constant(0);
+ uint32_t clk = XTAL_4MHz;
switch(rate)
{
diff --git a/src/devices/bus/cpc/playcity.h b/src/devices/bus/cpc/playcity.h
index 757ffb23c45..dbf4f9f09fa 100644
--- a/src/devices/bus/cpc/playcity.h
+++ b/src/devices/bus/cpc/playcity.h
@@ -28,7 +28,7 @@ class cpc_playcity_device : public device_t,
{
public:
// construction/destruction
- cpc_playcity_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_playcity_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cpc/smartwatch.cpp b/src/devices/bus/cpc/smartwatch.cpp
index dfd0ad2a3cf..f7ae8148037 100644
--- a/src/devices/bus/cpc/smartwatch.cpp
+++ b/src/devices/bus/cpc/smartwatch.cpp
@@ -45,7 +45,7 @@ const tiny_rom_entry *cpc_smartwatch_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-cpc_smartwatch_device::cpc_smartwatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_smartwatch_device::cpc_smartwatch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CPC_SMARTWATCH, "Dobbertin Smartwatch", tag, owner, clock, "cpc_smartwatch", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr),
m_rtc(*this,"rtc"), m_bank(nullptr)
@@ -76,7 +76,7 @@ void cpc_smartwatch_device::device_reset()
READ8_MEMBER(cpc_smartwatch_device::rtc_w)
{
- UINT8* bank = (UINT8*)m_bank->base();
+ uint8_t* bank = (uint8_t*)m_bank->base();
if(offset & 1)
m_rtc->read_1(space,0);
else
@@ -86,6 +86,6 @@ READ8_MEMBER(cpc_smartwatch_device::rtc_w)
READ8_MEMBER(cpc_smartwatch_device::rtc_r)
{
- UINT8* bank = (UINT8*)m_bank->base();
+ uint8_t* bank = (uint8_t*)m_bank->base();
return ((bank[(offset & 1)+4]) & 0xfe) | (m_rtc->read_data(space,0) & 0x01);
}
diff --git a/src/devices/bus/cpc/smartwatch.h b/src/devices/bus/cpc/smartwatch.h
index 3842819cb94..bf62d040c8a 100644
--- a/src/devices/bus/cpc/smartwatch.h
+++ b/src/devices/bus/cpc/smartwatch.h
@@ -21,7 +21,7 @@ class cpc_smartwatch_device : public device_t,
{
public:
// construction/destruction
- cpc_smartwatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_smartwatch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/cpc/symbfac2.cpp b/src/devices/bus/cpc/symbfac2.cpp
index a1df95d48fd..9d466f41a85 100644
--- a/src/devices/bus/cpc/symbfac2.cpp
+++ b/src/devices/bus/cpc/symbfac2.cpp
@@ -71,7 +71,7 @@ ioport_constructor cpc_symbiface2_device::device_input_ports() const
// LIVE DEVICE
//**************************************************************************
-cpc_symbiface2_device::cpc_symbiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_symbiface2_device::cpc_symbiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CPC_SYMBIFACE2, "SYMBiFACE II", tag, owner, clock, "cpc_symf2", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr),
m_ide(*this,"ide"),
@@ -214,7 +214,7 @@ WRITE8_MEMBER(cpc_symbiface2_device::rtc_w)
*/
READ8_MEMBER(cpc_symbiface2_device::mouse_r)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
int input;
int input_diff;
@@ -268,15 +268,15 @@ INPUT_CHANGED_MEMBER(cpc_symbiface2_device::mouse_change_buttons)
// #FD17 (read) - map currently selected ROM to 0x4000 for read/write
READ8_MEMBER(cpc_symbiface2_device::rom_rewrite_r)
{
- UINT8 bank = get_rom_bank();
+ uint8_t bank = get_rom_bank();
if(bank >= 32)
return 0xff;
- m_4xxx_ptr_r = (UINT8*)machine().root_device().membank("bank3")->base();
- m_4xxx_ptr_w = (UINT8*)machine().root_device().membank("bank11")->base();
- m_6xxx_ptr_r = (UINT8*)machine().root_device().membank("bank4")->base();
- m_6xxx_ptr_w = (UINT8*)machine().root_device().membank("bank12")->base();
+ m_4xxx_ptr_r = (uint8_t*)machine().root_device().membank("bank3")->base();
+ m_4xxx_ptr_w = (uint8_t*)machine().root_device().membank("bank11")->base();
+ m_6xxx_ptr_r = (uint8_t*)machine().root_device().membank("bank4")->base();
+ m_6xxx_ptr_w = (uint8_t*)machine().root_device().membank("bank12")->base();
machine().root_device().membank("bank3")->set_base(&m_rom_space[bank*16384]);
machine().root_device().membank("bank4")->set_base(&m_rom_space[bank*16384+8192]);
machine().root_device().membank("bank11")->set_base(&m_rom_space[bank*16384]);
diff --git a/src/devices/bus/cpc/symbfac2.h b/src/devices/bus/cpc/symbfac2.h
index 5f5671485aa..fba811b40b2 100644
--- a/src/devices/bus/cpc/symbfac2.h
+++ b/src/devices/bus/cpc/symbfac2.h
@@ -20,7 +20,7 @@ class cpc_symbiface2_device : public device_t,
{
public:
// construction/destruction
- cpc_symbiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_symbiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -62,20 +62,20 @@ private:
required_ioport m_mouse_y;
required_ioport m_mouse_buttons;
- std::vector<UINT8> m_rom_space;
+ std::vector<uint8_t> m_rom_space;
bool m_iohigh;
- UINT16 m_ide_data;
+ uint16_t m_ide_data;
- UINT8 m_mouse_state;
- UINT8 m_input_x;
- UINT8 m_input_y;
+ uint8_t m_mouse_state;
+ uint8_t m_input_x;
+ uint8_t m_input_y;
// stores backup pointers so that mapping can be restored
- UINT8* m_4xxx_ptr_r;
- UINT8* m_4xxx_ptr_w;
- UINT8* m_6xxx_ptr_r;
- UINT8* m_6xxx_ptr_w;
+ uint8_t* m_4xxx_ptr_r;
+ uint8_t* m_4xxx_ptr_w;
+ uint8_t* m_6xxx_ptr_r;
+ uint8_t* m_6xxx_ptr_w;
};
// device type definition
diff --git a/src/devices/bus/cpc/transtape.cpp b/src/devices/bus/cpc/transtape.cpp
index 2735536f95f..1b3056d12c9 100644
--- a/src/devices/bus/cpc/transtape.cpp
+++ b/src/devices/bus/cpc/transtape.cpp
@@ -42,7 +42,7 @@ ioport_constructor cpc_transtape_device::device_input_ports() const
// LIVE DEVICE
//**************************************************************************
-cpc_transtape_device::cpc_transtape_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cpc_transtape_device::cpc_transtape_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CPC_TRANSTAPE, "HM Transtape", tag, owner, clock, "cpc_transtape", __FILE__),
device_cpc_expansion_card_interface(mconfig, *this), m_slot(nullptr), m_cpu(nullptr), m_space(nullptr), m_ram(nullptr),
m_rom_active(false),
@@ -61,7 +61,7 @@ void cpc_transtape_device::device_start()
m_cpu = static_cast<cpu_device*>(machine().device("maincpu"));
m_space = &m_cpu->space(AS_IO);
- m_ram = make_unique_clear<UINT8[]>(0x2000);
+ m_ram = make_unique_clear<uint8_t[]>(0x2000);
m_space->install_write_handler(0xfbf0,0xfbf0,write8_delegate(FUNC(cpc_transtape_device::output_w),this));
m_space->install_read_handler(0xfbff,0xfbff,read8_delegate(FUNC(cpc_transtape_device::input_r),this));
@@ -80,7 +80,7 @@ void cpc_transtape_device::device_reset()
void cpc_transtape_device::map_enable()
{
- UINT8* ROM = memregion("tt_rom")->base();
+ uint8_t* ROM = memregion("tt_rom")->base();
if(m_output & 0x02) // ROM enable
{
membank(":bank1")->set_base(ROM);
@@ -130,7 +130,7 @@ WRITE8_MEMBER(cpc_transtape_device::output_w)
m_slot->rom_select(space,0,get_rom_bank()); // trigger rethink
}
-void cpc_transtape_device::set_mapping(UINT8 type)
+void cpc_transtape_device::set_mapping(uint8_t type)
{
if(type != MAP_OTHER)
return;
diff --git a/src/devices/bus/cpc/transtape.h b/src/devices/bus/cpc/transtape.h
index 75fb06b03ca..bc73b843e96 100644
--- a/src/devices/bus/cpc/transtape.h
+++ b/src/devices/bus/cpc/transtape.h
@@ -18,13 +18,13 @@ class cpc_transtape_device : public device_t,
{
public:
// construction/destruction
- cpc_transtape_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cpc_transtape_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
virtual ioport_constructor device_input_ports() const override;
- virtual void set_mapping(UINT8 type) override;
+ virtual void set_mapping(uint8_t type) override;
virtual WRITE_LINE_MEMBER( romen_w ) override { m_romen = state; }
DECLARE_READ8_MEMBER(input_r);
@@ -41,10 +41,10 @@ private:
cpc_expansion_slot_device *m_slot;
cpu_device* m_cpu;
address_space* m_space;
- std::unique_ptr<UINT8[]> m_ram; // 8kB internal RAM
+ std::unique_ptr<uint8_t[]> m_ram; // 8kB internal RAM
bool m_rom_active;
bool m_romen;
- UINT8 m_output;
+ uint8_t m_output;
void map_enable();
};
diff --git a/src/devices/bus/crvision/rom.cpp b/src/devices/bus/crvision/rom.cpp
index 875a2b40fbc..0f54308df9c 100644
--- a/src/devices/bus/crvision/rom.cpp
+++ b/src/devices/bus/crvision/rom.cpp
@@ -26,44 +26,44 @@ const device_type CRVISION_ROM_16K = &device_creator<crvision_rom16k_device>;
const device_type CRVISION_ROM_18K = &device_creator<crvision_rom18k_device>;
-crvision_rom_device::crvision_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+crvision_rom_device::crvision_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_crvision_cart_interface(mconfig, *this)
{
}
-crvision_rom_device::crvision_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crvision_rom_device::crvision_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, CRVISION_ROM_4K, "CreatiVision 4K Carts", tag, owner, clock, "crvision_4k", __FILE__),
device_crvision_cart_interface(mconfig, *this)
{
}
-crvision_rom6k_device::crvision_rom6k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crvision_rom6k_device::crvision_rom6k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: crvision_rom_device(mconfig, CRVISION_ROM_6K, "CreatiVision 6K Carts", tag, owner, clock, "crvision_6k", __FILE__)
{
}
-crvision_rom8k_device::crvision_rom8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crvision_rom8k_device::crvision_rom8k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: crvision_rom_device(mconfig, CRVISION_ROM_8K, "CreatiVision 8K Carts", tag, owner, clock, "crvision_8k", __FILE__)
{
}
-crvision_rom10k_device::crvision_rom10k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crvision_rom10k_device::crvision_rom10k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: crvision_rom_device(mconfig, CRVISION_ROM_10K, "CreatiVision 10K Carts", tag, owner, clock, "crvision_10k", __FILE__)
{
}
-crvision_rom12k_device::crvision_rom12k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crvision_rom12k_device::crvision_rom12k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: crvision_rom_device(mconfig, CRVISION_ROM_12K, "CreatiVision 12K Carts", tag, owner, clock, "crvision_12k", __FILE__)
{
}
-crvision_rom16k_device::crvision_rom16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crvision_rom16k_device::crvision_rom16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: crvision_rom_device(mconfig, CRVISION_ROM_16K, "CreatiVision 16K Carts", tag, owner, clock, "crvision_16k", __FILE__)
{
}
-crvision_rom18k_device::crvision_rom18k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+crvision_rom18k_device::crvision_rom18k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: crvision_rom_device(mconfig, CRVISION_ROM_18K, "CreatiVision 18K Carts", tag, owner, clock, "crvision_18k", __FILE__)
{
}
diff --git a/src/devices/bus/crvision/rom.h b/src/devices/bus/crvision/rom.h
index 8a025d6c5d1..c557389ec97 100644
--- a/src/devices/bus/crvision/rom.h
+++ b/src/devices/bus/crvision/rom.h
@@ -13,8 +13,8 @@ class crvision_rom_device : public device_t,
{
public:
// construction/destruction
- crvision_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- crvision_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ crvision_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ crvision_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override {}
@@ -30,7 +30,7 @@ class crvision_rom6k_device : public crvision_rom_device
{
public:
// construction/destruction
- crvision_rom6k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ 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;
@@ -42,7 +42,7 @@ class crvision_rom8k_device : public crvision_rom_device
{
public:
// construction/destruction
- crvision_rom8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ 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;
@@ -54,7 +54,7 @@ class crvision_rom10k_device : public crvision_rom_device
{
public:
// construction/destruction
- crvision_rom10k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ 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;
@@ -67,7 +67,7 @@ class crvision_rom12k_device : public crvision_rom_device
{
public:
// construction/destruction
- crvision_rom12k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ 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;
@@ -80,7 +80,7 @@ class crvision_rom16k_device : public crvision_rom_device
{
public:
// construction/destruction
- crvision_rom16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ 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;
@@ -92,7 +92,7 @@ class crvision_rom18k_device : public crvision_rom_device
{
public:
// construction/destruction
- crvision_rom18k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ 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;
diff --git a/src/devices/bus/crvision/slot.cpp b/src/devices/bus/crvision/slot.cpp
index 7f12a9cf5af..1177bb40cd7 100644
--- a/src/devices/bus/crvision/slot.cpp
+++ b/src/devices/bus/crvision/slot.cpp
@@ -45,7 +45,7 @@ device_crvision_cart_interface::~device_crvision_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_crvision_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_crvision_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -62,7 +62,7 @@ void device_crvision_cart_interface::rom_alloc(UINT32 size, const char *tag)
//-------------------------------------------------
// crvision_cart_slot_device - constructor
//-------------------------------------------------
-crvision_cart_slot_device::crvision_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+crvision_cart_slot_device::crvision_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CRVISION_CART_SLOT, "CreatiVision Cartridge Slot", tag, owner, clock, "crvision_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -154,7 +154,7 @@ image_init_result crvision_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT32 size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
+ uint32_t size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
if (size > 0x4800)
{
@@ -223,7 +223,7 @@ std::string crvision_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- UINT32 size = m_file->size();
+ uint32_t size = m_file->size();
int type = CRV_4K;
switch (size)
diff --git a/src/devices/bus/crvision/slot.h b/src/devices/bus/crvision/slot.h
index 7643ca7fb1b..814a20e7579 100644
--- a/src/devices/bus/crvision/slot.h
+++ b/src/devices/bus/crvision/slot.h
@@ -37,14 +37,14 @@ public:
virtual DECLARE_READ8_MEMBER(read_rom40) { return 0xff; }
virtual DECLARE_READ8_MEMBER(read_rom80) { return 0xff; }
- void rom_alloc(UINT32 size, const char *tag);
- UINT8* get_rom_base() { return m_rom; }
- UINT32 get_rom_size() { return m_rom_size; }
+ void rom_alloc(uint32_t size, const char *tag);
+ uint8_t* get_rom_base() { return m_rom; }
+ uint32_t get_rom_size() { return m_rom_size; }
protected:
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
};
@@ -56,7 +56,7 @@ class crvision_cart_slot_device : public device_t,
{
public:
// construction/destruction
- crvision_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ crvision_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~crvision_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/dmv/dmvbus.cpp b/src/devices/bus/dmv/dmvbus.cpp
index ab1b079405d..121eeafaafa 100644
--- a/src/devices/bus/dmv/dmvbus.cpp
+++ b/src/devices/bus/dmv/dmvbus.cpp
@@ -194,7 +194,7 @@ device_dmvslot_interface::~device_dmvslot_interface()
//-------------------------------------------------
// dmvcart_slot_device - constructor
//-------------------------------------------------
-dmvcart_slot_device::dmvcart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+dmvcart_slot_device::dmvcart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, DMVCART_SLOT, "Decision Mate V cartridge slot", tag, owner, clock, "dmvcart_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_prog_read_cb(*this),
@@ -234,7 +234,7 @@ void dmvcart_slot_device::device_start()
read
-------------------------------------------------*/
-bool dmvcart_slot_device::read(offs_t offset, UINT8 &data)
+bool dmvcart_slot_device::read(offs_t offset, uint8_t &data)
{
if (m_cart)
return m_cart->read(offset, data);
@@ -245,7 +245,7 @@ bool dmvcart_slot_device::read(offs_t offset, UINT8 &data)
write
-------------------------------------------------*/
-bool dmvcart_slot_device::write(offs_t offset, UINT8 data)
+bool dmvcart_slot_device::write(offs_t offset, uint8_t data)
{
if (m_cart)
return m_cart->write(offset, data);
@@ -256,7 +256,7 @@ bool dmvcart_slot_device::write(offs_t offset, UINT8 data)
read
-------------------------------------------------*/
-void dmvcart_slot_device::ram_read(UINT8 cas, offs_t offset, UINT8 &data)
+void dmvcart_slot_device::ram_read(uint8_t cas, offs_t offset, uint8_t &data)
{
if (m_cart)
m_cart->ram_read(cas, offset, data);
@@ -266,7 +266,7 @@ void dmvcart_slot_device::ram_read(UINT8 cas, offs_t offset, UINT8 &data)
write
-------------------------------------------------*/
-void dmvcart_slot_device::ram_write(UINT8 cas, offs_t offset, UINT8 data)
+void dmvcart_slot_device::ram_write(uint8_t cas, offs_t offset, uint8_t data)
{
if (m_cart)
return m_cart->ram_write(cas, offset, data);
@@ -276,7 +276,7 @@ void dmvcart_slot_device::ram_write(UINT8 cas, offs_t offset, UINT8 data)
IO read
-------------------------------------------------*/
-void dmvcart_slot_device::io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data)
+void dmvcart_slot_device::io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data)
{
if (m_cart)
m_cart->io_read(space, ifsel, offset, data);
@@ -287,7 +287,7 @@ void dmvcart_slot_device::io_read(address_space &space, int ifsel, offs_t offset
IO write
-------------------------------------------------*/
-void dmvcart_slot_device::io_write(address_space &space, int ifsel, offs_t offset, UINT8 data)
+void dmvcart_slot_device::io_write(address_space &space, int ifsel, offs_t offset, uint8_t data)
{
if (m_cart)
m_cart->io_write(space, ifsel, offset, data);
diff --git a/src/devices/bus/dmv/dmvbus.h b/src/devices/bus/dmv/dmvbus.h
index da7f8f68d35..ab5d152515c 100644
--- a/src/devices/bus/dmv/dmvbus.h
+++ b/src/devices/bus/dmv/dmvbus.h
@@ -22,14 +22,14 @@ public:
device_dmvslot_interface(const machine_config &mconfig, device_t &device);
virtual ~device_dmvslot_interface();
- virtual bool read(offs_t offset, UINT8 &data) { return false; }
- virtual bool write(offs_t offset, UINT8 data) { return false; }
- virtual void io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data) { }
- virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data) { }
+ virtual bool read(offs_t offset, uint8_t &data) { return false; }
+ virtual bool write(offs_t offset, uint8_t data) { return false; }
+ virtual void io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) { }
+ virtual void io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) { }
// slot 1
- virtual void ram_read(UINT8 cas, offs_t offset, UINT8 &data) { }
- virtual void ram_write(UINT8 cas, offs_t offset, UINT8 data) { }
+ virtual void ram_read(uint8_t cas, offs_t offset, uint8_t &data) { }
+ virtual void ram_write(uint8_t cas, offs_t offset, uint8_t data) { }
// slot 7 and 7A
virtual bool av16bit() { return false; }
@@ -55,7 +55,7 @@ class dmvcart_slot_device : public device_t,
{
public:
// construction/destruction
- dmvcart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmvcart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~dmvcart_slot_device();
template<class _Object> static devcb_base &set_prog_read_callback(device_t &device, _Object object) { return downcast<dmvcart_slot_device &>(device).m_prog_read_cb.set_callback(object); }
@@ -68,12 +68,12 @@ public:
virtual void device_start() override;
// reading and writing
- virtual bool read(offs_t offset, UINT8 &data);
- virtual bool write(offs_t offset, UINT8 data);
- virtual void ram_read(UINT8 cas, offs_t offset, UINT8 &data);
- virtual void ram_write(UINT8 cas, offs_t offset, UINT8 data);
- virtual void io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data);
- virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data);
+ virtual bool read(offs_t offset, uint8_t &data);
+ virtual bool write(offs_t offset, uint8_t data);
+ virtual void ram_read(uint8_t cas, offs_t offset, uint8_t &data);
+ virtual void ram_write(uint8_t cas, offs_t offset, uint8_t data);
+ virtual void io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data);
+ virtual void io_write(address_space &space, int ifsel, offs_t offset, uint8_t data);
virtual void hold_w(int state);
virtual void switch16_w(int state);
virtual void timint_w(int state);
diff --git a/src/devices/bus/dmv/k210.cpp b/src/devices/bus/dmv/k210.cpp
index 0a49a824df0..00cb4004f51 100644
--- a/src/devices/bus/dmv/k210.cpp
+++ b/src/devices/bus/dmv/k210.cpp
@@ -51,7 +51,7 @@ const device_type DMV_K210 = &device_creator<dmv_k210_device>;
// dmv_k210_device - constructor
//-------------------------------------------------
-dmv_k210_device::dmv_k210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k210_device::dmv_k210_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, DMV_K210, "K210 Centronics", tag, owner, clock, "dmv_k210", __FILE__),
device_dmvslot_interface( mconfig, *this ),
m_ppi(*this, "ppi8255"),
@@ -101,13 +101,13 @@ machine_config_constructor dmv_k210_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( dmv_k210 );
}
-void dmv_k210_device::io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data)
+void dmv_k210_device::io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data)
{
if (ifsel == 0)
data = m_ppi->read(space, offset & 0x03);
}
-void dmv_k210_device::io_write(address_space &space, int ifsel, offs_t offset, UINT8 data)
+void dmv_k210_device::io_write(address_space &space, int ifsel, offs_t offset, uint8_t data)
{
if (ifsel == 0)
m_ppi->write(space, offset & 0x03, data);
diff --git a/src/devices/bus/dmv/k210.h b/src/devices/bus/dmv/k210.h
index 1939c5c051e..d3aaf7e1863 100644
--- a/src/devices/bus/dmv/k210.h
+++ b/src/devices/bus/dmv/k210.h
@@ -22,7 +22,7 @@ class dmv_k210_device :
{
public:
// construction/destruction
- dmv_k210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k210_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -49,8 +49,8 @@ protected:
void device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) override;
// dmvcart_interface overrides
- virtual void io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data) override;
- virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data) override;
+ virtual void io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) override;
+ virtual void io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) override;
private:
required_device<i8255_device> m_ppi;
@@ -60,8 +60,8 @@ private:
dmvcart_slot_device * m_bus;
emu_timer * m_clk1_timer;
- UINT8 m_portb;
- UINT8 m_portc;
+ uint8_t m_portb;
+ uint8_t m_portc;
};
diff --git a/src/devices/bus/dmv/k220.cpp b/src/devices/bus/dmv/k220.cpp
index b48a118f01c..f6ec770df19 100644
--- a/src/devices/bus/dmv/k220.cpp
+++ b/src/devices/bus/dmv/k220.cpp
@@ -132,7 +132,7 @@ const device_type DMV_K220 = &device_creator<dmv_k220_device>;
// dmv_k220_device - constructor
//-------------------------------------------------
-dmv_k220_device::dmv_k220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k220_device::dmv_k220_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, DMV_K220, "K220 diagnostic", tag, owner, clock, "dmv_k220", __FILE__),
device_dmvslot_interface( mconfig, *this ),
m_pit(*this, "pit8253"),
@@ -195,7 +195,7 @@ const tiny_rom_entry *dmv_k220_device::device_rom_region() const
// read
//-------------------------------------------------
-bool dmv_k220_device::read(offs_t offset, UINT8 &data)
+bool dmv_k220_device::read(offs_t offset, uint8_t &data)
{
if ((m_portc & 0x01) && offset >= 0x2000 && offset < 0x6000)
{
@@ -215,7 +215,7 @@ bool dmv_k220_device::read(offs_t offset, UINT8 &data)
// write
//-------------------------------------------------
-bool dmv_k220_device::write(offs_t offset, UINT8 data)
+bool dmv_k220_device::write(offs_t offset, uint8_t data)
{
if ((m_portc & 0x01) && offset >= 0x2000 && offset < 0x4000)
{
@@ -234,7 +234,7 @@ bool dmv_k220_device::write(offs_t offset, UINT8 data)
WRITE8_MEMBER( dmv_k220_device::porta_w )
{
// 74LS247 BCD-to-Seven-Segment Decoder
- static UINT8 bcd2hex[] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7d, 0x07, 0x7f, 0x6f, 0x58, 0x4c, 0x62, 0x69, 0x78, 0x00 };
+ static uint8_t bcd2hex[] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7d, 0x07, 0x7f, 0x6f, 0x58, 0x4c, 0x62, 0x69, 0x78, 0x00 };
machine().output().set_digit_value(0, bcd2hex[(data >> 4) & 0x0f]);
machine().output().set_digit_value(1, bcd2hex[data & 0x0f]);
diff --git a/src/devices/bus/dmv/k220.h b/src/devices/bus/dmv/k220.h
index 78efdf085d7..5977be0dd61 100644
--- a/src/devices/bus/dmv/k220.h
+++ b/src/devices/bus/dmv/k220.h
@@ -22,7 +22,7 @@ class dmv_k220_device :
{
public:
// construction/destruction
- dmv_k220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k220_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -41,8 +41,8 @@ protected:
virtual void device_reset() override;
// dmvcart_interface overrides
- virtual bool read(offs_t offset, UINT8 &data) override;
- virtual bool write(offs_t offset, UINT8 data) override;
+ virtual bool read(offs_t offset, uint8_t &data) override;
+ virtual bool write(offs_t offset, uint8_t data) override;
private:
required_device<pit8253_device> m_pit;
@@ -50,7 +50,7 @@ private:
required_memory_region m_ram;
required_memory_region m_rom;
- UINT8 m_portc;
+ uint8_t m_portc;
};
diff --git a/src/devices/bus/dmv/k230.cpp b/src/devices/bus/dmv/k230.cpp
index 8e859827304..f3e04adf0fe 100644
--- a/src/devices/bus/dmv/k230.cpp
+++ b/src/devices/bus/dmv/k230.cpp
@@ -106,7 +106,7 @@ const device_type DMV_K235 = &device_creator<dmv_k235_device>;
// dmv_k230_device - constructor
//-------------------------------------------------
-dmv_k230_device::dmv_k230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k230_device::dmv_k230_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, DMV_K230, "K230 8088 without interrupt controller", tag, owner, clock, "dmv_k230", __FILE__),
device_dmvslot_interface( mconfig, *this ),
m_maincpu(*this, "maincpu"),
@@ -114,7 +114,7 @@ dmv_k230_device::dmv_k230_device(const machine_config &mconfig, const char *tag,
{
}
-dmv_k230_device::dmv_k230_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+dmv_k230_device::dmv_k230_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_dmvslot_interface( mconfig, *this ),
m_maincpu(*this, "maincpu"),
@@ -126,7 +126,7 @@ dmv_k230_device::dmv_k230_device(const machine_config &mconfig, device_type type
// dmv_k231_device - constructor
//-------------------------------------------------
-dmv_k231_device::dmv_k231_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k231_device::dmv_k231_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: dmv_k230_device(mconfig, DMV_K231, "K231 8088 without interrupt controller", tag, owner, clock, "dmv_k231", __FILE__)
{
}
@@ -135,7 +135,7 @@ dmv_k231_device::dmv_k231_device(const machine_config &mconfig, const char *tag,
// dmv_k234_device - constructor
//-------------------------------------------------
-dmv_k234_device::dmv_k234_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k234_device::dmv_k234_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: dmv_k230_device(mconfig, DMV_K234, "K234 68008", tag, owner, clock, "dmv_k234", __FILE__), m_snr(0)
{
}
@@ -144,7 +144,7 @@ dmv_k234_device::dmv_k234_device(const machine_config &mconfig, const char *tag,
// dmv_k235_device - constructor
//-------------------------------------------------
-dmv_k235_device::dmv_k235_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k235_device::dmv_k235_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: dmv_k230_device(mconfig, DMV_K235, "K235 8088 with interrupt controller", tag, owner, clock, "dmv_k235", __FILE__),
m_pic(*this, "pic8259"),
m_dsw(*this, "DSW")
diff --git a/src/devices/bus/dmv/k230.h b/src/devices/bus/dmv/k230.h
index d6565f461ab..27b2397986f 100644
--- a/src/devices/bus/dmv/k230.h
+++ b/src/devices/bus/dmv/k230.h
@@ -29,8 +29,8 @@ class dmv_k230_device :
{
public:
// construction/destruction
- dmv_k230_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- dmv_k230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k230_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ dmv_k230_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -69,7 +69,7 @@ class dmv_k231_device :
{
public:
// construction/destruction
- dmv_k231_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k231_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -83,7 +83,7 @@ class dmv_k234_device :
{
public:
// construction/destruction
- dmv_k234_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k234_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER(snr_r);
DECLARE_WRITE8_MEMBER(snr_w);
@@ -113,7 +113,7 @@ class dmv_k235_device :
{
public:
// construction/destruction
- dmv_k235_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k235_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/dmv/k233.cpp b/src/devices/bus/dmv/k233.cpp
index 8668f7ab81f..11e31431e9b 100644
--- a/src/devices/bus/dmv/k233.cpp
+++ b/src/devices/bus/dmv/k233.cpp
@@ -28,7 +28,7 @@ const device_type DMV_K233 = &device_creator<dmv_k233_device>;
// dmv_k233_device - constructor
//-------------------------------------------------
-dmv_k233_device::dmv_k233_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k233_device::dmv_k233_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, DMV_K233, "K233 16K Shared RAM", tag, owner, clock, "dmv_k233", __FILE__),
device_dmvslot_interface( mconfig, *this ),
m_enabled(false),
@@ -54,7 +54,7 @@ void dmv_k233_device::device_reset()
m_enabled = false;
}
-void dmv_k233_device::io_write(address_space &space, int ifsel, offs_t offset, UINT8 data)
+void dmv_k233_device::io_write(address_space &space, int ifsel, offs_t offset, uint8_t data)
{
if (ifsel == 1)
m_enabled = !m_enabled;
@@ -64,7 +64,7 @@ void dmv_k233_device::io_write(address_space &space, int ifsel, offs_t offset, U
// read
//-------------------------------------------------
-bool dmv_k233_device::read(offs_t offset, UINT8 &data)
+bool dmv_k233_device::read(offs_t offset, uint8_t &data)
{
if (m_enabled && offset >= 0xc000 && offset < 0x10000)
{
@@ -79,7 +79,7 @@ bool dmv_k233_device::read(offs_t offset, UINT8 &data)
// write
//-------------------------------------------------
-bool dmv_k233_device::write(offs_t offset, UINT8 data)
+bool dmv_k233_device::write(offs_t offset, uint8_t data)
{
if (m_enabled && offset >= 0xc000 && offset < 0x10000)
{
diff --git a/src/devices/bus/dmv/k233.h b/src/devices/bus/dmv/k233.h
index f736dee2d4a..eb7411ec42c 100644
--- a/src/devices/bus/dmv/k233.h
+++ b/src/devices/bus/dmv/k233.h
@@ -20,7 +20,7 @@ class dmv_k233_device :
{
public:
// construction/destruction
- dmv_k233_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k233_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -28,13 +28,13 @@ protected:
virtual void device_reset() override;
// dmvcart_interface overrides
- virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data) override;
- virtual bool read(offs_t offset, UINT8 &data) override;
- virtual bool write(offs_t offset, UINT8 data) override;
+ virtual void io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) override;
+ virtual bool read(offs_t offset, uint8_t &data) override;
+ virtual bool write(offs_t offset, uint8_t data) override;
private:
bool m_enabled;
- UINT8 * m_ram;
+ uint8_t * m_ram;
};
diff --git a/src/devices/bus/dmv/k801.cpp b/src/devices/bus/dmv/k801.cpp
index 5bc586c09b5..211c678392b 100644
--- a/src/devices/bus/dmv/k801.cpp
+++ b/src/devices/bus/dmv/k801.cpp
@@ -111,7 +111,7 @@ const device_type DMV_K213 = &device_creator<dmv_k213_device>;
// dmv_k801_device - constructor
//-------------------------------------------------
-dmv_k801_device::dmv_k801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k801_device::dmv_k801_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, DMV_K801, "K801 RS-232 Switchable Interface", tag, owner, clock, "dmv_k801", __FILE__),
device_dmvslot_interface( mconfig, *this ),
m_epci(*this, "epci"),
@@ -119,7 +119,7 @@ dmv_k801_device::dmv_k801_device(const machine_config &mconfig, const char *tag,
{
}
-dmv_k801_device::dmv_k801_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+dmv_k801_device::dmv_k801_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_dmvslot_interface( mconfig, *this ),
m_epci(*this, "epci"),
@@ -131,13 +131,13 @@ dmv_k801_device::dmv_k801_device(const machine_config &mconfig, device_type type
// dmv_k211_device - constructor
//-------------------------------------------------
-dmv_k211_device::dmv_k211_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k211_device::dmv_k211_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: dmv_k801_device(mconfig, DMV_K211, "K211 RS-232 Communications Interface", tag, owner, clock, "dmv_k211", __FILE__)
{
}
-dmv_k211_device::dmv_k211_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+dmv_k211_device::dmv_k211_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: dmv_k801_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
@@ -146,7 +146,7 @@ dmv_k211_device::dmv_k211_device(const machine_config &mconfig, device_type type
// dmv_k212_device - constructor
//-------------------------------------------------
-dmv_k212_device::dmv_k212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k212_device::dmv_k212_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: dmv_k211_device(mconfig, DMV_K212, "K212 RS-232 Printer Interface", tag, owner, clock, "dmv_k212", __FILE__)
{
}
@@ -155,7 +155,7 @@ dmv_k212_device::dmv_k212_device(const machine_config &mconfig, const char *tag,
// dmv_k213_device - constructor
//-------------------------------------------------
-dmv_k213_device::dmv_k213_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k213_device::dmv_k213_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: dmv_k211_device(mconfig, DMV_K213, "K213 RS-232 Plotter Interface", tag, owner, clock, "dmv_k213", __FILE__)
{
}
@@ -231,9 +231,9 @@ WRITE_LINE_MEMBER(dmv_k801_device::epci_irq_w)
m_bus->m_out_irq_cb(state);
}
-void dmv_k801_device::io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data)
+void dmv_k801_device::io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data)
{
- UINT8 dsw = m_dsw->read() & 0x0f;
+ uint8_t dsw = m_dsw->read() & 0x0f;
if ((dsw >> 1) == ifsel && BIT(offset, 3) == BIT(dsw, 0))
{
if (offset & 0x04)
@@ -243,9 +243,9 @@ void dmv_k801_device::io_read(address_space &space, int ifsel, offs_t offset, UI
}
}
-void dmv_k801_device::io_write(address_space &space, int ifsel, offs_t offset, UINT8 data)
+void dmv_k801_device::io_write(address_space &space, int ifsel, offs_t offset, uint8_t data)
{
- UINT8 dsw = m_dsw->read() & 0x0f;
+ uint8_t dsw = m_dsw->read() & 0x0f;
if ((dsw >> 1) == ifsel && BIT(offset, 3) == BIT(dsw, 0))
{
if (offset & 0x04)
@@ -255,9 +255,9 @@ void dmv_k801_device::io_write(address_space &space, int ifsel, offs_t offset, U
}
}
-void dmv_k211_device::io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data)
+void dmv_k211_device::io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data)
{
- UINT8 jumpers = m_dsw->read() & 0x03;
+ uint8_t jumpers = m_dsw->read() & 0x03;
if ((BIT(jumpers, 0) && ifsel == 0) || (BIT(jumpers, 1) && ifsel == 1))
{
if (offset & 0x04)
@@ -267,9 +267,9 @@ void dmv_k211_device::io_read(address_space &space, int ifsel, offs_t offset, UI
}
}
-void dmv_k211_device::io_write(address_space &space, int ifsel, offs_t offset, UINT8 data)
+void dmv_k211_device::io_write(address_space &space, int ifsel, offs_t offset, uint8_t data)
{
- UINT8 jumpers = m_dsw->read() & 0x03;
+ uint8_t jumpers = m_dsw->read() & 0x03;
if ((BIT(jumpers, 0) && ifsel == 0) || (BIT(jumpers, 1) && ifsel == 1))
{
if (offset & 0x04)
diff --git a/src/devices/bus/dmv/k801.h b/src/devices/bus/dmv/k801.h
index 0b67b6c5d71..3d0732513e9 100644
--- a/src/devices/bus/dmv/k801.h
+++ b/src/devices/bus/dmv/k801.h
@@ -23,8 +23,8 @@ class dmv_k801_device :
{
public:
// construction/destruction
- dmv_k801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- dmv_k801_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ dmv_k801_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ dmv_k801_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -38,8 +38,8 @@ protected:
virtual void device_reset() override;
// dmvcart_interface overrides
- virtual void io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data) override;
- virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data) override;
+ virtual void io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) override;
+ virtual void io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) override;
protected:
required_device<mc2661_device> m_epci;
@@ -55,8 +55,8 @@ class dmv_k211_device :
{
public:
// construction/destruction
- dmv_k211_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- dmv_k211_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ dmv_k211_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ dmv_k211_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -64,8 +64,8 @@ public:
protected:
// dmvcart_interface overrides
- virtual void io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data) override;
- virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data) override;
+ virtual void io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) override;
+ virtual void io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) override;
};
// ======================> dmv_k212_device
@@ -75,7 +75,7 @@ class dmv_k212_device :
{
public:
// construction/destruction
- dmv_k212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k212_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -89,7 +89,7 @@ class dmv_k213_device :
{
public:
// construction/destruction
- dmv_k213_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k213_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/dmv/k803.cpp b/src/devices/bus/dmv/k803.cpp
index 00de36c9c24..b57e01c3b19 100644
--- a/src/devices/bus/dmv/k803.cpp
+++ b/src/devices/bus/dmv/k803.cpp
@@ -49,7 +49,7 @@ const device_type DMV_K803 = &device_creator<dmv_k803_device>;
// dmv_k803_device - constructor
//-------------------------------------------------
-dmv_k803_device::dmv_k803_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k803_device::dmv_k803_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, DMV_K803, "K803 RTC", tag, owner, clock, "dmv_k803", __FILE__),
device_dmvslot_interface( mconfig, *this ),
m_rtc(*this, "rtc"),
@@ -95,9 +95,9 @@ ioport_constructor dmv_k803_device::device_input_ports() const
return INPUT_PORTS_NAME( dmv_k803 );
}
-void dmv_k803_device::io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data)
+void dmv_k803_device::io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data)
{
- UINT8 dsw = m_dsw->read() & 0x0f;
+ uint8_t dsw = m_dsw->read() & 0x0f;
if ((dsw >> 1) == ifsel && BIT(offset, 3) == BIT(dsw, 0))
{
if (offset & 0x04)
@@ -105,9 +105,9 @@ void dmv_k803_device::io_read(address_space &space, int ifsel, offs_t offset, UI
}
}
-void dmv_k803_device::io_write(address_space &space, int ifsel, offs_t offset, UINT8 data)
+void dmv_k803_device::io_write(address_space &space, int ifsel, offs_t offset, uint8_t data)
{
- UINT8 dsw = m_dsw->read() & 0x0f;
+ uint8_t dsw = m_dsw->read() & 0x0f;
if ((dsw >> 1) == ifsel && BIT(offset, 3) == BIT(dsw, 0))
{
if (offset & 0x04)
diff --git a/src/devices/bus/dmv/k803.h b/src/devices/bus/dmv/k803.h
index c6a7d70af4d..820ec746455 100644
--- a/src/devices/bus/dmv/k803.h
+++ b/src/devices/bus/dmv/k803.h
@@ -21,7 +21,7 @@ class dmv_k803_device :
{
public:
// construction/destruction
- dmv_k803_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k803_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -34,8 +34,8 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual void io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data) override;
- virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data) override;
+ virtual void io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) override;
+ virtual void io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) override;
void update_int();
@@ -43,7 +43,7 @@ private:
required_device<mm58167_device> m_rtc;
required_ioport m_dsw;
dmvcart_slot_device * m_bus;
- UINT8 m_latch;
+ uint8_t m_latch;
int m_rtc_int;
};
diff --git a/src/devices/bus/dmv/k806.cpp b/src/devices/bus/dmv/k806.cpp
index 8cd13beb467..6667d267899 100644
--- a/src/devices/bus/dmv/k806.cpp
+++ b/src/devices/bus/dmv/k806.cpp
@@ -75,7 +75,7 @@ const device_type DMV_K806 = &device_creator<dmv_k806_device>;
// dmv_k806_device - constructor
//-------------------------------------------------
-dmv_k806_device::dmv_k806_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k806_device::dmv_k806_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, DMV_K806, "K806 mouse", tag, owner, clock, "dmv_k806", __FILE__),
device_dmvslot_interface( mconfig, *this ),
m_mcu(*this, "mcu"),
@@ -136,16 +136,16 @@ const tiny_rom_entry *dmv_k806_device::device_rom_region() const
return ROM_NAME( dmv_k806 );
}
-void dmv_k806_device::io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data)
+void dmv_k806_device::io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data)
{
- UINT8 jumpers = m_jumpers->read();
+ uint8_t jumpers = m_jumpers->read();
if (BIT(jumpers, ifsel) && ((!BIT(offset, 3) && BIT(jumpers, 5)) || (BIT(offset, 3) && BIT(jumpers, 6))))
data = m_mcu->upi41_master_r(space, offset & 1);
}
-void dmv_k806_device::io_write(address_space &space, int ifsel, offs_t offset, UINT8 data)
+void dmv_k806_device::io_write(address_space &space, int ifsel, offs_t offset, uint8_t data)
{
- UINT8 jumpers = m_jumpers->read();
+ uint8_t jumpers = m_jumpers->read();
if (BIT(jumpers, ifsel) && ((!BIT(offset, 3) && BIT(jumpers, 5)) || (BIT(offset, 3) && BIT(jumpers, 6))))
{
m_mcu->upi41_master_w(space, offset & 1, data);
@@ -164,7 +164,7 @@ READ8_MEMBER( dmv_k806_device::port1_r )
// -x-- ---- YB / X1
// x--- ---- not used
- UINT8 data = m_mouse_buttons->read() & 0x07;
+ uint8_t data = m_mouse_buttons->read() & 0x07;
data |= (m_mouse.xa != CLEAR_LINE ? 0 : 0x08);
data |= (m_mouse.xb != CLEAR_LINE ? 0 : 0x10);
diff --git a/src/devices/bus/dmv/k806.h b/src/devices/bus/dmv/k806.h
index 6ad48448e15..9df9381fa70 100644
--- a/src/devices/bus/dmv/k806.h
+++ b/src/devices/bus/dmv/k806.h
@@ -22,7 +22,7 @@ class dmv_k806_device :
{
public:
// construction/destruction
- dmv_k806_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k806_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -40,8 +40,8 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual void io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data) override;
- virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data) override;
+ virtual void io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) override;
+ virtual void io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) override;
private:
required_device<upi41_cpu_device> m_mcu;
diff --git a/src/devices/bus/dmv/ram.cpp b/src/devices/bus/dmv/ram.cpp
index b53bc26a63c..1f2d5e2df2a 100644
--- a/src/devices/bus/dmv/ram.cpp
+++ b/src/devices/bus/dmv/ram.cpp
@@ -32,7 +32,7 @@ const device_type DMV_K208 = &device_creator<dmv_k208_device>;
// dmv_ram_device - constructor
//-------------------------------------------------
-dmv_ram_device::dmv_ram_device(const machine_config &mconfig, device_type type, UINT32 size, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+dmv_ram_device::dmv_ram_device(const machine_config &mconfig, device_type type, uint32_t size, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_dmvslot_interface( mconfig, *this ), m_ram(nullptr),
m_size(size)
@@ -43,7 +43,7 @@ dmv_ram_device::dmv_ram_device(const machine_config &mconfig, device_type type,
// dmv_k200_device - constructor
//-------------------------------------------------
-dmv_k200_device::dmv_k200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k200_device::dmv_k200_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: dmv_ram_device(mconfig, DMV_K200, 1, "K200 64K RAM expansion", tag, owner, clock, "dmv_k200", __FILE__)
{
}
@@ -52,7 +52,7 @@ dmv_k200_device::dmv_k200_device(const machine_config &mconfig, const char *tag,
// dmv_k202_device - constructor
//-------------------------------------------------
-dmv_k202_device::dmv_k202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k202_device::dmv_k202_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: dmv_ram_device(mconfig, DMV_K202, 3, "K202 192K RAM expansion", tag, owner, clock, "dmv_k202", __FILE__)
{
}
@@ -61,7 +61,7 @@ dmv_k202_device::dmv_k202_device(const machine_config &mconfig, const char *tag,
// dmv_k208_device - constructor
//-------------------------------------------------
-dmv_k208_device::dmv_k208_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+dmv_k208_device::dmv_k208_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: dmv_ram_device(mconfig, DMV_K208, 7 , "K208 448K RAM expansion", tag, owner, clock, "dmv_k208", __FILE__)
{
}
@@ -79,7 +79,7 @@ void dmv_ram_device::device_start()
// read
//-------------------------------------------------
-void dmv_ram_device::ram_read(UINT8 cas, offs_t offset, UINT8 &data)
+void dmv_ram_device::ram_read(uint8_t cas, offs_t offset, uint8_t &data)
{
if (cas && cas <= m_size)
data = m_ram[((cas - 1) << 16) | (offset & 0xffff)];
@@ -89,7 +89,7 @@ void dmv_ram_device::ram_read(UINT8 cas, offs_t offset, UINT8 &data)
// write
//-------------------------------------------------
-void dmv_ram_device::ram_write(UINT8 cas, offs_t offset, UINT8 data)
+void dmv_ram_device::ram_write(uint8_t cas, offs_t offset, uint8_t data)
{
if (cas && cas <= m_size)
m_ram[((cas - 1) << 16) | (offset & 0xffff)] = data;
diff --git a/src/devices/bus/dmv/ram.h b/src/devices/bus/dmv/ram.h
index 3aceebe9165..ea8417fa720 100644
--- a/src/devices/bus/dmv/ram.h
+++ b/src/devices/bus/dmv/ram.h
@@ -20,19 +20,19 @@ class dmv_ram_device :
{
public:
// construction/destruction
- dmv_ram_device(const machine_config &mconfig, device_type type, UINT32 size, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ dmv_ram_device(const machine_config &mconfig, device_type type, uint32_t size, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
// device-level overrides
virtual void device_start() override;
// dmvcart_interface overrides
- virtual void ram_read(UINT8 cas, offs_t offset, UINT8 &data) override;
- virtual void ram_write(UINT8 cas, offs_t offset, UINT8 data) override;
+ virtual void ram_read(uint8_t cas, offs_t offset, uint8_t &data) override;
+ virtual void ram_write(uint8_t cas, offs_t offset, uint8_t data) override;
private:
- UINT8 * m_ram;
- UINT8 m_size;
+ uint8_t * m_ram;
+ uint8_t m_size;
};
@@ -41,7 +41,7 @@ class dmv_k200_device :
{
public:
// construction/destruction
- dmv_k200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k200_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
@@ -50,7 +50,7 @@ class dmv_k202_device :
{
public:
// construction/destruction
- dmv_k202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k202_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
@@ -59,7 +59,7 @@ class dmv_k208_device :
{
public:
// construction/destruction
- dmv_k208_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dmv_k208_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
diff --git a/src/devices/bus/ecbbus/ecbbus.cpp b/src/devices/bus/ecbbus/ecbbus.cpp
index c96d49da103..102309dcdcf 100644
--- a/src/devices/bus/ecbbus/ecbbus.cpp
+++ b/src/devices/bus/ecbbus/ecbbus.cpp
@@ -26,7 +26,7 @@ const device_type ECBBUS_SLOT = &device_creator<ecbbus_slot_device>;
// ecbbus_slot_device - constructor
//-------------------------------------------------
-ecbbus_slot_device::ecbbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ecbbus_slot_device::ecbbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ECBBUS_SLOT, "ECB bus slot", tag, owner, clock, "ecbbus_slot", __FILE__),
device_slot_interface(mconfig, *this), m_bus_tag(nullptr), m_bus_num(0), m_bus(nullptr)
{
@@ -90,7 +90,7 @@ device_ecbbus_card_interface::device_ecbbus_card_interface(const machine_config
// ecbbus_device - constructor
//-------------------------------------------------
-ecbbus_device::ecbbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ecbbus_device::ecbbus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ECBBUS, "ECB bus", tag, owner, clock, "ecbbus", __FILE__),
m_write_irq(*this),
m_write_nmi(*this)
@@ -128,7 +128,7 @@ void ecbbus_device::add_card(device_ecbbus_card_interface *card, int pos)
READ8_MEMBER( ecbbus_device::mem_r )
{
- UINT8 data = 0;
+ uint8_t data = 0;
for (auto & elem : m_ecbbus_device)
{
@@ -164,7 +164,7 @@ WRITE8_MEMBER( ecbbus_device::mem_w )
READ8_MEMBER( ecbbus_device::io_r )
{
- UINT8 data = 0;
+ uint8_t data = 0;
for (auto & elem : m_ecbbus_device)
{
diff --git a/src/devices/bus/ecbbus/ecbbus.h b/src/devices/bus/ecbbus/ecbbus.h
index 90bb67bced9..6c6e09ec123 100644
--- a/src/devices/bus/ecbbus/ecbbus.h
+++ b/src/devices/bus/ecbbus/ecbbus.h
@@ -94,7 +94,7 @@ class ecbbus_slot_device : public device_t,
{
public:
// construction/destruction
- ecbbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ecbbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -125,7 +125,7 @@ class ecbbus_device : public device_t
{
public:
// construction/destruction
- ecbbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ecbbus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<ecbbus_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<ecbbus_device &>(device).m_write_nmi.set_callback(object); }
@@ -170,10 +170,10 @@ public:
virtual ~device_ecbbus_card_interface() { }
// optional operation overrides
- virtual UINT8 ecbbus_mem_r(offs_t offset) { return 0; };
- virtual void ecbbus_mem_w(offs_t offset, UINT8 data) { };
- virtual UINT8 ecbbus_io_r(offs_t offset) { return 0; };
- virtual void ecbbus_io_w(offs_t offset, UINT8 data) { };
+ virtual uint8_t ecbbus_mem_r(offs_t offset) { return 0; };
+ virtual void ecbbus_mem_w(offs_t offset, uint8_t data) { };
+ virtual uint8_t ecbbus_io_r(offs_t offset) { return 0; };
+ virtual void ecbbus_io_w(offs_t offset, uint8_t data) { };
public:
ecbbus_slot_device *m_slot;
diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp
index 225214043cd..72dfc9a6ec6 100644
--- a/src/devices/bus/ecbbus/grip.cpp
+++ b/src/devices/bus/ecbbus/grip.cpp
@@ -227,8 +227,8 @@ MC6845_UPDATE_ROW( grip_device::crtc_update_row )
{
for (int column = 0; column < x_count; column++)
{
- UINT16 address = (m_page << 12) | (((ma + column) & 0xfff) << 3) | (ra & 0x07);
- UINT8 data = m_video_ram[address];
+ uint16_t address = (m_page << 12) | (((ma + column) & 0xfff) << 3) | (ra & 0x07);
+ uint8_t data = m_video_ram[address];
for (int bit = 0; bit < 8; bit++)
{
@@ -247,8 +247,8 @@ MC6845_UPDATE_ROW( grip_device::grip5_update_row )
for (column = 0; column < x_count; column++)
{
- UINT16 address = (m_dpage << 12) | (((ma + column) & 0xfff) << 3) | (ra & 0x07);
- UINT8 data = m_video_ram[address];
+ uint16_t address = (m_dpage << 12) | (((ma + column) & 0xfff) << 3) | (ra & 0x07);
+ uint8_t data = m_video_ram[address];
for (bit = 0; bit < 8; bit++)
{
@@ -265,7 +265,7 @@ MC6845_ON_UPDATE_ADDR_CHANGED( grip_device::grip5_addr_changed )
}
*/
-static const INT16 speaker_levels[] = { -32768, 0, 32767, 0 };
+static const int16_t speaker_levels[] = { -32768, 0, 32767, 0 };
//-------------------------------------------------
// I8255A interface
@@ -389,7 +389,7 @@ READ8_MEMBER( grip_device::sti_gpio_r )
*/
- UINT8 data = 0x20;
+ uint8_t data = 0x20;
// display enable
data |= m_crtc->de_r() << 1;
@@ -613,7 +613,7 @@ ioport_constructor grip_device::device_input_ports() const
// grip_device - constructor
//-------------------------------------------------
-grip_device::grip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+grip_device::grip_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ECB_GRIP21, "GRIP-2.1", tag, owner, clock, "grip", __FILE__),
device_ecbbus_card_interface(mconfig, *this),
m_ppi(*this, I8255A_TAG),
@@ -750,7 +750,7 @@ READ8_MEMBER( grip_device::stat_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
int js0 = 0, js1 = 0;
// JS0
@@ -858,9 +858,9 @@ WRITE8_MEMBER( grip5_state::dpage_w )
// ecbbus_io_r - I/O read
//-------------------------------------------------
-UINT8 grip_device::ecbbus_io_r(offs_t offset)
+uint8_t grip_device::ecbbus_io_r(offs_t offset)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if ((offset & 0xfe) == m_base)
{
@@ -886,7 +886,7 @@ UINT8 grip_device::ecbbus_io_r(offs_t offset)
// ecbbus_io_w - I/O write
//-------------------------------------------------
-void grip_device::ecbbus_io_w(offs_t offset, UINT8 data)
+void grip_device::ecbbus_io_w(offs_t offset, uint8_t data)
{
if ((offset & 0xfe) == m_base)
{
diff --git a/src/devices/bus/ecbbus/grip.h b/src/devices/bus/ecbbus/grip.h
index da4e83ed46a..3f26f392b1f 100644
--- a/src/devices/bus/ecbbus/grip.h
+++ b/src/devices/bus/ecbbus/grip.h
@@ -35,7 +35,7 @@ class grip_device : public device_t,
{
public:
// construction/destruction
- grip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ grip_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -71,8 +71,8 @@ protected:
virtual void device_reset() override;
// device_ecbbus_card_interface overrides
- virtual UINT8 ecbbus_io_r(offs_t offset) override;
- virtual void ecbbus_io_w(offs_t offset, UINT8 data) override;
+ virtual uint8_t ecbbus_io_r(offs_t offset) override;
+ virtual void ecbbus_io_w(offs_t offset, uint8_t data) override;
private:
required_device<i8255_device> m_ppi;
@@ -81,7 +81,7 @@ private:
required_device<centronics_device> m_centronics;
required_device<palette_device> m_palette;
required_device<speaker_sound_device> m_speaker;
- optional_shared_ptr<UINT8> m_video_ram;
+ optional_shared_ptr<uint8_t> m_video_ram;
required_ioport m_j3a;
required_ioport m_j3b;
required_ioport m_j7;
@@ -96,7 +96,7 @@ private:
// keyboard state
int m_ia; // PPI port A interrupt
int m_ib; // PPI port B interrupt
- UINT8 m_keydata; // keyboard data
+ uint8_t m_keydata; // keyboard data
int m_kbf; // keyboard buffer full
// video state
@@ -105,9 +105,9 @@ private:
int m_flash; // flash
// ECB bus state
- UINT8 m_base; // ECB base address
- UINT8 m_ppi_pa; // PPI port A data
- UINT8 m_ppi_pc; // PPI port C data
+ uint8_t m_base; // ECB base address
+ uint8_t m_ppi_pa; // PPI port A data
+ uint8_t m_ppi_pc; // PPI port C data
// timers
emu_timer *m_kb_timer;
diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp
index 3d7eb0e5a9b..0b66a916299 100644
--- a/src/devices/bus/econet/e01.cpp
+++ b/src/devices/bus/econet/e01.cpp
@@ -77,7 +77,7 @@
const device_type E01 = &device_creator<e01_device>;
const device_type E01S = &device_creator<e01s_device>;
-e01s_device::e01s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e01s_device::e01s_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
:e01_device(mconfig, E01S, "Acorn FileStore E01S", tag, owner, clock, "e01s", __FILE__) { m_variant = TYPE_E01S; }
@@ -377,7 +377,7 @@ inline void e01_device::hdc_irq_enable(int enabled)
// e01_device - constructor
//-------------------------------------------------
-e01_device::e01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+e01_device::e01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, E01, "Acorn FileStore E01", tag, owner, clock, "e01" , __FILE__),
device_econet_interface(mconfig, *this),
m_maincpu(*this, R65C102_TAG),
@@ -407,7 +407,7 @@ e01_device::e01_device(const machine_config &mconfig, const char *tag, device_t
}
-e01_device::e01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+e01_device::e01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_econet_interface(mconfig, *this),
m_maincpu(*this, R65C102_TAG),
@@ -487,7 +487,7 @@ void e01_device::device_timer(emu_timer &timer, device_timer_id id, int param, v
READ8_MEMBER( e01_device::read )
{
- UINT8 data;
+ uint8_t data;
if (m_ram_en)
{
@@ -622,7 +622,7 @@ WRITE8_MEMBER( e01_device::network_irq_enable_w )
READ8_MEMBER( e01_device::hdc_data_r )
{
- UINT8 data = m_scsi_data_in->read();
+ uint8_t data = m_scsi_data_in->read();
m_scsibus->write_ack(1);
diff --git a/src/devices/bus/econet/e01.h b/src/devices/bus/econet/e01.h
index 6e123a7a84c..4cf86c6cabd 100644
--- a/src/devices/bus/econet/e01.h
+++ b/src/devices/bus/econet/e01.h
@@ -29,8 +29,8 @@ class e01_device : public device_t,
{
public:
// construction/destruction
- e01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- e01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ e01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
enum
{
@@ -124,7 +124,7 @@ class e01s_device : public e01_device
{
public:
// construction/destruction
- e01s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ e01s_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
diff --git a/src/devices/bus/econet/econet.cpp b/src/devices/bus/econet/econet.cpp
index e56d843db32..acd22f218ab 100644
--- a/src/devices/bus/econet/econet.cpp
+++ b/src/devices/bus/econet/econet.cpp
@@ -53,7 +53,7 @@ device_econet_interface::device_econet_interface(const machine_config &mconfig,
// econet_slot_device - constructor
//-------------------------------------------------
-econet_slot_device::econet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+econet_slot_device::econet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ECONET_SLOT, "Econet station", tag, owner, clock, "econet_slot", __FILE__),
device_slot_interface(mconfig, *this), m_address(0), m_econet(nullptr)
{
@@ -193,7 +193,7 @@ inline int econet_device::get_signal(int signal)
// econet_device - constructor
//-------------------------------------------------
-econet_device::econet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+econet_device::econet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ECONET, "Econet", tag, owner, clock, "econet", __FILE__),
m_write_clk(*this),
m_write_data(*this)
diff --git a/src/devices/bus/econet/econet.h b/src/devices/bus/econet/econet.h
index e37cf989696..55acd438994 100644
--- a/src/devices/bus/econet/econet.h
+++ b/src/devices/bus/econet/econet.h
@@ -56,7 +56,7 @@ class econet_device : public device_t
{
public:
// construction/destruction
- econet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ econet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_clk_wr_callback(device_t &device, _Object object) { return downcast<econet_device &>(device).m_write_clk.set_callback(object); }
template<class _Object> static devcb_base &set_data_wr_callback(device_t &device, _Object object) { return downcast<econet_device &>(device).m_write_data.set_callback(object); }
@@ -116,7 +116,7 @@ class econet_slot_device : public device_t,
{
public:
// construction/destruction
- econet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ econet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -126,7 +126,7 @@ public:
private:
// configuration
- UINT8 m_address;
+ uint8_t m_address;
econet_device *m_econet;
};
@@ -149,7 +149,7 @@ public:
virtual void econet_data(int state) = 0;
econet_device *m_econet;
- UINT8 m_address;
+ uint8_t m_address;
};
diff --git a/src/devices/bus/electron/exp.cpp b/src/devices/bus/electron/exp.cpp
index c8c892058c6..bff51964e99 100644
--- a/src/devices/bus/electron/exp.cpp
+++ b/src/devices/bus/electron/exp.cpp
@@ -48,7 +48,7 @@ device_electron_expansion_interface::~device_electron_expansion_interface()
// electron_expansion_slot_device - constructor
//-------------------------------------------------
-electron_expansion_slot_device::electron_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+electron_expansion_slot_device::electron_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ELECTRON_EXPANSION_SLOT, "Acorn Electron Expansion port", tag, owner, clock, "electron_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_card(nullptr),
diff --git a/src/devices/bus/electron/exp.h b/src/devices/bus/electron/exp.h
index b89f795060b..e4cd4c96008 100644
--- a/src/devices/bus/electron/exp.h
+++ b/src/devices/bus/electron/exp.h
@@ -130,7 +130,7 @@ class electron_expansion_slot_device : public device_t, public device_slot_inter
{
public:
// construction/destruction
- electron_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ electron_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~electron_expansion_slot_device();
// callbacks
diff --git a/src/devices/bus/electron/m2105.cpp b/src/devices/bus/electron/m2105.cpp
index 1815c8bfe14..4228f02395f 100644
--- a/src/devices/bus/electron/m2105.cpp
+++ b/src/devices/bus/electron/m2105.cpp
@@ -120,7 +120,7 @@ const tiny_rom_entry *electron_m2105_device::device_rom_region() const
// electron_m2105_device - constructor
//-------------------------------------------------
-electron_m2105_device::electron_m2105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+electron_m2105_device::electron_m2105_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ELECTRON_M2105, "Acorn M2105 Expansion", tag, owner, clock, "electron_m2105", __FILE__),
device_electron_expansion_interface(mconfig, *this),
m_exp_rom(*this, "exp_rom"),
diff --git a/src/devices/bus/electron/m2105.h b/src/devices/bus/electron/m2105.h
index 9a97622fd93..511bbe766d4 100644
--- a/src/devices/bus/electron/m2105.h
+++ b/src/devices/bus/electron/m2105.h
@@ -30,7 +30,7 @@ class electron_m2105_device:
{
public:
// construction/destruction
- electron_m2105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ electron_m2105_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_WRITE_LINE_MEMBER(intrq_w);
diff --git a/src/devices/bus/electron/plus3.cpp b/src/devices/bus/electron/plus3.cpp
index ce1e859ac59..d24cdaa014b 100644
--- a/src/devices/bus/electron/plus3.cpp
+++ b/src/devices/bus/electron/plus3.cpp
@@ -96,7 +96,7 @@ const tiny_rom_entry *electron_plus3_device::device_rom_region() const
// electron_plus3_device - constructor
//-------------------------------------------------
-electron_plus3_device::electron_plus3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+electron_plus3_device::electron_plus3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ELECTRON_PLUS3, "Acorn Plus 3 Disc Expansion", tag, owner, clock, "electron_plus3", __FILE__),
device_electron_expansion_interface(mconfig, *this),
m_exp_rom(*this, "exp_rom"),
diff --git a/src/devices/bus/electron/plus3.h b/src/devices/bus/electron/plus3.h
index d2690c6864b..f5a07585635 100644
--- a/src/devices/bus/electron/plus3.h
+++ b/src/devices/bus/electron/plus3.h
@@ -25,7 +25,7 @@ class electron_plus3_device:
{
public:
// construction/destruction
- electron_plus3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ electron_plus3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_FLOPPY_FORMATS(floppy_formats);
diff --git a/src/devices/bus/ep64/exdos.cpp b/src/devices/bus/ep64/exdos.cpp
index 67c6df6646c..2afb8f83312 100644
--- a/src/devices/bus/ep64/exdos.cpp
+++ b/src/devices/bus/ep64/exdos.cpp
@@ -131,7 +131,7 @@ machine_config_constructor ep64_exdos_device::device_mconfig_additions() const
// ep64_exdos_device - constructor
//-------------------------------------------------
-ep64_exdos_device::ep64_exdos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ep64_exdos_device::ep64_exdos_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, EP64_EXDOS, "EXDOS", tag, owner, clock, "ep64_exdos", __FILE__),
device_ep64_expansion_bus_card_interface(mconfig, *this),
m_fdc(*this, WD1770_TAG),
@@ -193,7 +193,7 @@ READ8_MEMBER( ep64_exdos_device::read )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
data |= m_fdc->intrq_r() << 1;
data |= m_fdc->drq_r() << 7;
diff --git a/src/devices/bus/ep64/exdos.h b/src/devices/bus/ep64/exdos.h
index 6259440b751..6139d8a03de 100644
--- a/src/devices/bus/ep64/exdos.h
+++ b/src/devices/bus/ep64/exdos.h
@@ -29,7 +29,7 @@ class ep64_exdos_device : public device_t,
{
public:
// construction/destruction
- ep64_exdos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ep64_exdos_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ep64/exp.cpp b/src/devices/bus/ep64/exp.cpp
index 092dcf59995..784d13fa63b 100644
--- a/src/devices/bus/ep64/exp.cpp
+++ b/src/devices/bus/ep64/exp.cpp
@@ -42,7 +42,7 @@ device_ep64_expansion_bus_card_interface::device_ep64_expansion_bus_card_interfa
// ep64_expansion_bus_slot_device - constructor
//-------------------------------------------------
-ep64_expansion_bus_slot_device::ep64_expansion_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ep64_expansion_bus_slot_device::ep64_expansion_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, EP64_EXPANSION_BUS_SLOT, "Enterprise Sixty Four expansion bus slot", tag, owner, clock, "ep64_expansion_bus_slot", __FILE__)
, device_slot_interface(mconfig, *this)
, m_write_irq(*this)
diff --git a/src/devices/bus/ep64/exp.h b/src/devices/bus/ep64/exp.h
index a80f05b76f9..153afb0abc6 100644
--- a/src/devices/bus/ep64/exp.h
+++ b/src/devices/bus/ep64/exp.h
@@ -97,7 +97,7 @@ class ep64_expansion_bus_slot_device : public device_t,
public:
// construction/destruction
- ep64_expansion_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ep64_expansion_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
static void static_set_dave_tag(device_t &device, const char* tag) { downcast<ep64_expansion_bus_slot_device &>(device).m_dave.set_tag(tag); }
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<ep64_expansion_bus_slot_device &>(device).m_write_irq.set_callback(object); }
diff --git a/src/devices/bus/epson_sio/epson_sio.cpp b/src/devices/bus/epson_sio/epson_sio.cpp
index 88e50bb9cdc..f70e15006d7 100644
--- a/src/devices/bus/epson_sio/epson_sio.cpp
+++ b/src/devices/bus/epson_sio/epson_sio.cpp
@@ -52,7 +52,7 @@ device_epson_sio_interface::~device_epson_sio_interface()
// epson_sio_device - constructor
//-------------------------------------------------
-epson_sio_device::epson_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+epson_sio_device::epson_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, EPSON_SIO, "EPSON SIO port", tag, owner, clock, "epson_sio", __FILE__),
device_slot_interface(mconfig, *this), m_cart(nullptr),
m_write_rx(*this),
diff --git a/src/devices/bus/epson_sio/epson_sio.h b/src/devices/bus/epson_sio/epson_sio.h
index c59b3d6ddc1..c52ebcc11d9 100644
--- a/src/devices/bus/epson_sio/epson_sio.h
+++ b/src/devices/bus/epson_sio/epson_sio.h
@@ -41,7 +41,7 @@ class epson_sio_device : public device_t,
{
public:
// construction/destruction
- epson_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ epson_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~epson_sio_device();
// callbacks
diff --git a/src/devices/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp
index 4f93c542340..5e8463ef6a6 100644
--- a/src/devices/bus/epson_sio/pf10.cpp
+++ b/src/devices/bus/epson_sio/pf10.cpp
@@ -91,7 +91,7 @@ machine_config_constructor epson_pf10_device::device_mconfig_additions() const
// epson_pf10_device - constructor
//-------------------------------------------------
-epson_pf10_device::epson_pf10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+epson_pf10_device::epson_pf10_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, EPSON_PF10, "EPSON PF-10 Portable Floppy Unit", tag, owner, clock, "epson_pf10", __FILE__),
device_epson_sio_interface(mconfig, *this),
m_cpu(*this, "maincpu"),
diff --git a/src/devices/bus/epson_sio/pf10.h b/src/devices/bus/epson_sio/pf10.h
index 3d1d3d60131..16e1b1cb170 100644
--- a/src/devices/bus/epson_sio/pf10.h
+++ b/src/devices/bus/epson_sio/pf10.h
@@ -28,7 +28,7 @@ class epson_pf10_device : public device_t,
{
public:
// construction/destruction
- epson_pf10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ epson_pf10_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -72,8 +72,8 @@ private:
emu_timer *m_timer;
- UINT8 m_port1;
- UINT8 m_port2;
+ uint8_t m_port1;
+ uint8_t m_port2;
int m_rxc;
int m_hd6303_tx;
diff --git a/src/devices/bus/epson_sio/tf20.cpp b/src/devices/bus/epson_sio/tf20.cpp
index 83c65755501..c920d2324ee 100644
--- a/src/devices/bus/epson_sio/tf20.cpp
+++ b/src/devices/bus/epson_sio/tf20.cpp
@@ -126,7 +126,7 @@ machine_config_constructor epson_tf20_device::device_mconfig_additions() const
// epson_tf20_device - constructor
//-------------------------------------------------
-epson_tf20_device::epson_tf20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+epson_tf20_device::epson_tf20_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, EPSON_TF20, "EPSON TF-20 Dual Floppy Disk Drive", tag, owner, clock, "epson_tf20", __FILE__),
device_epson_sio_interface(mconfig, *this),
m_cpu(*this, "19b"),
diff --git a/src/devices/bus/epson_sio/tf20.h b/src/devices/bus/epson_sio/tf20.h
index 252e99ed4c8..8fc66e2917f 100644
--- a/src/devices/bus/epson_sio/tf20.h
+++ b/src/devices/bus/epson_sio/tf20.h
@@ -30,7 +30,7 @@ class epson_tf20_device : public device_t,
{
public:
// construction/destruction
- epson_tf20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ epson_tf20_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/gameboy/gb_slot.cpp b/src/devices/bus/gameboy/gb_slot.cpp
index c6182053665..158d9b98be9 100644
--- a/src/devices/bus/gameboy/gb_slot.cpp
+++ b/src/devices/bus/gameboy/gb_slot.cpp
@@ -59,7 +59,7 @@ device_gb_cart_interface::~device_gb_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_gb_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_gb_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -73,7 +73,7 @@ void device_gb_cart_interface::rom_alloc(UINT32 size, const char *tag)
// ram_alloc - alloc the space for the ram
//-------------------------------------------------
-void device_gb_cart_interface::ram_alloc(UINT32 size)
+void device_gb_cart_interface::ram_alloc(uint32_t size)
{
m_ram.resize(size);
}
@@ -84,7 +84,7 @@ void device_gb_cart_interface::ram_alloc(UINT32 size)
// blocks, so to simplify ROM access
//-------------------------------------------------
-void device_gb_cart_interface::rom_map_setup(UINT32 size)
+void device_gb_cart_interface::rom_map_setup(uint32_t size)
{
int i;
// setup the rom_bank_map array to faster ROM read
@@ -117,7 +117,7 @@ void device_gb_cart_interface::rom_map_setup(UINT32 size)
// blocks, so to simplify ROM access
//-------------------------------------------------
-void device_gb_cart_interface::ram_map_setup(UINT8 banks)
+void device_gb_cart_interface::ram_map_setup(uint8_t banks)
{
int mask = banks - 1;
@@ -137,7 +137,7 @@ void device_gb_cart_interface::ram_map_setup(UINT8 banks)
//-------------------------------------------------
// base_gb_cart_slot_device - constructor
//-------------------------------------------------
-base_gb_cart_slot_device::base_gb_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+base_gb_cart_slot_device::base_gb_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -146,12 +146,12 @@ base_gb_cart_slot_device::base_gb_cart_slot_device(const machine_config &mconfig
{
}
-gb_cart_slot_device::gb_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+gb_cart_slot_device::gb_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
base_gb_cart_slot_device(mconfig, GB_CART_SLOT, "Game Boy Cartridge Slot", tag, owner, clock, "gb_cart_slot", __FILE__)
{
}
-megaduck_cart_slot_device::megaduck_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+megaduck_cart_slot_device::megaduck_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
base_gb_cart_slot_device(mconfig, MEGADUCK_CART_SLOT, "Megaduck Cartridge Slot", tag, owner, clock, "megaduck_cart_slot", __FILE__)
{
}
@@ -262,9 +262,9 @@ image_init_result base_gb_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT32 offset;
- UINT32 len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
- UINT8 *ROM;
+ uint32_t offset;
+ uint32_t len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
+ uint8_t *ROM;
int rambanks = 0;
// From fullpath, check for presence of a header and skip it + check filesize is valid
@@ -413,7 +413,7 @@ image_init_result megaduck_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT32 len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
+ uint32_t len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
m_cart->rom_alloc(len, tag());
@@ -442,7 +442,7 @@ void base_gb_cart_slot_device::call_unload()
battery_save(m_cart->get_ram_base(), m_cart->get_ram_size());
}
-void base_gb_cart_slot_device::setup_ram(UINT8 banks)
+void base_gb_cart_slot_device::setup_ram(uint8_t banks)
{
m_cart->ram_alloc(banks * 0x2000);
memset(m_cart->get_ram_base(), 0xff, m_cart->get_ram_size());
@@ -452,12 +452,12 @@ void base_gb_cart_slot_device::setup_ram(UINT8 banks)
// This fails to catch Mani 4-in-1 carts... even when they match this, then they have MBC1/3 in the internal header instead of MMM01...
-bool base_gb_cart_slot_device::get_mmm01_candidate(UINT8 *ROM, UINT32 len)
+bool base_gb_cart_slot_device::get_mmm01_candidate(uint8_t *ROM, uint32_t len)
{
if (len < 0x8147)
return false;
- static const UINT8 nintendo_logo[0x18] = {
+ static const uint8_t nintendo_logo[0x18] = {
0xCE, 0xED, 0x66, 0x66, 0xCC, 0x0D, 0x00, 0x0B,
0x03, 0x73, 0x00, 0x83, 0x00, 0x0C, 0x00, 0x0D,
0x00, 0x08, 0x11, 0x1F, 0x88, 0x89, 0x00, 0x0E
@@ -475,7 +475,7 @@ bool base_gb_cart_slot_device::get_mmm01_candidate(UINT8 *ROM, UINT32 len)
return false;
}
-int base_gb_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
+int base_gb_cart_slot_device::get_cart_type(uint8_t *ROM, uint32_t len)
{
int type = GB_MBC_NONE;
@@ -596,8 +596,8 @@ std::string base_gb_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- UINT32 len = m_file->size(), offset = 0;
- std::vector<UINT8> rom(len);
+ uint32_t len = m_file->size(), offset = 0;
+ std::vector<uint8_t> rom(len);
int type;
m_file->read(&rom[0], len);
@@ -673,7 +673,7 @@ WRITE8_MEMBER(base_gb_cart_slot_device::write_ram)
Internal header logging
-------------------------------------------------*/
-void base_gb_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len)
+void base_gb_cart_slot_device::internal_header_logging(uint8_t *ROM, uint32_t len)
{
static const char *const cart_types[] =
{
@@ -695,7 +695,7 @@ void base_gb_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len)
// some company codes
static const struct
{
- UINT16 code;
+ uint16_t code;
const char *name;
}
companies[] =
@@ -779,7 +779,7 @@ void base_gb_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len)
static const int ramsize[8] = { 0, 2, 8, 32, 128, 64, 0, 0 };
char soft[17];
- UINT32 tmp;
+ uint32_t tmp;
int csum = 0, i = 0;
int rom_banks;
diff --git a/src/devices/bus/gameboy/gb_slot.h b/src/devices/bus/gameboy/gb_slot.h
index d333c524b07..ff202fe0507 100644
--- a/src/devices/bus/gameboy/gb_slot.h
+++ b/src/devices/bus/gameboy/gb_slot.h
@@ -64,17 +64,17 @@ public:
virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_ram) {}
- void rom_alloc(UINT32 size, const char *tag);
- void ram_alloc(UINT32 size);
- UINT8* get_rom_base() { return m_rom; }
- UINT8* get_ram_base() { return &m_ram[0]; }
- UINT32 get_rom_size() { return m_rom_size; }
- UINT32 get_ram_size() { return m_ram.size(); }
+ void rom_alloc(uint32_t size, const char *tag);
+ void ram_alloc(uint32_t size);
+ uint8_t* get_rom_base() { return m_rom; }
+ uint8_t* get_ram_base() { return &m_ram[0]; }
+ uint32_t get_rom_size() { return m_rom_size; }
+ uint32_t get_ram_size() { return m_ram.size(); }
- void rom_map_setup(UINT32 size);
- void ram_map_setup(UINT8 banks);
+ void rom_map_setup(uint32_t size);
+ void ram_map_setup(uint8_t banks);
- virtual void set_additional_wirings(UINT8 mask, int shift) { } // MBC-1 will then overwrite this!
+ virtual void set_additional_wirings(uint8_t mask, int shift) { } // MBC-1 will then overwrite this!
void set_has_timer(bool val) { has_timer = val; }
void set_has_rumble(bool val) { has_rumble = val; }
void set_has_battery(bool val) { has_battery = val; }
@@ -83,9 +83,9 @@ public:
void save_ram() { device().save_item(NAME(m_ram)); }
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT8> m_ram;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint8_t> m_ram;
// bankswitch variables
// we access ROM/RAM banks through these bank maps
@@ -94,10 +94,10 @@ public:
// 0x4000-0x7fff = rom_bank_map[m_latch_bank2] (generally defaults to m_latch_bank2 = 1)
// 0xa000-0xbfff = ram_bank_map[m_ram_bank] (generally defaults to m_ram_bank = 0)
// suitable writes to 0x0000-0x7fff can then modify m_latch_bank/m_latch_bank2
- UINT8 rom_bank_map[512]; // 16K chunks of ROM
- UINT8 ram_bank_map[256]; // 16K chunks of RAM
- UINT8 m_ram_bank;
- UINT16 m_latch_bank, m_latch_bank2;
+ uint8_t rom_bank_map[512]; // 16K chunks of ROM
+ uint8_t ram_bank_map[256]; // 16K chunks of RAM
+ uint8_t m_ram_bank;
+ uint16_t m_latch_bank, m_latch_bank2;
bool has_rumble, has_timer, has_battery;
};
@@ -111,7 +111,7 @@ class base_gb_cart_slot_device : public device_t,
{
public:
// construction/destruction
- base_gb_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ base_gb_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual ~base_gb_cart_slot_device();
// device-level overrides
@@ -124,13 +124,13 @@ public:
virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
int get_type() { return m_type; }
- int get_cart_type(UINT8 *ROM, UINT32 len);
- bool get_mmm01_candidate(UINT8 *ROM, UINT32 len);
+ int get_cart_type(uint8_t *ROM, uint32_t len);
+ bool get_mmm01_candidate(uint8_t *ROM, uint32_t len);
// remove me when SGB is properly emulated
int get_sgb_hack() { return m_sgb_hack; }
- void setup_ram(UINT8 banks);
- void internal_header_logging(UINT8 *ROM, UINT32 len);
+ void setup_ram(uint8_t banks);
+ void internal_header_logging(uint8_t *ROM, uint32_t len);
void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); }
virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
@@ -166,7 +166,7 @@ class gb_cart_slot_device : public base_gb_cart_slot_device
{
public:
// construction/destruction
- gb_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
@@ -176,7 +176,7 @@ class megaduck_cart_slot_device : public base_gb_cart_slot_device
{
public:
// construction/destruction
- megaduck_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ megaduck_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// image-level overrides
virtual image_init_result call_load() override;
diff --git a/src/devices/bus/gameboy/mbc.cpp b/src/devices/bus/gameboy/mbc.cpp
index cf5a6f44a98..6d131f7aea2 100644
--- a/src/devices/bus/gameboy/mbc.cpp
+++ b/src/devices/bus/gameboy/mbc.cpp
@@ -37,112 +37,112 @@ const device_type GB_ROM_ROCKMAN8 = &device_creator<gb_rom_rockman8_device>;
const device_type GB_ROM_SM3SP = &device_creator<gb_rom_sm3sp_device>;
-gb_rom_mbc_device::gb_rom_mbc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+gb_rom_mbc_device::gb_rom_mbc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_gb_cart_interface( mconfig, *this ), m_ram_enable(0)
{
}
-gb_rom_mbc1_device::gb_rom_mbc1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+gb_rom_mbc1_device::gb_rom_mbc1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: gb_rom_mbc_device(mconfig, type, name, tag, owner, clock, shortname, source), m_mode(MODE_16M_64k),
m_mask(0x1f),
m_shift(0)
{
}
-gb_rom_mbc1_device::gb_rom_mbc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_mbc1_device::gb_rom_mbc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_mbc_device(mconfig, GB_ROM_MBC1, "GB MBC1 Carts", tag, owner, clock, "gb_rom_mbc1", __FILE__), m_mode(MODE_16M_64k),
m_mask(0x1f),
m_shift(0)
{
}
-gb_rom_mbc2_device::gb_rom_mbc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_mbc2_device::gb_rom_mbc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_mbc_device(mconfig, GB_ROM_MBC2, "GB MBC2 Carts", tag, owner, clock, "gb_rom_mbc2", __FILE__)
{
}
-gb_rom_mbc3_device::gb_rom_mbc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_mbc3_device::gb_rom_mbc3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_mbc_device(mconfig, GB_ROM_MBC3, "GB MBC3 Carts", tag, owner, clock, "gb_rom_mbc3", __FILE__)
{
}
-gb_rom_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+gb_rom_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: gb_rom_mbc_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-gb_rom_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_mbc5_device::gb_rom_mbc5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_mbc_device(mconfig, GB_ROM_MBC5, "GB MBC5 Carts", tag, owner, clock, "gb_rom_mbc5", __FILE__)
{
}
-gb_rom_mbc6_device::gb_rom_mbc6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_mbc6_device::gb_rom_mbc6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_mbc_device(mconfig, GB_ROM_MBC6, "GB MBC6 Carts", tag, owner, clock, "gb_rom_mbc6", __FILE__), m_latch1(0), m_latch2(0), m_bank_4000(0), m_bank_6000(0)
{
}
-gb_rom_mbc7_device::gb_rom_mbc7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_mbc7_device::gb_rom_mbc7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_mbc_device(mconfig, GB_ROM_MBC7, "GB MBC7 Carts", tag, owner, clock, "gb_rom_mbc7", __FILE__)
{
}
-gb_rom_m161_device::gb_rom_m161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_m161_device::gb_rom_m161_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_mbc_device(mconfig, GB_ROM_M161, "GB M161 Carts", tag, owner, clock, "gb_rom_m161", __FILE__), m_base_bank(0), m_load_disable(0)
{
}
-gb_rom_mmm01_device::gb_rom_mmm01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_mmm01_device::gb_rom_mmm01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_mbc_device(mconfig, GB_ROM_MMM01, "GB MMM01 Carts", tag, owner, clock, "gb_rom_mmm01", __FILE__), m_romb(0), m_romb_nwe(0), m_ramb(0), m_ramb_nwe(0), m_mode(0), m_mode_nwe(0), m_map(0), m_mux(0)
{
}
-gb_rom_sachen_mmc1_device::gb_rom_sachen_mmc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_sachen_mmc1_device::gb_rom_sachen_mmc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_mbc_device(mconfig, GB_ROM_SACHEN1, "GB Sachen MMC1 Carts", tag, owner, clock, "gb_rom_sachen1", __FILE__), m_base_bank(0), m_mask(0), m_mode(0), m_unlock_cnt(0)
{
}
-gb_rom_sachen_mmc1_device::gb_rom_sachen_mmc1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+gb_rom_sachen_mmc1_device::gb_rom_sachen_mmc1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: gb_rom_mbc_device(mconfig, type, name, tag, owner, clock, shortname, source), m_base_bank(0), m_mask(0), m_mode(0), m_unlock_cnt(0)
{
}
-gb_rom_sachen_mmc2_device::gb_rom_sachen_mmc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_sachen_mmc2_device::gb_rom_sachen_mmc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_sachen_mmc1_device(mconfig, GB_ROM_SACHEN2, "GB Sachen MMC2 Carts", tag, owner, clock, "gb_rom_sachen2", __FILE__)
{
}
-gb_rom_188in1_device::gb_rom_188in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_188in1_device::gb_rom_188in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_mbc1_device(mconfig, GB_ROM_188IN1, "GB 188in1", tag, owner, clock, "gb_rom_188in1", __FILE__), m_game_base(0)
{
}
-gb_rom_sintax_device::gb_rom_sintax_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_sintax_device::gb_rom_sintax_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_mbc_device(mconfig, GB_ROM_SINTAX, "GB MBC5 Sintax Carts", tag, owner, clock, "gb_rom_sintax", __FILE__), m_bank_mask(0), m_bank(0), m_reg(0), m_currentxor(0), m_xor2(0), m_xor3(0), m_xor4(0), m_xor5(0), m_sintax_mode(0)
{
}
-gb_rom_chongwu_device::gb_rom_chongwu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_chongwu_device::gb_rom_chongwu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_mbc5_device(mconfig, GB_ROM_CHONGWU, "GB Chong Wu Xiao Jing Ling", tag, owner, clock, "gb_rom_chongwu", __FILE__), m_protection_checked(0)
{
}
-gb_rom_licheng_device::gb_rom_licheng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_licheng_device::gb_rom_licheng_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_mbc5_device(mconfig, GB_ROM_LICHENG, "GB MBC5 Li Cheng Carts", tag, owner, clock, "gb_rom_licheng", __FILE__)
{
}
-gb_rom_digimon_device::gb_rom_digimon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_digimon_device::gb_rom_digimon_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_mbc5_device(mconfig, GB_ROM_DIGIMON, "GB Digimon", tag, owner, clock, "gb_rom_digimon", __FILE__)
{
}
-gb_rom_rockman8_device::gb_rom_rockman8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_rockman8_device::gb_rom_rockman8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_mbc_device(mconfig, GB_ROM_ROCKMAN8, "GB MBC1 Rockman 8", tag, owner, clock, "gb_rom_rockman8", __FILE__), m_bank_mask(0), m_bank(0), m_reg(0)
{
}
-gb_rom_sm3sp_device::gb_rom_sm3sp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_sm3sp_device::gb_rom_sm3sp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_mbc_device(mconfig, GB_ROM_SM3SP, "GB MBC1 Super Mario 3 Special", tag, owner, clock, "gb_rom_sm3sp", __FILE__), m_bank_mask(0), m_bank(0), m_reg(0), m_mode(0)
{
}
@@ -719,9 +719,9 @@ WRITE8_MEMBER(gb_rom_m161_device::write_bank)
READ8_MEMBER(gb_rom_mmm01_device::read_rom)
{
- UINT16 romb = m_romb & ~m_romb_nwe;
- UINT16 romb_base = m_romb & (0x1e0 | m_romb_nwe);
- UINT8 ramb_masked = ((offset & 0x4000) | m_mode ? m_ramb : m_ramb & ~0x03);
+ uint16_t romb = m_romb & ~m_romb_nwe;
+ uint16_t romb_base = m_romb & (0x1e0 | m_romb_nwe);
+ uint8_t ramb_masked = ((offset & 0x4000) | m_mode ? m_ramb : m_ramb & ~0x03);
// zero-adjust RA18..RA14
romb = (romb ? romb : 0x01);
@@ -793,8 +793,8 @@ WRITE8_MEMBER(gb_rom_mmm01_device::write_bank)
READ8_MEMBER(gb_rom_mmm01_device::read_ram)
{
- UINT8 ramb_masked = ((offset & 0x4000) | m_mode ? m_ramb : m_ramb & ~0x03);
- UINT8 ramb = ramb_masked;
+ uint8_t ramb_masked = ((offset & 0x4000) | m_mode ? m_ramb : m_ramb & ~0x03);
+ uint8_t ramb = ramb_masked;
// multiplex with RA20..RA19
if (m_mux)
@@ -810,8 +810,8 @@ READ8_MEMBER(gb_rom_mmm01_device::read_ram)
WRITE8_MEMBER(gb_rom_mmm01_device::write_ram)
{
- UINT8 ramb_masked = ((offset & 0x4000) | m_mode ? m_ramb : m_ramb & ~0x03);
- UINT8 ramb = ramb_masked;
+ uint8_t ramb_masked = ((offset & 0x4000) | m_mode ? m_ramb : m_ramb & ~0x03);
+ uint8_t ramb = ramb_masked;
// multiplex with RA20..RA19
if (m_mux)
@@ -827,7 +827,7 @@ WRITE8_MEMBER(gb_rom_mmm01_device::write_ram)
READ8_MEMBER(gb_rom_sachen_mmc1_device::read_rom)
{
- UINT16 off_edit = offset;
+ uint16_t off_edit = offset;
/* Wait for 0x31 transitions of A15 (hi -> lo), i.e. ROM accesses; A15 = HI while in bootstrap */
/* This is 0x31 transitions, because we increment counter _after_ checking it */
@@ -899,7 +899,7 @@ WRITE8_MEMBER(gb_rom_sachen_mmc1_device::write_bank)
READ8_MEMBER(gb_rom_sachen_mmc2_device::read_rom)
{
- UINT16 off_edit = offset;
+ uint16_t off_edit = offset;
/* Wait for 0x30 transitions of A15 (lo -> hi), i.e. ROM accesses; A15 = HI while in bootstrap */
/* This is 0x30 transitions, because we increment counter _after_ checking it, but A15 lo -> hi*/
@@ -1018,7 +1018,7 @@ READ8_MEMBER(gb_rom_chongwu_device::read_rom)
// MBC5 variant used by Sintax games
-void gb_rom_sintax_device::set_xor_for_bank(UINT8 bank)
+void gb_rom_sintax_device::set_xor_for_bank(uint8_t bank)
{
switch (bank & 0x0f)
{
@@ -1259,7 +1259,7 @@ WRITE8_MEMBER(gb_rom_rockman8_device::write_ram)
// writing data to 0x2000-0x2fff switches bank according to the table below
// (the value values corresponding to table[0x0f] is not confirmed, choices
// 0,1,2,3,8,c,f freeze the game, while 4,5,6,7,b,d,0x13 work with glitches)
-static UINT8 smb3_table1[0x20] =
+static uint8_t smb3_table1[0x20] =
{
0x00,0x04,0x01,0x05, 0x02,0x06,0x03,0x05, 0x08,0x0c,0x03,0x0d, 0x03,0x0b,0x0b,0x08 /* original doc here put 0x0f (i.e. 11th unique bank) */,
0x05,0x06,0x0b,0x0d, 0x08,0x06,0x13,0x0b, 0x08,0x05,0x05,0x08, 0x0b,0x0d,0x06,0x05
diff --git a/src/devices/bus/gameboy/mbc.h b/src/devices/bus/gameboy/mbc.h
index 827d42c392d..4a9b49bd52e 100644
--- a/src/devices/bus/gameboy/mbc.h
+++ b/src/devices/bus/gameboy/mbc.h
@@ -13,7 +13,7 @@ class gb_rom_mbc_device : public device_t,
{
public:
// construction/destruction
- gb_rom_mbc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ gb_rom_mbc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -27,7 +27,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_ram) override;
virtual DECLARE_WRITE8_MEMBER(write_ram) override;
- UINT8 m_ram_enable;
+ uint8_t m_ram_enable;
};
// ======================> gb_rom_mbc1_device
@@ -42,20 +42,20 @@ public:
};
// construction/destruction
- gb_rom_mbc1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- gb_rom_mbc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_mbc1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ gb_rom_mbc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { shared_start(); save_item(NAME(m_mode)); };
virtual void device_reset() override { shared_reset(); m_mode = MODE_16M_64k; };
- virtual void set_additional_wirings(UINT8 mask, int shift) override { m_mask = mask; m_shift = shift; } // these get set at cart loading
+ virtual void set_additional_wirings(uint8_t mask, int shift) override { m_mask = mask; m_shift = shift; } // these get set at cart loading
virtual DECLARE_READ8_MEMBER(read_rom) override;
virtual DECLARE_WRITE8_MEMBER(write_bank) override;
virtual DECLARE_READ8_MEMBER(read_ram) override;
virtual DECLARE_WRITE8_MEMBER(write_ram) override;
- UINT8 m_mode, m_mask;
+ uint8_t m_mode, m_mask;
int m_shift;
};
@@ -65,7 +65,7 @@ class gb_rom_mbc2_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_mbc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_mbc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -83,7 +83,7 @@ class gb_rom_mbc3_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_mbc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_mbc3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -96,7 +96,7 @@ public:
private:
void update_rtc();
- UINT8 m_rtc_regs[5];
+ uint8_t m_rtc_regs[5];
int m_rtc_ready;
};
@@ -106,8 +106,8 @@ class gb_rom_mbc5_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_mbc5_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- gb_rom_mbc5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_mbc5_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ gb_rom_mbc5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -125,7 +125,7 @@ class gb_rom_mbc6_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_mbc6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_mbc6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -135,8 +135,8 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_bank) override;
virtual DECLARE_READ8_MEMBER(read_ram) override;
virtual DECLARE_WRITE8_MEMBER(write_ram) override;
- UINT16 m_latch1, m_latch2;
- UINT8 m_bank_4000, m_bank_6000;
+ uint16_t m_latch1, m_latch2;
+ uint8_t m_bank_4000, m_bank_6000;
};
// ======================> gb_rom_mbc7_device
@@ -145,7 +145,7 @@ class gb_rom_mbc7_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_mbc7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_mbc7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -164,7 +164,7 @@ class gb_rom_m161_device : public gb_rom_mbc_device
public:
// construction/destruction
- gb_rom_m161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_m161_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -175,8 +175,8 @@ public:
virtual DECLARE_READ8_MEMBER(read_ram) override { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_ram) override { }
- UINT8 m_base_bank;
- UINT8 m_load_disable;
+ uint8_t m_base_bank;
+ uint8_t m_load_disable;
};
// ======================> gb_rom_mmm01_device
@@ -184,7 +184,7 @@ class gb_rom_mmm01_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_mmm01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_mmm01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -196,14 +196,14 @@ public:
virtual DECLARE_READ8_MEMBER(read_ram) override;
virtual DECLARE_WRITE8_MEMBER(write_ram) override;
- UINT16 m_romb;
- UINT8 m_romb_nwe;
- UINT8 m_ramb;
- UINT8 m_ramb_nwe;
- UINT8 m_mode;
- UINT8 m_mode_nwe;
- UINT8 m_map;
- UINT8 m_mux;
+ uint16_t m_romb;
+ uint8_t m_romb_nwe;
+ uint8_t m_ramb;
+ uint8_t m_ramb_nwe;
+ uint8_t m_mode;
+ uint8_t m_mode_nwe;
+ uint8_t m_map;
+ uint8_t m_mux;
};
// ======================> gb_rom_sachen_mmc1_device
@@ -218,8 +218,8 @@ public:
};
// construction/destruction
- gb_rom_sachen_mmc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- gb_rom_sachen_mmc1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ gb_rom_sachen_mmc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gb_rom_sachen_mmc1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -230,7 +230,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_ram) override { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_ram) override { }
- UINT8 m_base_bank, m_mask, m_mode, m_unlock_cnt;
+ uint8_t m_base_bank, m_mask, m_mode, m_unlock_cnt;
};
// ======================> gb_rom_sachen_mmc2_device
@@ -246,7 +246,7 @@ public:
};
// construction/destruction
- gb_rom_sachen_mmc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_sachen_mmc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -263,7 +263,7 @@ class gb_rom_188in1_device : public gb_rom_mbc1_device
{
public:
// construction/destruction
- gb_rom_188in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_188in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { shared_start(); save_item(NAME(m_game_base)); };
@@ -274,7 +274,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_bank) override;
private:
- UINT32 m_game_base;
+ uint32_t m_game_base;
};
// ======================> gb_rom_sintax_device
@@ -282,21 +282,21 @@ class gb_rom_sintax_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_sintax_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_sintax_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
- void set_xor_for_bank(UINT8 bank);
+ void set_xor_for_bank(uint8_t bank);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
virtual DECLARE_WRITE8_MEMBER(write_bank) override;
virtual DECLARE_READ8_MEMBER(read_ram) override;
virtual DECLARE_WRITE8_MEMBER(write_ram) override;
- UINT8 m_bank_mask, m_bank, m_reg;
+ uint8_t m_bank_mask, m_bank, m_reg;
- UINT8 m_currentxor, m_xor2, m_xor3, m_xor4, m_xor5, m_sintax_mode;
+ uint8_t m_currentxor, m_xor2, m_xor3, m_xor4, m_xor5, m_sintax_mode;
};
// ======================> gb_rom_chongwu_device
@@ -305,14 +305,14 @@ class gb_rom_chongwu_device : public gb_rom_mbc5_device
{
public:
// construction/destruction
- gb_rom_chongwu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_chongwu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
virtual DECLARE_READ8_MEMBER(read_rom) override;
- UINT8 m_protection_checked;
+ uint8_t m_protection_checked;
};
// ======================> gb_rom_licheng_device
@@ -321,7 +321,7 @@ class gb_rom_licheng_device : public gb_rom_mbc5_device
{
public:
// construction/destruction
- gb_rom_licheng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_licheng_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_WRITE8_MEMBER(write_bank) override;
};
@@ -332,7 +332,7 @@ class gb_rom_digimon_device : public gb_rom_mbc5_device
{
public:
// construction/destruction
- gb_rom_digimon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_digimon_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -349,7 +349,7 @@ class gb_rom_rockman8_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_rockman8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_rockman8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -360,7 +360,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_bank) override;
virtual DECLARE_READ8_MEMBER(read_ram) override;
virtual DECLARE_WRITE8_MEMBER(write_ram) override;
- UINT8 m_bank_mask, m_bank, m_reg;
+ uint8_t m_bank_mask, m_bank, m_reg;
};
// ======================> gb_rom_sm3sp_device
@@ -368,7 +368,7 @@ class gb_rom_sm3sp_device : public gb_rom_mbc_device
{
public:
// construction/destruction
- gb_rom_sm3sp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_sm3sp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -379,7 +379,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_bank) override;
virtual DECLARE_READ8_MEMBER(read_ram) override;
virtual DECLARE_WRITE8_MEMBER(write_ram) override;
- UINT8 m_bank_mask, m_bank, m_reg, m_mode;
+ uint8_t m_bank_mask, m_bank, m_reg, m_mode;
};
diff --git a/src/devices/bus/gameboy/rom.cpp b/src/devices/bus/gameboy/rom.cpp
index ff10094c3d0..609f30b8e52 100644
--- a/src/devices/bus/gameboy/rom.cpp
+++ b/src/devices/bus/gameboy/rom.cpp
@@ -29,51 +29,51 @@ const device_type GB_ROM_LASAMA = &device_creator<gb_rom_lasama_device>;
const device_type MEGADUCK_ROM = &device_creator<megaduck_rom_device>;
-gb_rom_device::gb_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+gb_rom_device::gb_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_gb_cart_interface( mconfig, *this )
{
}
-gb_rom_device::gb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_device::gb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, GB_STD_ROM, "GB Carts", tag, owner, clock, "gb_rom", __FILE__),
device_gb_cart_interface( mconfig, *this )
{
}
-gb_rom_tama5_device::gb_rom_tama5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_tama5_device::gb_rom_tama5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_device(mconfig, GB_ROM_TAMA5, "GB Tamagotchi", tag, owner, clock, "gb_rom_tama5", __FILE__), m_tama5_data(0), m_tama5_addr(0), m_tama5_cmd(0), m_rtc_reg(0)
{
}
-gb_rom_wisdom_device::gb_rom_wisdom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_wisdom_device::gb_rom_wisdom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_device(mconfig, GB_ROM_WISDOM, "GB Wisdom Tree Carts", tag, owner, clock, "gb_rom_wisdom", __FILE__)
{
}
-gb_rom_yong_device::gb_rom_yong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_yong_device::gb_rom_yong_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_device(mconfig, GB_ROM_YONG, "GB Yong Yong Carts", tag, owner, clock, "gb_rom_yong", __FILE__)
{
}
-gb_rom_atvrac_device::gb_rom_atvrac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_atvrac_device::gb_rom_atvrac_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_device(mconfig, GB_ROM_ATVRAC, "GB ATV Racin'", tag, owner, clock, "gb_rom_atvrac", __FILE__)
{
}
-gb_rom_lasama_device::gb_rom_lasama_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gb_rom_lasama_device::gb_rom_lasama_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gb_rom_device(mconfig, GB_ROM_LASAMA, "GB LaSaMa", tag, owner, clock, "gb_rom_lasama", __FILE__)
{
}
-megaduck_rom_device::megaduck_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+megaduck_rom_device::megaduck_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_gb_cart_interface( mconfig, *this )
{
}
-megaduck_rom_device::megaduck_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+megaduck_rom_device::megaduck_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MEGADUCK_ROM, "MegaDuck Carts", tag, owner, clock, "megaduck_rom", __FILE__),
device_gb_cart_interface( mconfig, *this )
{
diff --git a/src/devices/bus/gameboy/rom.h b/src/devices/bus/gameboy/rom.h
index 343d30195b0..99a1602efa9 100644
--- a/src/devices/bus/gameboy/rom.h
+++ b/src/devices/bus/gameboy/rom.h
@@ -13,8 +13,8 @@ class gb_rom_device : public device_t,
{
public:
// construction/destruction
- gb_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- gb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ gb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -34,7 +34,7 @@ class gb_rom_tama5_device : public gb_rom_device
{
public:
// construction/destruction
- gb_rom_tama5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_tama5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -45,9 +45,9 @@ public:
virtual DECLARE_READ8_MEMBER(read_ram) override;
virtual DECLARE_WRITE8_MEMBER(write_ram) override;
- UINT16 m_tama5_data, m_tama5_addr, m_tama5_cmd;
- UINT8 m_regs[32];
- UINT8 m_rtc_reg;
+ uint16_t m_tama5_data, m_tama5_addr, m_tama5_cmd;
+ uint8_t m_regs[32];
+ uint8_t m_rtc_reg;
};
// ======================> gb_rom_wisdom_device
@@ -55,7 +55,7 @@ class gb_rom_wisdom_device : public gb_rom_device
{
public:
// construction/destruction
- gb_rom_wisdom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_wisdom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -71,7 +71,7 @@ class gb_rom_yong_device : public gb_rom_device
{
public:
// construction/destruction
- gb_rom_yong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_yong_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -87,7 +87,7 @@ class gb_rom_atvrac_device : public gb_rom_device
{
public:
// construction/destruction
- gb_rom_atvrac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_atvrac_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -103,7 +103,7 @@ class gb_rom_lasama_device : public gb_rom_device
{
public:
// construction/destruction
- gb_rom_lasama_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gb_rom_lasama_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { shared_start(); };
@@ -121,8 +121,8 @@ class megaduck_rom_device :public device_t,
{
public:
// construction/destruction
- megaduck_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- megaduck_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ megaduck_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ megaduck_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/gamegear/ggext.cpp b/src/devices/bus/gamegear/ggext.cpp
index fa09f4272a1..5aad987a7a7 100644
--- a/src/devices/bus/gamegear/ggext.cpp
+++ b/src/devices/bus/gamegear/ggext.cpp
@@ -54,7 +54,7 @@ device_gg_ext_port_interface::~device_gg_ext_port_interface()
// gg_ext_port_device - constructor
//-------------------------------------------------
-gg_ext_port_device::gg_ext_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+gg_ext_port_device::gg_ext_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, GG_EXT_PORT, "EXT Port", tag, owner, clock, "gg_ext_port", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr),
m_th_pin_handler(*this),
@@ -85,15 +85,15 @@ void gg_ext_port_device::device_start()
}
-UINT8 gg_ext_port_device::port_r()
+uint8_t gg_ext_port_device::port_r()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_device)
data = m_device->peripheral_r();
return data;
}
-void gg_ext_port_device::port_w( UINT8 data )
+void gg_ext_port_device::port_w( uint8_t data )
{
if (m_device)
m_device->peripheral_w(data);
@@ -105,7 +105,7 @@ void gg_ext_port_device::th_pin_w(int state)
m_th_pin_handler(state);
}
-UINT32 gg_ext_port_device::pixel_r()
+uint32_t gg_ext_port_device::pixel_r()
{
return m_pixel_handler();
}
diff --git a/src/devices/bus/gamegear/ggext.h b/src/devices/bus/gamegear/ggext.h
index 0388838daaa..322de4812a4 100644
--- a/src/devices/bus/gamegear/ggext.h
+++ b/src/devices/bus/gamegear/ggext.h
@@ -52,7 +52,7 @@ class gg_ext_port_device : public device_t,
{
public:
// construction/destruction
- gg_ext_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gg_ext_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~gg_ext_port_device();
// static configuration helpers
@@ -76,11 +76,11 @@ public:
// bit 7 - pin 9 - TR (Button 2)
// pin 10 - Not connected
//
- UINT8 port_r();
- void port_w( UINT8 data );
+ uint8_t port_r();
+ void port_w( uint8_t data );
void th_pin_w(int state);
- UINT32 pixel_r();
+ uint32_t pixel_r();
//protected:
// device-level overrides
@@ -104,8 +104,8 @@ public:
device_gg_ext_port_interface(const machine_config &mconfig, device_t &device);
virtual ~device_gg_ext_port_interface();
- virtual UINT8 peripheral_r() { return 0xff; };
- virtual void peripheral_w(UINT8 data) { };
+ virtual uint8_t peripheral_r() { return 0xff; };
+ virtual void peripheral_w(uint8_t data) { };
protected:
gg_ext_port_device *m_port;
diff --git a/src/devices/bus/gamegear/smsctrladp.cpp b/src/devices/bus/gamegear/smsctrladp.cpp
index 2aec892b279..065c9d7ca24 100644
--- a/src/devices/bus/gamegear/smsctrladp.cpp
+++ b/src/devices/bus/gamegear/smsctrladp.cpp
@@ -26,7 +26,7 @@ const device_type SMS_CTRL_ADAPTOR = &device_creator<sms_ctrl_adaptor_device>;
// sms_ctrl_adaptor_device - constructor
//-------------------------------------------------
-sms_ctrl_adaptor_device::sms_ctrl_adaptor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_ctrl_adaptor_device::sms_ctrl_adaptor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SMS_CTRL_ADAPTOR, "SMS Controller Adaptor", tag, owner, clock, "sms_ctrl_adaptor", __FILE__),
device_gg_ext_port_interface(mconfig, *this),
m_subctrl_port(*this, "ctrl")
@@ -48,7 +48,7 @@ void sms_ctrl_adaptor_device::device_start()
// sms_peripheral_r - sms_ctrl_adaptor read
//-------------------------------------------------
-UINT8 sms_ctrl_adaptor_device::peripheral_r()
+uint8_t sms_ctrl_adaptor_device::peripheral_r()
{
return m_subctrl_port->port_r();
}
@@ -58,7 +58,7 @@ UINT8 sms_ctrl_adaptor_device::peripheral_r()
// sms_peripheral_w - sms_ctrl_adaptor write
//-------------------------------------------------
-void sms_ctrl_adaptor_device::peripheral_w(UINT8 data)
+void sms_ctrl_adaptor_device::peripheral_w(uint8_t data)
{
m_subctrl_port->port_w(data);
}
diff --git a/src/devices/bus/gamegear/smsctrladp.h b/src/devices/bus/gamegear/smsctrladp.h
index e06dc76163f..a4e85b4d50c 100644
--- a/src/devices/bus/gamegear/smsctrladp.h
+++ b/src/devices/bus/gamegear/smsctrladp.h
@@ -30,7 +30,7 @@ class sms_ctrl_adaptor_device : public device_t,
{
public:
// construction/destruction
- sms_ctrl_adaptor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_ctrl_adaptor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_WRITE_LINE_MEMBER(th_pin_w);
DECLARE_READ32_MEMBER(pixel_r);
@@ -41,8 +41,8 @@ protected:
virtual machine_config_constructor device_mconfig_additions() const override;
// device_gg_ext_port_interface overrides
- virtual UINT8 peripheral_r() override;
- virtual void peripheral_w(UINT8 data) override;
+ virtual uint8_t peripheral_r() override;
+ virtual void peripheral_w(uint8_t data) override;
private:
required_device<sms_control_port_device> m_subctrl_port;
diff --git a/src/devices/bus/gba/gba_slot.cpp b/src/devices/bus/gba/gba_slot.cpp
index ad03df06299..bfedecb9d0a 100644
--- a/src/devices/bus/gba/gba_slot.cpp
+++ b/src/devices/bus/gba/gba_slot.cpp
@@ -46,17 +46,17 @@ device_gba_cart_interface::~device_gba_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_gba_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_gba_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
if (size < 0x4000000)
// we always alloc 32MB of rom region!
- m_rom = (UINT32 *)device().machine().memory().region_alloc(std::string(tag).append(GBASLOT_ROM_REGION_TAG).c_str(), 0x2000000, 4, ENDIANNESS_LITTLE)->base();
+ m_rom = (uint32_t *)device().machine().memory().region_alloc(std::string(tag).append(GBASLOT_ROM_REGION_TAG).c_str(), 0x2000000, 4, ENDIANNESS_LITTLE)->base();
else
{
- m_rom = (UINT32 *)device().machine().memory().region_alloc(std::string(tag).append(GBASLOT_ROM_REGION_TAG).c_str(), 0x4000000, 4, ENDIANNESS_LITTLE)->base();
- m_romhlp = (UINT32 *)device().machine().memory().region_alloc(std::string(tag).append(GBAHELP_ROM_REGION_TAG).c_str(), 0x2000000, 4, ENDIANNESS_LITTLE)->base();
+ m_rom = (uint32_t *)device().machine().memory().region_alloc(std::string(tag).append(GBASLOT_ROM_REGION_TAG).c_str(), 0x4000000, 4, ENDIANNESS_LITTLE)->base();
+ m_romhlp = (uint32_t *)device().machine().memory().region_alloc(std::string(tag).append(GBAHELP_ROM_REGION_TAG).c_str(), 0x2000000, 4, ENDIANNESS_LITTLE)->base();
}
m_rom_size = size;
}
@@ -67,9 +67,9 @@ void device_gba_cart_interface::rom_alloc(UINT32 size, const char *tag)
// nvram_alloc - alloc the space for the ram
//-------------------------------------------------
-void device_gba_cart_interface::nvram_alloc(UINT32 size)
+void device_gba_cart_interface::nvram_alloc(uint32_t size)
{
- m_nvram.resize(size/sizeof(UINT32));
+ m_nvram.resize(size/sizeof(uint32_t));
}
@@ -80,7 +80,7 @@ void device_gba_cart_interface::nvram_alloc(UINT32 size)
//-------------------------------------------------
// gba_cart_slot_device - constructor
//-------------------------------------------------
-gba_cart_slot_device::gba_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+gba_cart_slot_device::gba_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, GBA_CART_SLOT, "Game Boy Advance Cartridge Slot", tag, owner, clock, "gba_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -180,8 +180,8 @@ image_init_result gba_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT8 *ROM;
- UINT32 size = (software_entry() != nullptr) ? get_software_region_length("rom") : length();
+ uint8_t *ROM;
+ uint32_t size = (software_entry() != nullptr) ? get_software_region_length("rom") : length();
if (size > 0x4000000)
{
seterror(IMAGE_ERROR_UNSPECIFIED, "Attempted loading a cart larger than 64MB");
@@ -189,7 +189,7 @@ image_init_result gba_cart_slot_device::call_load()
}
m_cart->rom_alloc(size, tag());
- ROM = (UINT8 *)m_cart->get_rom_base();
+ ROM = (uint8_t *)m_cart->get_rom_base();
if (software_entry() == nullptr)
{
@@ -230,7 +230,7 @@ image_init_result gba_cart_slot_device::call_load()
break;
}
if (size == 0x4000000)
- memcpy((UINT8 *)m_cart->get_romhlp_base(), ROM, 0x2000000);
+ memcpy((uint8_t *)m_cart->get_romhlp_base(), ROM, 0x2000000);
if (m_cart->get_nvram_size())
battery_load(m_cart->get_nvram_base(), m_cart->get_nvram_size(), 0x00);
@@ -259,7 +259,7 @@ void gba_cart_slot_device::call_unload()
fullpath
-------------------------------------------------*/
-static inline std::string gba_chip_string( UINT32 chip )
+static inline std::string gba_chip_string( uint32_t chip )
{
std::string str;
if (chip == 0) str += "NONE ";
@@ -276,7 +276,7 @@ static inline std::string gba_chip_string( UINT32 chip )
}
-static inline int gba_chip_has_conflict( UINT32 chip )
+static inline int gba_chip_has_conflict( uint32_t chip )
{
int count1 = 0, count2 = 0;
if (chip & GBA_CHIP_EEPROM) count1++;
@@ -290,9 +290,9 @@ static inline int gba_chip_has_conflict( UINT32 chip )
}
-int gba_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
+int gba_cart_slot_device::get_cart_type(uint8_t *ROM, uint32_t len)
{
- UINT32 chip = 0;
+ uint32_t chip = 0;
int type = GBA_STD;
bool has_rtc = false;
bool has_rumble = false;
@@ -432,8 +432,8 @@ std::string gba_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- UINT32 len = m_file->size();
- std::vector<UINT8> rom(len);
+ uint32_t len = m_file->size();
+ std::vector<uint8_t> rom(len);
int type;
m_file->read(&rom[0], len);
@@ -500,6 +500,6 @@ WRITE32_MEMBER(gba_cart_slot_device::write_gpio)
Internal header logging
-------------------------------------------------*/
-void gba_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len)
+void gba_cart_slot_device::internal_header_logging(uint8_t *ROM, uint32_t len)
{
}
diff --git a/src/devices/bus/gba/gba_slot.h b/src/devices/bus/gba/gba_slot.h
index f9918744d97..b78e29b6a7a 100644
--- a/src/devices/bus/gba/gba_slot.h
+++ b/src/devices/bus/gba/gba_slot.h
@@ -51,24 +51,24 @@ public:
virtual DECLARE_WRITE32_MEMBER(write_tilt) {};
virtual DECLARE_WRITE32_MEMBER(write_mapper) {};
- void rom_alloc(UINT32 size, const char *tag);
- void nvram_alloc(UINT32 size);
- UINT32* get_rom_base() { return m_rom; }
- UINT32* get_romhlp_base() { return m_romhlp; }
- UINT32* get_nvram_base() { return &m_nvram[0]; }
- UINT32 get_rom_size() { return m_rom_size; }
- UINT32 get_romhlp_size() { return m_romhlp_size; }
- UINT32 get_nvram_size() { return m_nvram.size()*sizeof(UINT32); }
- void set_rom_size(UINT32 val) { m_rom_size = val; }
+ void rom_alloc(uint32_t size, const char *tag);
+ void nvram_alloc(uint32_t size);
+ uint32_t* get_rom_base() { return m_rom; }
+ uint32_t* get_romhlp_base() { return m_romhlp; }
+ uint32_t* get_nvram_base() { return &m_nvram[0]; }
+ uint32_t get_rom_size() { return m_rom_size; }
+ uint32_t get_romhlp_size() { return m_romhlp_size; }
+ uint32_t get_nvram_size() { return m_nvram.size()*sizeof(uint32_t); }
+ void set_rom_size(uint32_t val) { m_rom_size = val; }
void save_nvram() { device().save_item(NAME(m_nvram)); }
// internal state
- UINT32 *m_rom; // this points to the cart rom region
- UINT32 m_rom_size; // this is the actual game size, not the rom region size!
- UINT32 *m_romhlp;
- UINT32 m_romhlp_size;
- std::vector<UINT32> m_nvram;
+ uint32_t *m_rom; // this points to the cart rom region
+ uint32_t m_rom_size; // this is the actual game size, not the rom region size!
+ uint32_t *m_romhlp;
+ uint32_t m_romhlp_size;
+ std::vector<uint32_t> m_nvram;
};
@@ -80,7 +80,7 @@ class gba_cart_slot_device : public device_t,
{
public:
// construction/destruction
- gba_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~gba_cart_slot_device();
// device-level overrides
@@ -93,12 +93,12 @@ public:
virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
int get_type() { return m_type; }
- int get_cart_type(UINT8 *ROM, UINT32 len);
+ int get_cart_type(uint8_t *ROM, uint32_t len);
- void internal_header_logging(UINT8 *ROM, UINT32 len);
+ void internal_header_logging(uint8_t *ROM, uint32_t len);
void save_nvram() { if (m_cart && m_cart->get_nvram_size()) m_cart->save_nvram(); }
- UINT32 get_rom_size() { if (m_cart) return m_cart->get_rom_size(); return 0; }
+ uint32_t get_rom_size() { if (m_cart) return m_cart->get_rom_size(); return 0; }
virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
virtual bool is_readable() const override { return 1; }
@@ -168,7 +168,7 @@ extern const device_type GBA_CART_SLOT;
struct gba_chip_fix_conflict_item
{
char game_code[5];
- UINT32 chip;
+ uint32_t chip;
};
static const gba_chip_fix_conflict_item gba_chip_fix_conflict_list[] =
diff --git a/src/devices/bus/gba/rom.cpp b/src/devices/bus/gba/rom.cpp
index 4f10bbb0733..7080a60dc01 100644
--- a/src/devices/bus/gba/rom.cpp
+++ b/src/devices/bus/gba/rom.cpp
@@ -36,111 +36,111 @@ const device_type GBA_ROM_FLASH1M_RTC = &device_creator<gba_rom_flash1m_rtc_devi
const device_type GBA_ROM_3DMATRIX = &device_creator<gba_rom_3dmatrix_device>;
-gba_rom_device::gba_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+gba_rom_device::gba_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_gba_cart_interface( mconfig, *this )
{
}
-gba_rom_device::gba_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_device::gba_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, GBA_ROM_STD, "GBA Carts", tag, owner, clock, "gba_rom", __FILE__),
device_gba_cart_interface( mconfig, *this )
{
}
-gba_rom_sram_device::gba_rom_sram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+gba_rom_sram_device::gba_rom_sram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: gba_rom_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-gba_rom_sram_device::gba_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_sram_device::gba_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gba_rom_device(mconfig, GBA_ROM_SRAM, "GBA Carts + SRAM", tag, owner, clock, "gba_sram", __FILE__)
{
}
-gba_rom_drilldoz_device::gba_rom_drilldoz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_drilldoz_device::gba_rom_drilldoz_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gba_rom_sram_device(mconfig, GBA_ROM_DRILLDOZ, "GBA Carts + SRAM + Rumble", tag, owner, clock, "gba_drilldoz", __FILE__)
{
}
-gba_rom_wariotws_device::gba_rom_wariotws_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_wariotws_device::gba_rom_wariotws_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gba_rom_sram_device(mconfig, GBA_ROM_WARIOTWS, "GBA Carts + SRAM + Rumble + Gyroscope", tag, owner, clock, "gba_wariotws", __FILE__),
m_gyro_z(*this, "GYROZ")
{
}
-gba_rom_eeprom_device::gba_rom_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+gba_rom_eeprom_device::gba_rom_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: gba_rom_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-gba_rom_eeprom_device::gba_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_eeprom_device::gba_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gba_rom_device(mconfig, GBA_ROM_EEPROM, "GBA Carts + EEPROM", tag, owner, clock, "gba_eeprom", __FILE__)
{
}
-gba_rom_yoshiug_device::gba_rom_yoshiug_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_yoshiug_device::gba_rom_yoshiug_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gba_rom_eeprom_device(mconfig, GBA_ROM_YOSHIUG, "GBA Carts + EEPROM + Tilt Sensor", tag, owner, clock, "gba_yoshiug", __FILE__),
m_tilt_x(*this, "TILTX"),
m_tilt_y(*this, "TILTY")
{
}
-gba_rom_eeprom64_device::gba_rom_eeprom64_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+gba_rom_eeprom64_device::gba_rom_eeprom64_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: gba_rom_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-gba_rom_eeprom64_device::gba_rom_eeprom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_eeprom64_device::gba_rom_eeprom64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gba_rom_device(mconfig, GBA_ROM_EEPROM64, "GBA Carts + EEPROM 64K", tag, owner, clock, "gba_eeprom64", __FILE__)
{
}
-gba_rom_boktai_device::gba_rom_boktai_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_boktai_device::gba_rom_boktai_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gba_rom_eeprom64_device(mconfig, GBA_ROM_BOKTAI, "GBA Carts + EEPROM 64K + RTC", tag, owner, clock, "gba_boktai", __FILE__),
m_sensor(*this, "LIGHTSENSE")
{
}
-gba_rom_flash_device::gba_rom_flash_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+gba_rom_flash_device::gba_rom_flash_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: gba_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_flash_mask(0),
m_flash(*this, "flash")
{
}
-gba_rom_flash_device::gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_flash_device::gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gba_rom_device(mconfig, GBA_ROM_FLASH, "GBA Carts + Panasonic Flash", tag, owner, clock, "gba_flash", __FILE__),
m_flash_mask(0),
m_flash(*this, "flash")
{
}
-gba_rom_flash_rtc_device::gba_rom_flash_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_flash_rtc_device::gba_rom_flash_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gba_rom_flash_device(mconfig, GBA_ROM_FLASH_RTC, "GBA Carts + Panasonic Flash + RTC", tag, owner, clock, "gba_flash_rtc", __FILE__)
{
}
-gba_rom_flash1m_device::gba_rom_flash1m_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+gba_rom_flash1m_device::gba_rom_flash1m_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: gba_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_flash_mask(0),
m_flash(*this, "flash")
{
}
-gba_rom_flash1m_device::gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_flash1m_device::gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gba_rom_device(mconfig, GBA_ROM_FLASH1M, "GBA Carts + Sanyo Flash", tag, owner, clock, "gba_flash1m", __FILE__),
m_flash_mask(0),
m_flash(*this, "flash")
{
}
-gba_rom_flash1m_rtc_device::gba_rom_flash1m_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_flash1m_rtc_device::gba_rom_flash1m_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gba_rom_flash1m_device(mconfig, GBA_ROM_FLASH1M_RTC, "GBA Carts + Sanyo Flash + RTC", tag, owner, clock, "gba_flash1m_rtc", __FILE__)
{
}
-gba_rom_3dmatrix_device::gba_rom_3dmatrix_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gba_rom_3dmatrix_device::gba_rom_3dmatrix_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: gba_rom_device(mconfig, GBA_ROM_3DMATRIX, "GBA Carts + 3D Matrix Memory Mapper", tag, owner, clock, "gba_3dmatrix", __FILE__)
{
}
@@ -194,7 +194,7 @@ void gba_rom_eeprom_device::device_start()
{
// for the moment we use a custom eeprom implementation, so we alloc/save it as nvram
nvram_alloc(0x200);
- m_eeprom = std::make_unique<gba_eeprom_device>(machine(), (UINT8*)get_nvram_base(), get_nvram_size(), 6);
+ m_eeprom = std::make_unique<gba_eeprom_device>(machine(), (uint8_t*)get_nvram_base(), get_nvram_size(), 6);
}
void gba_rom_yoshiug_device::device_start()
@@ -217,7 +217,7 @@ void gba_rom_eeprom64_device::device_start()
{
// for the moment we use a custom eeprom implementation, so we alloc/save it as nvram
nvram_alloc(0x2000);
- m_eeprom = std::make_unique<gba_eeprom_device>(machine(), (UINT8*)get_nvram_base(), get_nvram_size(), 14);
+ m_eeprom = std::make_unique<gba_eeprom_device>(machine(), (uint8_t*)get_nvram_base(), get_nvram_size(), 14);
}
void gba_rom_boktai_device::device_start()
@@ -287,7 +287,7 @@ READ32_MEMBER(gba_rom_device::read_gpio)
default:
if (ACCESSING_BITS_0_15)
{
- UINT16 ret = gpio_dev_read(m_gpio_dirs);
+ uint16_t ret = gpio_dev_read(m_gpio_dirs);
return ret;
}
if (ACCESSING_BITS_16_31)
@@ -355,7 +355,7 @@ WRITE32_MEMBER(gba_rom_sram_device::write_ram)
// SRAM cart variant with additional Rumble motor (used by Drill Dozer)
-void gba_rom_drilldoz_device::gpio_dev_write(UINT16 data, int gpio_dirs)
+void gba_rom_drilldoz_device::gpio_dev_write(uint16_t data, int gpio_dirs)
{
if ((gpio_dirs & 0x08))
{
@@ -377,7 +377,7 @@ ioport_constructor gba_rom_wariotws_device::device_input_ports() const
return INPUT_PORTS_NAME( wariotws_gyroscope );
}
-UINT16 gba_rom_wariotws_device::gpio_dev_read(int gpio_dirs)
+uint16_t gba_rom_wariotws_device::gpio_dev_read(int gpio_dirs)
{
int gyro = 0;
if (gpio_dirs == 0x0b)
@@ -385,7 +385,7 @@ UINT16 gba_rom_wariotws_device::gpio_dev_read(int gpio_dirs)
return (gyro << 2);
}
-void gba_rom_wariotws_device::gpio_dev_write(UINT16 data, int gpio_dirs)
+void gba_rom_wariotws_device::gpio_dev_write(uint16_t data, int gpio_dirs)
{
if ((gpio_dirs & 0x08))
{
@@ -423,7 +423,7 @@ machine_config_constructor gba_rom_flash_device::device_mconfig_additions() cons
READ32_MEMBER(gba_rom_flash_device::read_ram)
{
- UINT32 rv = 0;
+ uint32_t rv = 0;
offset &= m_flash_mask;
@@ -474,7 +474,7 @@ machine_config_constructor gba_rom_flash1m_device::device_mconfig_additions() co
READ32_MEMBER(gba_rom_flash1m_device::read_ram)
{
- UINT32 rv = 0;
+ uint32_t rv = 0;
offset &= m_flash_mask;
@@ -515,23 +515,23 @@ WRITE32_MEMBER(gba_rom_flash1m_device::write_ram)
// cart variants with additional S3511 RTC
-UINT16 gba_rom_flash_rtc_device::gpio_dev_read(int gpio_dirs)
+uint16_t gba_rom_flash_rtc_device::gpio_dev_read(int gpio_dirs)
{
return 5 | (m_rtc->read_line() << 1);
}
-void gba_rom_flash_rtc_device::gpio_dev_write(UINT16 data, int gpio_dirs)
+void gba_rom_flash_rtc_device::gpio_dev_write(uint16_t data, int gpio_dirs)
{
m_rtc->write(data, gpio_dirs);
}
-UINT16 gba_rom_flash1m_rtc_device::gpio_dev_read(int gpio_dirs)
+uint16_t gba_rom_flash1m_rtc_device::gpio_dev_read(int gpio_dirs)
{
return 5 | (m_rtc->read_line() << 1);
}
-void gba_rom_flash1m_rtc_device::gpio_dev_write(UINT16 data, int gpio_dirs)
+void gba_rom_flash1m_rtc_device::gpio_dev_write(uint16_t data, int gpio_dirs)
{
m_rtc->write(data, gpio_dirs);
}
@@ -687,13 +687,13 @@ ioport_constructor gba_rom_boktai_device::device_input_ports() const
return INPUT_PORTS_NAME( boktai_sensor );
}
-UINT16 gba_rom_boktai_device::gpio_dev_read(int gpio_dirs)
+uint16_t gba_rom_boktai_device::gpio_dev_read(int gpio_dirs)
{
int light = (gpio_dirs == 7 && m_counter >= m_sensor->read()) ? 1 : 0;
return 5 | (m_rtc->read_line() << 1) | (light << 3);
}
-void gba_rom_boktai_device::gpio_dev_write(UINT16 data, int gpio_dirs)
+void gba_rom_boktai_device::gpio_dev_write(uint16_t data, int gpio_dirs)
{
m_rtc->write(data, gpio_dirs);
if (gpio_dirs == 7)
@@ -750,7 +750,7 @@ WRITE32_MEMBER(gba_rom_3dmatrix_device::write_mapper)
{
case 0:
if (data == 0x1) // transfer data
- memcpy((UINT8 *)m_romhlp + m_dst, (UINT8 *)m_rom + m_src, m_nblock * 0x200);
+ memcpy((uint8_t *)m_romhlp + m_dst, (uint8_t *)m_rom + m_src, m_nblock * 0x200);
else
printf("Unknown mapper command 0x%X\n", data);
break;
@@ -799,7 +799,7 @@ gba_s3511_device::gba_s3511_device(running_machine &machine) :
}
-UINT8 gba_s3511_device::convert_to_bcd(int val)
+uint8_t gba_s3511_device::convert_to_bcd(int val)
{
return (((val % 100) / 10) << 4) | (val % 10);
}
@@ -850,7 +850,7 @@ int gba_s3511_device::read_line()
}
-void gba_s3511_device::write(UINT16 data, int gpio_dirs)
+void gba_s3511_device::write(uint16_t data, int gpio_dirs)
{
// printf("gpio_dev_write data %X\n", data);
if (m_phase == S3511_RTC_IDLE && (m_last_val & 5) == 1 && (data & 5) == 5)
@@ -947,7 +947,7 @@ void gba_s3511_device::write(UINT16 data, int gpio_dirs)
//
-gba_eeprom_device::gba_eeprom_device(running_machine &machine, UINT8 *eeprom, UINT32 size, int addr_bits) :
+gba_eeprom_device::gba_eeprom_device(running_machine &machine, uint8_t *eeprom, uint32_t size, int addr_bits) :
m_state(EEP_IDLE),
m_machine(machine)
{
@@ -963,9 +963,9 @@ gba_eeprom_device::gba_eeprom_device(running_machine &machine, UINT8 *eeprom, UI
m_machine.save().save_item(m_eep_data, "GBA_EEPROM/m_eep_data");
}
-UINT32 gba_eeprom_device::read()
+uint32_t gba_eeprom_device::read()
{
- UINT32 out;
+ uint32_t out;
switch (m_state)
{
@@ -1017,7 +1017,7 @@ UINT32 gba_eeprom_device::read()
return 0;
}
-void gba_eeprom_device::write(UINT32 data)
+void gba_eeprom_device::write(uint32_t data)
{
// printf("eeprom_w: %x @ %x (state %d) (PC=%x)\n", data, offset, m_state, space.device().safe_pc());
switch (m_state)
diff --git a/src/devices/bus/gba/rom.h b/src/devices/bus/gba/rom.h
index 13a69c44a65..a7886c79c59 100644
--- a/src/devices/bus/gba/rom.h
+++ b/src/devices/bus/gba/rom.h
@@ -22,16 +22,16 @@ public:
running_machine &machine() const { return m_machine; }
void update_time(int len);
- UINT8 convert_to_bcd(int val);
+ uint8_t convert_to_bcd(int val);
int read_line();
- void write(UINT16 data, int gpio_dirs);
+ void write(uint16_t data, int gpio_dirs);
protected:
int m_phase;
- UINT8 m_last_val, m_bits, m_command;
+ uint8_t m_last_val, m_bits, m_command;
int m_data_len;
- UINT8 m_data[7];
+ uint8_t m_data[7];
running_machine& m_machine;
};
@@ -56,22 +56,22 @@ enum
class gba_eeprom_device
{
public:
- gba_eeprom_device(running_machine &machine, UINT8 *eeprom, UINT32 size, int addr_bits);
+ gba_eeprom_device(running_machine &machine, uint8_t *eeprom, uint32_t size, int addr_bits);
running_machine &machine() const { return m_machine; }
- UINT32 read();
- void write(UINT32 data);
+ uint32_t read();
+ void write(uint32_t data);
protected:
- UINT8 *m_data;
- UINT32 m_data_size;
+ uint8_t *m_data;
+ uint32_t m_data_size;
int m_state;
int m_command;
int m_count;
int m_addr;
int m_bits;
int m_addr_bits;
- UINT8 m_eep_data;
+ uint8_t m_eep_data;
running_machine& m_machine;
};
@@ -85,8 +85,8 @@ class gba_rom_device : public device_t,
{
public:
// construction/destruction
- gba_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- gba_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ gba_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -98,12 +98,12 @@ public:
virtual DECLARE_READ32_MEMBER(read_gpio) override;
virtual DECLARE_WRITE32_MEMBER(write_gpio) override;
- virtual UINT16 gpio_dev_read(int gpio_dirs) { return 0; }
- virtual void gpio_dev_write(UINT16 data, int gpio_dirs) {}
+ virtual uint16_t gpio_dev_read(int gpio_dirs) { return 0; }
+ virtual void gpio_dev_write(uint16_t data, int gpio_dirs) {}
private:
- UINT16 m_gpio_regs[4];
- UINT8 m_gpio_write_only, m_gpio_dirs;
+ uint16_t m_gpio_regs[4];
+ uint8_t m_gpio_write_only, m_gpio_dirs;
};
@@ -113,8 +113,8 @@ class gba_rom_sram_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_sram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- gba_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_sram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ gba_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ32_MEMBER(read_ram) override;
@@ -128,10 +128,10 @@ class gba_rom_drilldoz_device : public gba_rom_sram_device
{
public:
// construction/destruction
- gba_rom_drilldoz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_drilldoz_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
- virtual void gpio_dev_write(UINT16 data, int gpio_dirs) override;
+ virtual void gpio_dev_write(uint16_t data, int gpio_dirs) override;
};
@@ -141,7 +141,7 @@ class gba_rom_wariotws_device : public gba_rom_sram_device
{
public:
// construction/destruction
- gba_rom_wariotws_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_wariotws_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
@@ -149,11 +149,11 @@ public:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT16 gpio_dev_read(int gpio_dirs) override;
- virtual void gpio_dev_write(UINT16 data, int gpio_dirs) override;
+ virtual uint16_t gpio_dev_read(int gpio_dirs) override;
+ virtual void gpio_dev_write(uint16_t data, int gpio_dirs) override;
private:
- UINT8 m_last_val;
+ uint8_t m_last_val;
int m_counter;
required_ioport m_gyro_z;
};
@@ -165,8 +165,8 @@ class gba_rom_flash_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_flash_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_flash_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -177,8 +177,8 @@ public:
virtual DECLARE_WRITE32_MEMBER(write_ram) override;
protected:
- //UINT32 m_flash_size;
- UINT32 m_flash_mask;
+ //uint32_t m_flash_size;
+ uint32_t m_flash_mask;
required_device<intelfsh8_device> m_flash;
};
@@ -189,12 +189,12 @@ class gba_rom_flash_rtc_device : public gba_rom_flash_device
{
public:
// construction/destruction
- gba_rom_flash_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_flash_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
- virtual UINT16 gpio_dev_read(int gpio_dirs) override;
- virtual void gpio_dev_write(UINT16 data, int gpio_dirs) override;
+ virtual uint16_t gpio_dev_read(int gpio_dirs) override;
+ virtual void gpio_dev_write(uint16_t data, int gpio_dirs) override;
private:
std::unique_ptr<gba_s3511_device> m_rtc;
@@ -207,8 +207,8 @@ class gba_rom_flash1m_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_flash1m_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_flash1m_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -219,8 +219,8 @@ public:
virtual DECLARE_WRITE32_MEMBER(write_ram) override;
protected:
- //UINT32 m_flash_size;
- UINT32 m_flash_mask;
+ //uint32_t m_flash_size;
+ uint32_t m_flash_mask;
required_device<intelfsh8_device> m_flash;
};
@@ -231,12 +231,12 @@ class gba_rom_flash1m_rtc_device : public gba_rom_flash1m_device
{
public:
// construction/destruction
- gba_rom_flash1m_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_flash1m_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
- virtual UINT16 gpio_dev_read(int gpio_dirs) override;
- virtual void gpio_dev_write(UINT16 data, int gpio_dirs) override;
+ virtual uint16_t gpio_dev_read(int gpio_dirs) override;
+ virtual void gpio_dev_write(uint16_t data, int gpio_dirs) override;
private:
std::unique_ptr<gba_s3511_device> m_rtc;
@@ -249,8 +249,8 @@ class gba_rom_eeprom_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- gba_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ gba_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -270,7 +270,7 @@ class gba_rom_yoshiug_device : public gba_rom_eeprom_device
{
public:
// construction/destruction
- gba_rom_yoshiug_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_yoshiug_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -283,7 +283,7 @@ public:
private:
int m_tilt_ready;
- UINT16 m_xpos, m_ypos;
+ uint16_t m_xpos, m_ypos;
required_ioport m_tilt_x;
required_ioport m_tilt_y;
};
@@ -295,8 +295,8 @@ class gba_rom_eeprom64_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_eeprom64_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- gba_rom_eeprom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_eeprom64_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ gba_rom_eeprom64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -316,20 +316,20 @@ class gba_rom_boktai_device : public gba_rom_eeprom64_device
{
public:
// construction/destruction
- gba_rom_boktai_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_boktai_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
virtual ioport_constructor device_input_ports() const override;
- virtual UINT16 gpio_dev_read(int gpio_dirs) override;
- virtual void gpio_dev_write(UINT16 data, int gpio_dirs) override;
+ virtual uint16_t gpio_dev_read(int gpio_dirs) override;
+ virtual void gpio_dev_write(uint16_t data, int gpio_dirs) override;
private:
std::unique_ptr<gba_s3511_device> m_rtc;
required_ioport m_sensor;
- UINT8 m_last_val;
+ uint8_t m_last_val;
int m_counter;
};
@@ -340,7 +340,7 @@ class gba_rom_3dmatrix_device : public gba_rom_device
{
public:
// construction/destruction
- gba_rom_3dmatrix_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gba_rom_3dmatrix_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -350,7 +350,7 @@ public:
virtual DECLARE_WRITE32_MEMBER(write_mapper) override;
private:
- UINT32 m_src, m_dst, m_nblock;
+ uint32_t m_src, m_dst, m_nblock;
};
diff --git a/src/devices/bus/generic/ram.cpp b/src/devices/bus/generic/ram.cpp
index 3767ddae724..a27e0ddafcd 100644
--- a/src/devices/bus/generic/ram.cpp
+++ b/src/devices/bus/generic/ram.cpp
@@ -34,14 +34,14 @@ const device_type GENERIC_RAM_64K_LINEAR = &device_creator<generic_ram_64k_linea
const device_type GENERIC_RAM_128K_LINEAR = &device_creator<generic_ram_128k_linear_device>;
-generic_ram_plain_device::generic_ram_plain_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source)
+generic_ram_plain_device::generic_ram_plain_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, uint32_t size, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_generic_cart_interface(mconfig, *this),
m_size(size)
{
}
-generic_ram_linear_device::generic_ram_linear_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source)
+generic_ram_linear_device::generic_ram_linear_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, uint32_t size, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_generic_cart_interface(mconfig, *this),
m_size(size)
@@ -49,32 +49,32 @@ generic_ram_linear_device::generic_ram_linear_device(const machine_config &mconf
}
-generic_ram_32k_plain_device::generic_ram_32k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_ram_32k_plain_device::generic_ram_32k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: generic_ram_plain_device(mconfig, GENERIC_RAM_32K_PLAIN, "Generic RAM 32K (plain mapping)", tag, owner, clock, 0x8000, "generic_ram32p", __FILE__)
{
}
-generic_ram_64k_plain_device::generic_ram_64k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_ram_64k_plain_device::generic_ram_64k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: generic_ram_plain_device(mconfig, GENERIC_RAM_64K_PLAIN, "Generic RAM 64K (plain mapping)", tag, owner, clock, 0x10000, "generic_ram64p", __FILE__)
{
}
-generic_ram_128k_plain_device::generic_ram_128k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_ram_128k_plain_device::generic_ram_128k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: generic_ram_plain_device(mconfig, GENERIC_RAM_128K_PLAIN, "Generic RAM 128K (plain mapping)", tag, owner, clock, 0x20000, "generic_ram128p", __FILE__)
{
}
-generic_ram_32k_linear_device::generic_ram_32k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_ram_32k_linear_device::generic_ram_32k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: generic_ram_linear_device(mconfig, GENERIC_RAM_32K_LINEAR, "Generic RAM 32K (linear mapping)", tag, owner, clock, 0x8000, "generic_ram32l", __FILE__)
{
}
-generic_ram_64k_linear_device::generic_ram_64k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_ram_64k_linear_device::generic_ram_64k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: generic_ram_linear_device(mconfig, GENERIC_RAM_64K_LINEAR, "Generic RAM 64K (linear mapping)", tag, owner, clock, 0x10000, "generic_ram64l", __FILE__)
{
}
-generic_ram_128k_linear_device::generic_ram_128k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_ram_128k_linear_device::generic_ram_128k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: generic_ram_linear_device(mconfig, GENERIC_RAM_128K_LINEAR, "Generic RAM 128K (linear mapping)", tag, owner, clock, 0x20000, "generic_ram128l", __FILE__)
{
}
diff --git a/src/devices/bus/generic/ram.h b/src/devices/bus/generic/ram.h
index 487aa5aae1b..213ed8178db 100644
--- a/src/devices/bus/generic/ram.h
+++ b/src/devices/bus/generic/ram.h
@@ -13,7 +13,7 @@ class generic_ram_plain_device : public device_t,
{
public:
// construction/destruction
- generic_ram_plain_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source);
+ generic_ram_plain_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, uint32_t size, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -23,7 +23,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_ram) override;
private:
- UINT32 m_size;
+ uint32_t m_size;
};
@@ -34,7 +34,7 @@ class generic_ram_linear_device : public device_t,
{
public:
// construction/destruction
- generic_ram_linear_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source);
+ generic_ram_linear_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, uint32_t size, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -44,7 +44,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_ram) override;
private:
- UINT32 m_size;
+ uint32_t m_size;
};
@@ -54,21 +54,21 @@ class generic_ram_32k_plain_device : public generic_ram_plain_device
{
public:
// construction/destruction
- generic_ram_32k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_ram_32k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class generic_ram_64k_plain_device : public generic_ram_plain_device
{
public:
// construction/destruction
- generic_ram_64k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_ram_64k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class generic_ram_128k_plain_device : public generic_ram_plain_device
{
public:
// construction/destruction
- generic_ram_128k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_ram_128k_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
@@ -78,21 +78,21 @@ class generic_ram_32k_linear_device : public generic_ram_linear_device
{
public:
// construction/destruction
- generic_ram_32k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_ram_32k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class generic_ram_64k_linear_device : public generic_ram_linear_device
{
public:
// construction/destruction
- generic_ram_64k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_ram_64k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class generic_ram_128k_linear_device : public generic_ram_linear_device
{
public:
// construction/destruction
- generic_ram_128k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_ram_128k_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
diff --git a/src/devices/bus/generic/rom.cpp b/src/devices/bus/generic/rom.cpp
index a816040e229..41a35c8be2b 100644
--- a/src/devices/bus/generic/rom.cpp
+++ b/src/devices/bus/generic/rom.cpp
@@ -31,28 +31,28 @@ const device_type GENERIC_ROM_LINEAR = &device_creator<generic_rom_linear_device
const device_type GENERIC_ROMRAM_PLAIN = &device_creator<generic_romram_plain_device>;
-generic_rom_device::generic_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+generic_rom_device::generic_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_generic_cart_interface(mconfig, *this)
{
}
-generic_rom_plain_device::generic_rom_plain_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+generic_rom_plain_device::generic_rom_plain_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: generic_rom_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-generic_rom_plain_device::generic_rom_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_rom_plain_device::generic_rom_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: generic_rom_device(mconfig, GENERIC_ROM_PLAIN, "Generic ROM (plain mapping)", tag, owner, clock, "generic_rom_plain", __FILE__)
{
}
-generic_rom_linear_device::generic_rom_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_rom_linear_device::generic_rom_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: generic_rom_device(mconfig, GENERIC_ROM_LINEAR, "Generic ROM (linear mapping)", tag, owner, clock, "generic_rom_linear", __FILE__)
{
}
-generic_romram_plain_device::generic_romram_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+generic_romram_plain_device::generic_romram_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: generic_rom_plain_device(mconfig, GENERIC_ROMRAM_PLAIN, "Generic ROM + RAM (plain mapping)", tag, owner, clock, "generic_romram_plain", __FILE__)
{
}
@@ -72,7 +72,7 @@ READ8_MEMBER(generic_rom_plain_device::read_rom)
READ16_MEMBER(generic_rom_plain_device::read16_rom)
{
- UINT16 *ROM = (UINT16 *)m_rom;
+ uint16_t *ROM = (uint16_t *)m_rom;
if (offset < m_rom_size/2)
return ROM[offset];
else
@@ -81,7 +81,7 @@ READ16_MEMBER(generic_rom_plain_device::read16_rom)
READ32_MEMBER(generic_rom_plain_device::read32_rom)
{
- UINT32 *ROM = (UINT32 *)m_rom;
+ uint32_t *ROM = (uint32_t *)m_rom;
if (offset < m_rom_size/4)
return ROM[offset];
else
@@ -96,13 +96,13 @@ READ8_MEMBER(generic_rom_linear_device::read_rom)
READ16_MEMBER(generic_rom_linear_device::read16_rom)
{
- UINT16 *ROM = (UINT16 *)m_rom;
+ uint16_t *ROM = (uint16_t *)m_rom;
return ROM[offset % (m_rom_size/2)];
}
READ32_MEMBER(generic_rom_linear_device::read32_rom)
{
- UINT32 *ROM = (UINT32 *)m_rom;
+ uint32_t *ROM = (uint32_t *)m_rom;
return ROM[offset % (m_rom_size/4)];
}
diff --git a/src/devices/bus/generic/rom.h b/src/devices/bus/generic/rom.h
index 73489ab0932..1cf583c0858 100644
--- a/src/devices/bus/generic/rom.h
+++ b/src/devices/bus/generic/rom.h
@@ -13,7 +13,7 @@ class generic_rom_device : public device_t,
{
public:
// construction/destruction
- generic_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ generic_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override {}
@@ -26,8 +26,8 @@ class generic_rom_plain_device : public generic_rom_device
{
public:
// construction/destruction
- generic_rom_plain_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- generic_rom_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_rom_plain_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ generic_rom_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
@@ -42,7 +42,7 @@ class generic_romram_plain_device : public generic_rom_plain_device
{
public:
// construction/destruction
- generic_romram_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_romram_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_ram) override;
@@ -56,7 +56,7 @@ class generic_rom_linear_device : public generic_rom_device
{
public:
// construction/destruction
- generic_rom_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_rom_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
diff --git a/src/devices/bus/generic/slot.cpp b/src/devices/bus/generic/slot.cpp
index 71a5d0f1b0e..9b5ddc4e2c8 100644
--- a/src/devices/bus/generic/slot.cpp
+++ b/src/devices/bus/generic/slot.cpp
@@ -70,7 +70,7 @@ void device_generic_cart_interface::rom_alloc(size_t size, int width, endianness
// ram_alloc - alloc the space for the ram
//-------------------------------------------------
-void device_generic_cart_interface::ram_alloc(UINT32 size)
+void device_generic_cart_interface::ram_alloc(uint32_t size)
{
m_ram.resize(size);
}
@@ -84,7 +84,7 @@ void device_generic_cart_interface::ram_alloc(UINT32 size)
//-------------------------------------------------
// generic_slot_device - constructor
//-------------------------------------------------
-generic_slot_device::generic_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+generic_slot_device::generic_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, GENERIC_SOCKET, "Generic ROM Socket / RAM Socket / Cartridge Slot", tag, owner, clock, "generic_socket", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -140,7 +140,7 @@ image_init_result generic_slot_device::call_load()
return m_device_image_load(*this);
else
{
- UINT32 len = common_get_size("rom");
+ uint32_t len = common_get_size("rom");
rom_alloc(len, m_width, m_endianness);
common_load_rom(get_rom_base(), len, "rom");
@@ -186,7 +186,7 @@ std::string generic_slot_device::get_default_card_software()
for fullpath and for softlist
-------------------------------------------------*/
-UINT32 generic_slot_device::common_get_size(const char *region)
+uint32_t generic_slot_device::common_get_size(const char *region)
{
// if we are loading from softlist, you have to specify a region
assert((software_entry() == nullptr) || (region != nullptr));
@@ -199,7 +199,7 @@ UINT32 generic_slot_device::common_get_size(const char *region)
for fullpath and for softlist
-------------------------------------------------*/
-void generic_slot_device::common_load_rom(UINT8 *ROM, UINT32 len, const char *region)
+void generic_slot_device::common_load_rom(uint8_t *ROM, uint32_t len, const char *region)
{
// basic sanity check
assert((ROM != nullptr) && (len > 0));
diff --git a/src/devices/bus/generic/slot.h b/src/devices/bus/generic/slot.h
index 429441b3663..4bf58ff4a3d 100644
--- a/src/devices/bus/generic/slot.h
+++ b/src/devices/bus/generic/slot.h
@@ -29,23 +29,23 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_ram) {};
virtual void rom_alloc(size_t size, int width, endianness_t end, const char *tag);
- virtual void ram_alloc(UINT32 size);
+ virtual void ram_alloc(uint32_t size);
- UINT8* get_rom_base() { return m_rom; }
- UINT32 get_rom_size() { return m_rom_size; }
+ uint8_t* get_rom_base() { return m_rom; }
+ uint32_t get_rom_size() { return m_rom_size; }
- UINT8* get_region_base() { if (m_region.found()) return m_region->base(); return nullptr; }
- UINT32 get_region_size() { if (m_region.found()) return m_region->bytes(); return 0; }
+ uint8_t* get_region_base() { if (m_region.found()) return m_region->base(); return nullptr; }
+ uint32_t get_region_size() { if (m_region.found()) return m_region->bytes(); return 0; }
- UINT8* get_ram_base() { return &m_ram[0]; }
- UINT32 get_ram_size() { return m_ram.size(); }
+ uint8_t* get_ram_base() { return &m_ram[0]; }
+ uint32_t get_ram_size() { return m_ram.size(); }
void save_ram() { device().save_item(NAME(m_ram)); }
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT8> m_ram;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint8_t> m_ram;
// this replaces m_rom for non-user configurable carts!
optional_memory_region m_region;
@@ -97,7 +97,7 @@ class generic_slot_device : public device_t,
{
public:
// construction/destruction
- generic_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ generic_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~generic_slot_device();
static void static_set_device_load(device_t &device, device_image_load_delegate callback) { downcast<generic_slot_device &>(device).m_device_image_load = callback; }
@@ -119,8 +119,8 @@ public:
virtual void call_unload() override;
virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
- UINT32 common_get_size(const char *region);
- void common_load_rom(UINT8 *ROM, UINT32 len, const char *region);
+ uint32_t common_get_size(const char *region);
+ void common_load_rom(uint8_t *ROM, uint32_t len, const char *region);
virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
virtual bool is_readable() const override { return 1; }
@@ -143,9 +143,9 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_ram);
virtual void rom_alloc(size_t size, int width, endianness_t end) { if (m_cart) m_cart->rom_alloc(size, width, end, tag()); }
- virtual void ram_alloc(UINT32 size) { if (m_cart) m_cart->ram_alloc(size); }
+ virtual void ram_alloc(uint32_t size) { if (m_cart) m_cart->ram_alloc(size); }
- UINT8* get_rom_base() {
+ uint8_t* get_rom_base() {
if (m_cart)
{
if (!user_loadable())
@@ -155,7 +155,7 @@ public:
}
return nullptr;
}
- UINT32 get_rom_size() {
+ uint32_t get_rom_size() {
if (m_cart)
{
if (!user_loadable())
@@ -165,7 +165,7 @@ public:
}
return 0;
}
- UINT8* get_ram_base() { if (m_cart) return m_cart->get_ram_base(); return nullptr; }
+ uint8_t* get_ram_base() { if (m_cart) return m_cart->get_ram_base(); return nullptr; }
void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); }
diff --git a/src/devices/bus/hp9845_io/98035.cpp b/src/devices/bus/hp9845_io/98035.cpp
index 5e06d4433c5..81dd6e33876 100644
--- a/src/devices/bus/hp9845_io/98035.cpp
+++ b/src/devices/bus/hp9845_io/98035.cpp
@@ -76,7 +76,7 @@ enum {
MSEC_TMR_ID
};
-hp98035_io_card::hp98035_io_card(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hp98035_io_card::hp98035_io_card(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: hp9845_io_card_device(mconfig , HP98035_IO_CARD , "HP98035 card" , tag , owner , clock , "hp98035" , __FILE__)
{
}
@@ -177,7 +177,7 @@ void hp98035_io_card::device_timer(emu_timer &timer, device_timer_id id, int par
}
// Every ms: advance active units
- UINT8 triggered = 0;
+ uint8_t triggered = 0;
for (timer_unit_t& unit : m_units) {
if (unit.m_state != UNIT_IDLE) {
if (unit.m_input && unit.m_state == UNIT_ACTIVE) {
@@ -218,7 +218,7 @@ void hp98035_io_card::device_timer(emu_timer &timer, device_timer_id id, int par
READ16_MEMBER(hp98035_io_card::reg_r)
{
- UINT16 res;
+ uint16_t res;
switch (offset) {
case 0:
@@ -256,7 +256,7 @@ WRITE16_MEMBER(hp98035_io_card::reg_w)
switch (offset) {
case 0:
// R4: IDR
- m_idr = (UINT8)data;
+ m_idr = (uint8_t)data;
m_idr_full = true;
update_ibuffer();
break;
@@ -337,7 +337,7 @@ void hp98035_io_card::update_ibuffer(void)
void hp98035_io_card::process_ibuffer(void)
{
m_ibuffer[ m_ibuffer_ptr ] = '\0';
- const UINT8 *p = &m_ibuffer[ 0 ];
+ const uint8_t *p = &m_ibuffer[ 0 ];
clear_obuffer();
@@ -345,7 +345,7 @@ void hp98035_io_card::process_ibuffer(void)
while (*p != '\0' && !get_out) {
std::ostringstream out;
- UINT8 datetime[ 5 ];
+ uint8_t datetime[ 5 ];
unsigned unit_no;
switch (*p++) {
@@ -447,7 +447,7 @@ void hp98035_io_card::process_ibuffer(void)
m_ibuffer_ptr = 0;
}
-bool hp98035_io_card::assign_unit(timer_unit_t& unit , const UINT8*& p , bool input)
+bool hp98035_io_card::assign_unit(timer_unit_t& unit , const uint8_t*& p , bool input)
{
unsigned port_no;
@@ -473,13 +473,13 @@ bool hp98035_io_card::assign_unit(timer_unit_t& unit , const UINT8*& p , bool in
}
}
-bool hp98035_io_card::parse_unit_command(const UINT8*& p, unsigned unit_no)
+bool hp98035_io_card::parse_unit_command(const uint8_t*& p, unsigned unit_no)
{
unit_no--;
timer_unit_t& unit = m_units[ unit_no ];
bool get_out = false;
unsigned msec;
- UINT8 to_match[ 5 ];
+ uint8_t to_match[ 5 ];
std::ostringstream out;
LOG(("U %c %u %p\n" , *p , unit_no , &unit));
@@ -607,7 +607,7 @@ void hp98035_io_card::clear_obuffer(void)
m_obuffer_ptr = 0;
}
-void hp98035_io_card::set_obuffer(UINT8 b)
+void hp98035_io_card::set_obuffer(uint8_t b)
{
m_obuffer[ 0 ] = b;
m_obuffer_len = 1;
@@ -632,12 +632,12 @@ void hp98035_io_card::update_obuffer(void)
}
}
-void hp98035_io_card::set_error(UINT8 mask)
+void hp98035_io_card::set_error(uint8_t mask)
{
m_error |= mask;
}
-bool hp98035_io_card::parse_datetime(const UINT8*& p, UINT8 *out) const
+bool hp98035_io_card::parse_datetime(const uint8_t*& p, uint8_t *out) const
{
unsigned n_fields = 0;
@@ -655,7 +655,7 @@ bool hp98035_io_card::parse_datetime(const UINT8*& p, UINT8 *out) const
// Shift all fields one position to the left
memmove(&out[ 0 ] , &out[ 1 ] , 4 * sizeof(out[ 0 ]));
// Put the new field in the last position
- out[ 4 ] = (UINT8)(tmp * 10 + *p - '0');
+ out[ 4 ] = (uint8_t)(tmp * 10 + *p - '0');
n_fields++;
p++;
}
@@ -686,7 +686,7 @@ bool hp98035_io_card::parse_datetime(const UINT8*& p, UINT8 *out) const
return true;
}
// Month
- UINT8 month;
+ uint8_t month;
if (n_fields == 4) {
month = m_mon;
} else {
@@ -703,7 +703,7 @@ bool hp98035_io_card::parse_datetime(const UINT8*& p, UINT8 *out) const
return true;
}
-bool hp98035_io_card::parse_unit_no(const UINT8*& p, unsigned& unit) const
+bool hp98035_io_card::parse_unit_no(const uint8_t*& p, unsigned& unit) const
{
if (*p < '1' || *p > '0' + HP98035_UNIT_COUNT) {
return false;
@@ -717,7 +717,7 @@ bool hp98035_io_card::parse_unit_no(const UINT8*& p, unsigned& unit) const
return true;
}
-bool hp98035_io_card::parse_msec(const UINT8*& p, unsigned& msec) const
+bool hp98035_io_card::parse_msec(const uint8_t*& p, unsigned& msec) const
{
msec = 0;
diff --git a/src/devices/bus/hp9845_io/98035.h b/src/devices/bus/hp9845_io/98035.h
index f3e9a21f7ac..c624e39e780 100644
--- a/src/devices/bus/hp9845_io/98035.h
+++ b/src/devices/bus/hp9845_io/98035.h
@@ -23,7 +23,7 @@ class hp98035_io_card : public hp9845_io_card_device
{
public:
// construction/destruction
- hp98035_io_card(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hp98035_io_card(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~hp98035_io_card();
// device-level overrides
@@ -42,24 +42,24 @@ private:
bool m_intflag;
bool m_irq;
bool m_idr_full;
- UINT8 m_idr; // Input Data Register
- UINT8 m_odr; // Output Data Register
- UINT8 m_error;
- UINT8 m_triggered;
- UINT8 m_lost_irq;
- UINT8 m_ibuffer[ HP98035_IBUFFER_LEN + 1 ];
+ uint8_t m_idr; // Input Data Register
+ uint8_t m_odr; // Output Data Register
+ uint8_t m_error;
+ uint8_t m_triggered;
+ uint8_t m_lost_irq;
+ uint8_t m_ibuffer[ HP98035_IBUFFER_LEN + 1 ];
unsigned m_ibuffer_ptr;
- UINT8 m_obuffer[ HP98035_OBUFFER_LEN ];
+ uint8_t m_obuffer[ HP98035_OBUFFER_LEN ];
unsigned m_obuffer_len;
unsigned m_obuffer_ptr;
// Clock/timer state
unsigned m_msec; // Milliseconds
- UINT8 m_sec; // Seconds
- UINT8 m_min; // Minutes
- UINT8 m_hrs; // Hours
- UINT8 m_dom; // Day of month
- UINT8 m_mon; // Month
+ uint8_t m_sec; // Seconds
+ uint8_t m_min; // Minutes
+ uint8_t m_hrs; // Hours
+ uint8_t m_dom; // Day of month
+ uint8_t m_mon; // Month
// Strangely enough this RTC has no notion of current year
emu_timer *m_msec_timer;
@@ -73,8 +73,8 @@ private:
typedef struct {
unit_state_t m_state; // State
bool m_input; // Input or output
- UINT8 m_port; // Assigned port # (0 if not assigned)
- UINT8 m_match_datetime[ 4 ]; // Date&time to match (month is not included)
+ uint8_t m_port; // Assigned port # (0 if not assigned)
+ uint8_t m_match_datetime[ 4 ]; // Date&time to match (month is not included)
unsigned m_delay; // Timer delay
unsigned m_period; // Timer period (when != 0)
unsigned m_value; // Current counter value
@@ -91,16 +91,16 @@ private:
void update_irq(void);
void update_ibuffer(void);
void process_ibuffer(void);
- bool assign_unit(timer_unit_t& unit , const UINT8*& p , bool input);
- bool parse_unit_command(const UINT8*& p, unsigned unit_no);
+ bool assign_unit(timer_unit_t& unit , const uint8_t*& p , bool input);
+ bool parse_unit_command(const uint8_t*& p, unsigned unit_no);
void clear_obuffer(void);
- void set_obuffer(UINT8 b);
+ void set_obuffer(uint8_t b);
void set_obuffer(const char* s);
void update_obuffer(void);
- void set_error(UINT8 mask);
- bool parse_datetime(const UINT8*& p, UINT8 *out) const;
- bool parse_unit_no(const UINT8*& p, unsigned& unit) const;
- bool parse_msec(const UINT8*& p, unsigned& msec) const;
+ void set_error(uint8_t mask);
+ bool parse_datetime(const uint8_t*& p, uint8_t *out) const;
+ bool parse_unit_no(const uint8_t*& p, unsigned& unit) const;
+ bool parse_msec(const uint8_t*& p, unsigned& msec) const;
};
// device type definition
diff --git a/src/devices/bus/hp9845_io/hp9845_io.cpp b/src/devices/bus/hp9845_io/hp9845_io.cpp
index 7ea48639b15..7d34b8bb41d 100644
--- a/src/devices/bus/hp9845_io/hp9845_io.cpp
+++ b/src/devices/bus/hp9845_io/hp9845_io.cpp
@@ -17,7 +17,7 @@ const device_type HP9845_IO_SLOT = &device_creator<hp9845_io_slot_device>;
// +---------------------+
// |hp9845_io_slot_device|
// +---------------------+
-hp9845_io_slot_device::hp9845_io_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+hp9845_io_slot_device::hp9845_io_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, HP9845_IO_SLOT, "HP9845 I/O Slot", tag, owner, clock, "hp9845_io_slot", __FILE__),
device_slot_interface(mconfig, *this)
{
@@ -36,7 +36,7 @@ void hp9845_io_slot_device::device_start()
// +---------------------+
// |hp9845_io_card_device|
// +---------------------+
-hp9845_io_card_device::hp9845_io_card_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+hp9845_io_card_device::hp9845_io_card_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_card_interface(mconfig, *this),
m_sys(nullptr),
diff --git a/src/devices/bus/hp9845_io/hp9845_io.h b/src/devices/bus/hp9845_io/hp9845_io.h
index 61f8b57575e..b7446cae096 100644
--- a/src/devices/bus/hp9845_io/hp9845_io.h
+++ b/src/devices/bus/hp9845_io/hp9845_io.h
@@ -42,7 +42,7 @@ class hp9845_io_slot_device : public device_t,
{
public:
// construction/destruction
- hp9845_io_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hp9845_io_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~hp9845_io_slot_device();
// device-level overrides
@@ -56,7 +56,7 @@ class hp9845_io_card_device : public device_t,
{
protected:
// construction/destruction
- hp9845_io_card_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ hp9845_io_card_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual ~hp9845_io_card_device();
// device-level overrides
@@ -64,7 +64,7 @@ protected:
hp9845b_state *m_sys;
required_ioport m_select_code_port;
- UINT8 m_my_sc;
+ uint8_t m_my_sc;
// card device handling
void irq_w(int state);
diff --git a/src/devices/bus/hp_optroms/hp_optrom.cpp b/src/devices/bus/hp_optroms/hp_optrom.cpp
index 7d2de33fcf3..c741d8355d4 100644
--- a/src/devices/bus/hp_optroms/hp_optrom.cpp
+++ b/src/devices/bus/hp_optroms/hp_optrom.cpp
@@ -18,13 +18,13 @@ const device_type HP_OPTROM_SLOT = &device_creator<hp_optrom_slot_device>;
// +---------------------+
// |hp_optrom_cart_device|
// +---------------------+
-hp_optrom_cart_device::hp_optrom_cart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+hp_optrom_cart_device::hp_optrom_cart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_card_interface(mconfig, *this)
{
}
-hp_optrom_cart_device::hp_optrom_cart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+hp_optrom_cart_device::hp_optrom_cart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, HP_OPTROM_CART, "HP9845 optional ROM cartridge", tag, owner, clock, "hp_optrom_cart", __FILE__),
device_slot_card_interface(mconfig, *this)
{
@@ -33,7 +33,7 @@ hp_optrom_cart_device::hp_optrom_cart_device(const machine_config &mconfig, cons
// +---------------------+
// |hp_optrom_slot_device|
// +---------------------+
-hp_optrom_slot_device::hp_optrom_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+hp_optrom_slot_device::hp_optrom_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, HP_OPTROM_SLOT, "HP9845 optional ROM Slot", tag, owner, clock, "hp_optrom_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -98,7 +98,7 @@ image_init_result hp_optrom_slot_device::call_load()
logerror("hp_optrom: base_addr = %06x end_addr = %06x\n" , base_addr , end_addr);
m_content.resize(length * 2);
- UINT8 *buffer = m_content.data();
+ uint8_t *buffer = m_content.data();
memcpy(buffer , get_software_region("rom") , length * 2);
// Install ROM in address space of every CPU
diff --git a/src/devices/bus/hp_optroms/hp_optrom.h b/src/devices/bus/hp_optroms/hp_optrom.h
index 0ddd24b26c9..9d95ab76fe1 100644
--- a/src/devices/bus/hp_optroms/hp_optrom.h
+++ b/src/devices/bus/hp_optroms/hp_optrom.h
@@ -22,8 +22,8 @@ class hp_optrom_cart_device : public device_t,
{
public:
// construction/destruction
- hp_optrom_cart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- hp_optrom_cart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hp_optrom_cart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ hp_optrom_cart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override {}
@@ -35,7 +35,7 @@ class hp_optrom_slot_device : public device_t,
{
public:
// construction/destruction
- hp_optrom_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hp_optrom_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~hp_optrom_slot_device();
// device-level overrides
@@ -61,7 +61,7 @@ public:
protected:
hp_optrom_cart_device *m_cart;
- std::vector<UINT8> m_content;
+ std::vector<uint8_t> m_content;
offs_t m_base_addr;
offs_t m_end_addr;
};
diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp
index 3fbd46e520f..93b184cb7da 100644
--- a/src/devices/bus/ieee488/c2031.cpp
+++ b/src/devices/bus/ieee488/c2031.cpp
@@ -132,7 +132,7 @@ READ8_MEMBER( c2031_device::via0_pb_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// not ready for data
data |= m_bus->nrfd_r() << 1;
@@ -224,7 +224,7 @@ READ8_MEMBER( c2031_device::via1_pb_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// write protect sense
data |= !m_floppy->wpt_r() << 4;
@@ -397,7 +397,7 @@ inline int c2031_device::get_device_number()
// c2031_device - constructor
//-------------------------------------------------
-c2031_device::c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c2031_device::c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, C2031, "C2031", tag, owner, clock, "c2031", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
diff --git a/src/devices/bus/ieee488/c2031.h b/src/devices/bus/ieee488/c2031.h
index 3a23feee2b7..3d64c7c4485 100644
--- a/src/devices/bus/ieee488/c2031.h
+++ b/src/devices/bus/ieee488/c2031.h
@@ -30,7 +30,7 @@ class c2031_device : public device_t,
{
public:
// construction/destruction
- c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp
index 2c6e82b1ce3..717f8feba30 100644
--- a/src/devices/bus/ieee488/c2040.cpp
+++ b/src/devices/bus/ieee488/c2040.cpp
@@ -265,7 +265,7 @@ READ8_MEMBER( c2040_t::riot1_pa_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// end or identify in
data |= m_bus->eoi_r() << 5;
@@ -331,7 +331,7 @@ READ8_MEMBER( c2040_t::riot1_pb_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// device number selection
data |= m_slot->get_address() - 8;
@@ -674,7 +674,7 @@ inline void c2040_t::update_ieee_signals()
// c2040_t - constructor
//-------------------------------------------------
-c2040_t::c2040_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+c2040_t::c2040_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
@@ -694,7 +694,7 @@ c2040_t::c2040_t(const machine_config &mconfig, device_type type, const char *na
{
}
-c2040_t::c2040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c2040_t::c2040_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C2040, "C2040", tag, owner, clock, "c2040", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
@@ -719,7 +719,7 @@ c2040_t::c2040_t(const machine_config &mconfig, const char *tag, device_t *owner
// c3040_t - constructor
//-------------------------------------------------
-c3040_t::c3040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c3040_t::c3040_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
c2040_t(mconfig, C3040, "C3040", tag, owner, clock, "c3040", __FILE__) { }
@@ -727,7 +727,7 @@ c3040_t::c3040_t(const machine_config &mconfig, const char *tag, device_t *owner
// c4040_t - constructor
//-------------------------------------------------
-c4040_t::c4040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c4040_t::c4040_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
c2040_t(mconfig, C4040, "C4040", tag, owner, clock, "c4040", __FILE__) { }
diff --git a/src/devices/bus/ieee488/c2040.h b/src/devices/bus/ieee488/c2040.h
index bac0a52ec07..252b0956906 100644
--- a/src/devices/bus/ieee488/c2040.h
+++ b/src/devices/bus/ieee488/c2040.h
@@ -32,8 +32,8 @@ class c2040_t : public device_t,
{
public:
// construction/destruction
- c2040_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- c2040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c2040_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ c2040_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -95,7 +95,7 @@ class c3040_t : public c2040_t
{
public:
// construction/destruction
- c3040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c3040_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -111,7 +111,7 @@ class c4040_t : public c2040_t
{
public:
// construction/destruction
- c4040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c4040_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ieee488/c2040fdc.cpp b/src/devices/bus/ieee488/c2040fdc.cpp
index 5cc70c7f571..3569a59f8b5 100644
--- a/src/devices/bus/ieee488/c2040fdc.cpp
+++ b/src/devices/bus/ieee488/c2040fdc.cpp
@@ -69,7 +69,7 @@ const tiny_rom_entry *c2040_fdc_t::device_rom_region() const
// c2040_fdc_t - constructor
//-------------------------------------------------
-c2040_fdc_t::c2040_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c2040_fdc_t::c2040_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C2040_FDC, "C2040 FDC", tag, owner, clock, "c2040fdc", __FILE__),
m_write_sync(*this),
m_write_ready(*this),
@@ -433,10 +433,10 @@ int c2040_fdc_t::get_next_bit(attotime &tm, const attotime &limit)
READ8_MEMBER( c2040_fdc_t::read )
{
- UINT8 e = checkpoint_live.e;
+ uint8_t e = checkpoint_live.e;
offs_t i = checkpoint_live.i;
- UINT8 data = GCR_DECODE(e, i);
+ uint8_t data = GCR_DECODE(e, i);
if (LOG) logerror("%s %s VIA reads data %02x (%03x)\n", machine().time().as_string(), machine().describe_context(), data, checkpoint_live.shift_reg);
diff --git a/src/devices/bus/ieee488/c2040fdc.h b/src/devices/bus/ieee488/c2040fdc.h
index 3ff0856181b..348ff5e0469 100644
--- a/src/devices/bus/ieee488/c2040fdc.h
+++ b/src/devices/bus/ieee488/c2040fdc.h
@@ -45,7 +45,7 @@ class c2040_fdc_t : public device_t
{
public:
// construction/destruction
- c2040_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c2040_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_sync_wr_callback(device_t &device, _Object object) { return downcast<c2040_fdc_t &>(device).m_write_sync.set_callback(object); }
template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<c2040_fdc_t &>(device).m_write_ready.set_callback(object); }
@@ -101,15 +101,15 @@ protected:
int odd_hd;
attotime edge;
- UINT16 shift_reg;
+ uint16_t shift_reg;
int cycle_counter;
int cell_counter;
int bit_counter;
- UINT8 e;
+ uint8_t e;
offs_t i;
- UINT8 pi;
- UINT16 shift_reg_write;
+ uint8_t pi;
+ uint16_t shift_reg_write;
attotime write_start_time;
attotime write_buffer[32];
int write_position;
@@ -135,7 +135,7 @@ protected:
int m_mode_sel;
int m_rw_sel;
int m_odd_hd;
- UINT8 m_pi;
+ uint8_t m_pi;
attotime m_period;
diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp
index bdc1b848e3f..2532e90dcd3 100644
--- a/src/devices/bus/ieee488/c8050.cpp
+++ b/src/devices/bus/ieee488/c8050.cpp
@@ -312,7 +312,7 @@ READ8_MEMBER( c8050_t::riot1_pa_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// end or identify in
data |= m_bus->eoi_r() << 5;
@@ -378,7 +378,7 @@ READ8_MEMBER( c8050_t::riot1_pb_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// device number selection
data |= m_slot->get_address() - 8;
@@ -817,7 +817,7 @@ inline void c8050_t::update_ieee_signals()
// c8050_t - constructor
//-------------------------------------------------
-c8050_t::c8050_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+c8050_t::c8050_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
@@ -836,7 +836,7 @@ c8050_t::c8050_t(const machine_config &mconfig, device_type type, const char *na
{
}
-c8050_t::c8050_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c8050_t::c8050_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C8050, "C8050", tag, owner, clock, "c8050", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
@@ -860,7 +860,7 @@ c8050_t::c8050_t(const machine_config &mconfig, const char *tag, device_t *owner
// c8250_t - constructor
//-------------------------------------------------
-c8250_t::c8250_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c8250_t::c8250_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
c8050_t(mconfig, C8250, "C8250", tag, owner, clock, "c8250", __FILE__) { }
@@ -868,7 +868,7 @@ c8250_t::c8250_t(const machine_config &mconfig, const char *tag, device_t *owner
// c8250lp_t - constructor
//-------------------------------------------------
-c8250lp_t::c8250lp_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c8250lp_t::c8250lp_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
c8050_t(mconfig, C8250LP, "C8250LP", tag, owner, clock, "c8250lp", __FILE__) { }
@@ -876,7 +876,7 @@ c8250lp_t::c8250lp_t(const machine_config &mconfig, const char *tag, device_t *o
// sfd1001_t - constructor
//-------------------------------------------------
-sfd1001_t::sfd1001_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sfd1001_t::sfd1001_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
c8050_t(mconfig, SFD1001, "SFD1001", tag, owner, clock, "sfd1001", __FILE__) { }
diff --git a/src/devices/bus/ieee488/c8050.h b/src/devices/bus/ieee488/c8050.h
index e983ad06353..ab2c38c3b54 100644
--- a/src/devices/bus/ieee488/c8050.h
+++ b/src/devices/bus/ieee488/c8050.h
@@ -32,8 +32,8 @@ class c8050_t : public device_t,
{
public:
// construction/destruction
- c8050_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- c8050_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c8050_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ c8050_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -86,7 +86,7 @@ class c8250_t : public c8050_t
{
public:
// construction/destruction
- c8250_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c8250_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -101,7 +101,7 @@ class c8250lp_t : public c8050_t
{
public:
// construction/destruction
- c8250lp_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c8250lp_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -117,7 +117,7 @@ class sfd1001_t : public c8050_t
{
public:
// construction/destruction
- sfd1001_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sfd1001_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ieee488/c8050fdc.cpp b/src/devices/bus/ieee488/c8050fdc.cpp
index ce16035f6e1..7bde9374b74 100644
--- a/src/devices/bus/ieee488/c8050fdc.cpp
+++ b/src/devices/bus/ieee488/c8050fdc.cpp
@@ -71,7 +71,7 @@ const tiny_rom_entry *c8050_fdc_t::device_rom_region() const
// c8050_fdc_t - constructor
//-------------------------------------------------
-c8050_fdc_t::c8050_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c8050_fdc_t::c8050_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C8050_FDC, "Commodore 8050 FDC", tag, owner, clock, "c8050fdc", __FILE__),
m_write_sync(*this),
m_write_ready(*this),
@@ -498,7 +498,7 @@ void c8050_fdc_t::live_run(const attotime &limit)
READ8_MEMBER( c8050_fdc_t::read )
{
- UINT8 e = checkpoint_live.e;
+ uint8_t e = checkpoint_live.e;
offs_t i = checkpoint_live.i;
return GCR_DECODE(e, i);
diff --git a/src/devices/bus/ieee488/c8050fdc.h b/src/devices/bus/ieee488/c8050fdc.h
index 83cb6dde238..e77b92b17f5 100644
--- a/src/devices/bus/ieee488/c8050fdc.h
+++ b/src/devices/bus/ieee488/c8050fdc.h
@@ -47,7 +47,7 @@ class c8050_fdc_t : public device_t
{
public:
// construction/destruction
- c8050_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c8050_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_sync_wr_callback(device_t &device, _Object object) { return downcast<c8050_fdc_t &>(device).m_write_sync.set_callback(object); }
template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<c8050_fdc_t &>(device).m_write_ready.set_callback(object); }
@@ -106,13 +106,13 @@ protected:
int odd_hd;
attotime edge;
- UINT16 shift_reg;
+ uint16_t shift_reg;
int bit_counter;
- UINT8 e;
+ uint8_t e;
offs_t i;
- UINT8 pi;
- UINT16 shift_reg_write;
+ uint8_t pi;
+ uint16_t shift_reg_write;
};
devcb_write_line m_write_sync;
@@ -136,7 +136,7 @@ protected:
int m_mode_sel;
int m_rw_sel;
int m_odd_hd;
- UINT8 m_pi;
+ uint8_t m_pi;
live_info cur_live, checkpoint_live;
fdc_pll_t cur_pll, checkpoint_pll;
diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp
index da51423e394..faac9c5efeb 100644
--- a/src/devices/bus/ieee488/c8280.cpp
+++ b/src/devices/bus/ieee488/c8280.cpp
@@ -168,7 +168,7 @@ READ8_MEMBER( c8280_t::riot1_pa_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// end or identify in
data |= m_bus->eoi_r() << 5;
@@ -234,7 +234,7 @@ READ8_MEMBER( c8280_t::riot1_pb_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// device number selection
data |= m_slot->get_address() - 8;
@@ -382,7 +382,7 @@ inline void c8280_t::update_ieee_signals()
// c8280_t - constructor
//-------------------------------------------------
-c8280_t::c8280_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c8280_t::c8280_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C8280, "C8280", tag, owner, clock, "c8280", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_DOS_TAG),
@@ -485,7 +485,7 @@ READ8_MEMBER( c8280_t::fk5_r )
*/
- UINT8 data = m_fk5;
+ uint8_t data = m_fk5;
data |= (m_floppy ? m_floppy->dskchg_r() : 1) << 3;
data |= (m_floppy ? m_floppy->twosid_r() : 1) << 4;
diff --git a/src/devices/bus/ieee488/c8280.h b/src/devices/bus/ieee488/c8280.h
index a6c36b88489..1ca86cd8533 100644
--- a/src/devices/bus/ieee488/c8280.h
+++ b/src/devices/bus/ieee488/c8280.h
@@ -31,7 +31,7 @@ class c8280_t : public device_t,
{
public:
// construction/destruction
- c8280_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c8280_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -78,7 +78,7 @@ private:
int m_atna; // attention acknowledge
int m_ifc;
- UINT8 m_fk5;
+ uint8_t m_fk5;
};
diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp
index dbd7aba6fd7..01a9961b3d4 100644
--- a/src/devices/bus/ieee488/d9060.cpp
+++ b/src/devices/bus/ieee488/d9060.cpp
@@ -204,7 +204,7 @@ READ8_MEMBER( d9060_base_t::riot1_pa_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// end or identify in
data |= m_bus->eoi_r() << 5;
@@ -270,7 +270,7 @@ READ8_MEMBER( d9060_base_t::riot1_pb_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// device number selection
data |= m_slot->get_address() - 8;
@@ -483,7 +483,7 @@ inline void d9060_base_t::update_ieee_signals()
// d9060_base_t - constructor
//-------------------------------------------------
-d9060_base_t::d9060_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+d9060_base_t::d9060_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, uint32_t variant, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, M6502_DOS_TAG),
@@ -507,7 +507,7 @@ d9060_base_t::d9060_base_t(const machine_config &mconfig, device_type type, cons
// d9060_t - constructor
//-------------------------------------------------
-d9060_t::d9060_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+d9060_t::d9060_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: d9060_base_t(mconfig, D9060, "D9060", tag, owner, clock, TYPE_9060, "d9060", __FILE__) { }
@@ -515,7 +515,7 @@ d9060_t::d9060_t(const machine_config &mconfig, const char *tag, device_t *owner
// d9090_t - constructor
//-------------------------------------------------
-d9090_t::d9090_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+d9090_t::d9090_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: d9060_base_t(mconfig, D9090, "D9090", tag, owner, clock, TYPE_9090, "d9090", __FILE__) { }
diff --git a/src/devices/bus/ieee488/d9060.h b/src/devices/bus/ieee488/d9060.h
index 4dd5c6cb5b4..7dce8217344 100644
--- a/src/devices/bus/ieee488/d9060.h
+++ b/src/devices/bus/ieee488/d9060.h
@@ -38,7 +38,7 @@ public:
};
// construction/destruction
- d9060_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
+ d9060_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, uint32_t variant, const char *shortname, const char *source);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -86,7 +86,7 @@ private:
// SASI bus
int m_enable;
- UINT8 m_data;
+ uint8_t m_data;
int m_variant;
};
@@ -98,7 +98,7 @@ class d9060_t : public d9060_base_t
{
public:
// construction/destruction
- d9060_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ d9060_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
@@ -108,7 +108,7 @@ class d9090_t : public d9060_base_t
{
public:
// construction/destruction
- d9090_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ d9090_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp
index 355f5dba2b8..aa19fe840de 100644
--- a/src/devices/bus/ieee488/hardbox.cpp
+++ b/src/devices/bus/ieee488/hardbox.cpp
@@ -138,7 +138,7 @@ WRITE8_MEMBER( hardbox_device::ppi0_pb_w )
READ8_MEMBER( hardbox_device::ppi0_pc_r )
{
- UINT8 data = ioport("SW1")->read();
+ uint8_t data = ioport("SW1")->read();
/* DIP switches on PC1,PC2,PC3 configure the IEEE-488 primary address.
We get the address from the slot instead. */
@@ -168,7 +168,7 @@ READ8_MEMBER( hardbox_device::ppi1_pa_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
data |= !m_bus->atn_r();
data |= !m_bus->dav_r() << 1;
@@ -228,8 +228,8 @@ READ8_MEMBER( hardbox_device::ppi1_pc_r )
*/
- UINT8 status = m_hdc->status_r(space, 0);
- UINT8 data = 0;
+ uint8_t status = m_hdc->status_r(space, 0);
+ uint8_t data = 0;
data |= (status & CONTROLLER_BUSY) ? 0 : 0x10;
data |= (status & CONTROLLER_DIRECTION) ? 0 : 0x20;
@@ -346,7 +346,7 @@ ioport_constructor hardbox_device::device_input_ports() const
// hardbox_device - constructor
//-------------------------------------------------
-hardbox_device::hardbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+hardbox_device::hardbox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, HARDBOX, "HardBox", tag, owner, clock, "hardbox", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
diff --git a/src/devices/bus/ieee488/hardbox.h b/src/devices/bus/ieee488/hardbox.h
index 2d5c382f4b6..8ea1acc5445 100644
--- a/src/devices/bus/ieee488/hardbox.h
+++ b/src/devices/bus/ieee488/hardbox.h
@@ -31,7 +31,7 @@ class hardbox_device : public device_t,
{
public:
// construction/destruction
- hardbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hardbox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ieee488/ieee488.cpp b/src/devices/bus/ieee488/ieee488.cpp
index 38a1f538404..1b2f71c3f6a 100644
--- a/src/devices/bus/ieee488/ieee488.cpp
+++ b/src/devices/bus/ieee488/ieee488.cpp
@@ -63,7 +63,7 @@ device_ieee488_interface::~device_ieee488_interface()
// ieee488_slot_device - constructor
//-------------------------------------------------
-ieee488_slot_device::ieee488_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ieee488_slot_device::ieee488_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, IEEE488_SLOT, "IEEE-488 slot", tag, owner, clock, "ieee488_slot", __FILE__),
device_slot_interface(mconfig, *this), m_address(0)
{
@@ -100,7 +100,7 @@ void ieee488_slot_device::device_start()
// ieee488_device - constructor
//-------------------------------------------------
-ieee488_device::ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ieee488_device::ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, IEEE488, "IEEE-488 bus", tag, owner, clock, "ieee488", __FILE__),
m_write_eoi(*this),
m_write_dav(*this),
@@ -313,7 +313,7 @@ int ieee488_device::get_signal(int signal)
// set_data -
//-------------------------------------------------
-void ieee488_device::set_data(device_t *device, UINT8 data)
+void ieee488_device::set_data(device_t *device, uint8_t data)
{
if (device == this)
{
@@ -346,9 +346,9 @@ void ieee488_device::set_data(device_t *device, UINT8 data)
// get_data -
//-------------------------------------------------
-UINT8 ieee488_device::get_data()
+uint8_t ieee488_device::get_data()
{
- UINT8 data = m_dio;
+ uint8_t data = m_dio;
daisy_entry *entry = m_device_list.first();
diff --git a/src/devices/bus/ieee488/ieee488.h b/src/devices/bus/ieee488/ieee488.h
index 61018600ceb..13e6b88d61d 100644
--- a/src/devices/bus/ieee488/ieee488.h
+++ b/src/devices/bus/ieee488/ieee488.h
@@ -90,7 +90,7 @@ class ieee488_device : public device_t
{
public:
// construction/destruction
- ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _write> void set_eoi_callback(_write wr) { m_write_eoi.set_callback(wr); }
template<class _write> void set_dav_callback(_write wr) { m_write_dav.set_callback(wr); }
@@ -104,7 +104,7 @@ public:
void add_device(ieee488_slot_device *slot, device_t *target);
// reads for both host and peripherals
- UINT8 dio_r() { return get_data(); }
+ uint8_t dio_r() { return get_data(); }
DECLARE_READ8_MEMBER( dio_r ) { return get_data(); }
DECLARE_READ_LINE_MEMBER( eoi_r ) { return get_signal(EOI); }
DECLARE_READ_LINE_MEMBER( dav_r ) { return get_signal(DAV); }
@@ -116,7 +116,7 @@ public:
DECLARE_READ_LINE_MEMBER( ren_r ) { return get_signal(REN); }
// writes for host (driver_device)
- void dio_w(UINT8 data) { return set_data(this, data); }
+ void dio_w(uint8_t data) { return set_data(this, data); }
DECLARE_WRITE8_MEMBER( dio_w ) { set_data(this, data); }
DECLARE_WRITE_LINE_MEMBER( eoi_w ) { set_signal(this, EOI, state); }
DECLARE_WRITE_LINE_MEMBER( dav_w ) { set_signal(this, DAV, state); }
@@ -128,7 +128,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( ren_w ) { set_signal(this, REN, state); }
// writes for peripherals (device_t)
- void dio_w(device_t *device, UINT8 data) { set_data(device, data); }
+ void dio_w(device_t *device, uint8_t data) { set_data(device, data); }
void eoi_w(device_t *device, int state) { set_signal(device, EOI, state); }
void dav_w(device_t *device, int state) { set_signal(device, DAV, state); }
void nrfd_w(device_t *device, int state) { set_signal(device, NRFD, state); }
@@ -167,7 +167,7 @@ protected:
device_ieee488_interface * m_interface; // associated device's daisy interface
int m_line[SIGNAL_COUNT];
- UINT8 m_dio;
+ uint8_t m_dio;
};
simple_list<daisy_entry> m_device_list;
@@ -184,11 +184,11 @@ private:
void set_signal(device_t *device, int signal, int state);
int get_signal(int signal);
- void set_data(device_t *device, UINT8 data);
- UINT8 get_data();
+ void set_data(device_t *device, uint8_t data);
+ uint8_t get_data();
int m_line[SIGNAL_COUNT];
- UINT8 m_dio;
+ uint8_t m_dio;
};
@@ -199,7 +199,7 @@ class ieee488_slot_device : public device_t,
{
public:
// construction/destruction
- ieee488_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ieee488_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void set_address(int address) { m_address = address; }
int get_address() { return m_address; }
diff --git a/src/devices/bus/ieee488/shark.cpp b/src/devices/bus/ieee488/shark.cpp
index 83a270f8894..7d6e81e6844 100644
--- a/src/devices/bus/ieee488/shark.cpp
+++ b/src/devices/bus/ieee488/shark.cpp
@@ -127,7 +127,7 @@ ioport_constructor mshark_device::device_input_ports() const
// mshark_device - constructor
//-------------------------------------------------
-mshark_device::mshark_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mshark_device::mshark_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SHARK, "Mator SHARK", tag, owner, clock, "mshark", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, I8085_TAG)
diff --git a/src/devices/bus/ieee488/shark.h b/src/devices/bus/ieee488/shark.h
index 2be61a610c8..e7d92a5da4c 100644
--- a/src/devices/bus/ieee488/shark.h
+++ b/src/devices/bus/ieee488/shark.h
@@ -28,7 +28,7 @@ class mshark_device : public device_t,
{
public:
// construction/destruction
- mshark_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mshark_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp
index 7d6dbce4651..7d586566e9a 100644
--- a/src/devices/bus/ieee488/softbox.cpp
+++ b/src/devices/bus/ieee488/softbox.cpp
@@ -128,7 +128,7 @@ READ8_MEMBER( softbox_device::ppi1_pa_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
data |= !m_bus->atn_r();
data |= !m_bus->dav_r() << 1;
@@ -186,8 +186,8 @@ READ8_MEMBER( softbox_device::ppi1_pc_r )
*/
- UINT8 status = m_hdc->status_r(space, 0);
- UINT8 data = 0;
+ uint8_t status = m_hdc->status_r(space, 0);
+ uint8_t data = 0;
data |= (status & CONTROLLER_BUSY) ? 0 : 0x10;
data |= (status & CONTROLLER_DIRECTION) ? 0 : 0x20;
@@ -326,7 +326,7 @@ ioport_constructor softbox_device::device_input_ports() const
// softbox_device - constructor
//-------------------------------------------------
-softbox_device::softbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+softbox_device::softbox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SOFTBOX, "PET SoftBox", tag, owner, clock, "pet_softbox", __FILE__),
device_ieee488_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
diff --git a/src/devices/bus/ieee488/softbox.h b/src/devices/bus/ieee488/softbox.h
index 0b812e0a0c1..9b0d5611c1a 100644
--- a/src/devices/bus/ieee488/softbox.h
+++ b/src/devices/bus/ieee488/softbox.h
@@ -33,7 +33,7 @@ class softbox_device : public device_t,
{
public:
// construction/destruction
- softbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ softbox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/imi7000/imi5000h.cpp b/src/devices/bus/imi7000/imi5000h.cpp
index 6268e7875c6..73596f8505c 100644
--- a/src/devices/bus/imi7000/imi5000h.cpp
+++ b/src/devices/bus/imi7000/imi5000h.cpp
@@ -445,7 +445,7 @@ ioport_constructor imi5000h_device::device_input_ports() const
// imi5000h_device - constructor
//-------------------------------------------------
-imi5000h_device::imi5000h_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+imi5000h_device::imi5000h_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, IMI5000H, "IMI 5000H", tag, owner, clock, "imi5000h", __FILE__),
device_imi7000_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
diff --git a/src/devices/bus/imi7000/imi5000h.h b/src/devices/bus/imi7000/imi5000h.h
index 201142fb413..c8ac2492dc0 100644
--- a/src/devices/bus/imi7000/imi5000h.h
+++ b/src/devices/bus/imi7000/imi5000h.h
@@ -33,7 +33,7 @@ class imi5000h_device : public device_t,
{
public:
// construction/destruction
- imi5000h_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ imi5000h_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/imi7000/imi7000.cpp b/src/devices/bus/imi7000/imi7000.cpp
index 8d6baaf0ef1..fa73e98b10b 100644
--- a/src/devices/bus/imi7000/imi7000.cpp
+++ b/src/devices/bus/imi7000/imi7000.cpp
@@ -50,7 +50,7 @@ device_imi7000_interface::device_imi7000_interface(const machine_config &mconfig
// imi7000_slot_device - constructor
//-------------------------------------------------
-imi7000_slot_device::imi7000_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+imi7000_slot_device::imi7000_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, IMI7000_SLOT, "IMI 7000 slot", tag, owner, clock, "imi7000_slot", __FILE__),
device_slot_interface(mconfig, *this), m_card(nullptr)
{
@@ -75,7 +75,7 @@ void imi7000_slot_device::device_start()
// imi7000_bus_device - constructor
//-------------------------------------------------
-imi7000_bus_device::imi7000_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+imi7000_bus_device::imi7000_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, IMI7000_BUS, "IMI 7000 bus", tag, owner, clock, "imi7000", __FILE__)
{
}
diff --git a/src/devices/bus/imi7000/imi7000.h b/src/devices/bus/imi7000/imi7000.h
index e374fedb6d9..314b86c4302 100644
--- a/src/devices/bus/imi7000/imi7000.h
+++ b/src/devices/bus/imi7000/imi7000.h
@@ -74,7 +74,7 @@ class imi7000_bus_device : public device_t
{
public:
// construction/destruction
- imi7000_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ imi7000_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -91,7 +91,7 @@ class imi7000_slot_device : public device_t,
{
public:
// construction/destruction
- imi7000_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ imi7000_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/intv/ecs.cpp b/src/devices/bus/intv/ecs.cpp
index 5585aa93650..f0e8540996e 100644
--- a/src/devices/bus/intv/ecs.cpp
+++ b/src/devices/bus/intv/ecs.cpp
@@ -27,7 +27,7 @@
const device_type INTV_ROM_ECS = &device_creator<intv_ecs_device>;
-intv_ecs_device::intv_ecs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intv_ecs_device::intv_ecs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: intv_rom_device(mconfig, INTV_ROM_ECS, "Intellivision ECS Expansion", tag, owner, clock, "intv_ecs", __FILE__),
m_snd(*this, "ay8914"),
m_subslot(*this, "subslot"),
diff --git a/src/devices/bus/intv/ecs.h b/src/devices/bus/intv/ecs.h
index 97d0c1e380c..e4d6867996e 100644
--- a/src/devices/bus/intv/ecs.h
+++ b/src/devices/bus/intv/ecs.h
@@ -15,7 +15,7 @@ class intv_ecs_device : public intv_rom_device
{
public:
// construction/destruction
- intv_ecs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intv_ecs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/intv/rom.cpp b/src/devices/bus/intv/rom.cpp
index 74b5664a6fc..a9f2d2cde82 100644
--- a/src/devices/bus/intv/rom.cpp
+++ b/src/devices/bus/intv/rom.cpp
@@ -23,29 +23,29 @@ const device_type INTV_ROM_GFACT = &device_creator<intv_gfact_device>;
const device_type INTV_ROM_WSMLB = &device_creator<intv_wsmlb_device>;
-intv_rom_device::intv_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+intv_rom_device::intv_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_intv_cart_interface( mconfig, *this )
{
}
-intv_rom_device::intv_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intv_rom_device::intv_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, INTV_ROM_STD, "Intellivision Standard Carts", tag, owner, clock, "intv_rom", __FILE__),
device_intv_cart_interface( mconfig, *this )
{
}
-intv_ram_device::intv_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intv_ram_device::intv_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: intv_rom_device(mconfig, INTV_ROM_RAM, "Intellivision Carts w/RAM", tag, owner, clock, "intv_ram", __FILE__)
{
}
-intv_gfact_device::intv_gfact_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intv_gfact_device::intv_gfact_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: intv_rom_device(mconfig, INTV_ROM_GFACT, "Intellivision Game Factory Cart", tag, owner, clock, "intv_gfact", __FILE__)
{
}
-intv_wsmlb_device::intv_wsmlb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intv_wsmlb_device::intv_wsmlb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: intv_rom_device(mconfig, INTV_ROM_WSMLB, "Intellivision World Series Baseball Cart", tag, owner, clock, "intv_wsmlb", __FILE__)
{
}
diff --git a/src/devices/bus/intv/rom.h b/src/devices/bus/intv/rom.h
index ec1b153071d..1db545b2678 100644
--- a/src/devices/bus/intv/rom.h
+++ b/src/devices/bus/intv/rom.h
@@ -13,8 +13,8 @@ class intv_rom_device : public device_t,
{
public:
// construction/destruction
- intv_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- intv_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intv_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ intv_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_rom04) override { return INTV_ROM16_READ(offset + 0x0400); }
@@ -44,7 +44,7 @@ class intv_ram_device : public intv_rom_device
{
public:
// construction/destruction
- intv_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intv_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_ram) override { return (int)m_ram[offset & (m_ram.size() - 1)]; }
@@ -57,7 +57,7 @@ class intv_gfact_device : public intv_rom_device
{
public:
// construction/destruction
- intv_gfact_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intv_gfact_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_ram) override { return (int)m_ram[offset & (m_ram.size() - 1)]; }
@@ -70,7 +70,7 @@ class intv_wsmlb_device : public intv_rom_device
{
public:
// construction/destruction
- intv_wsmlb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intv_wsmlb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
diff --git a/src/devices/bus/intv/slot.cpp b/src/devices/bus/intv/slot.cpp
index eb60f1af14b..63bc7da4944 100644
--- a/src/devices/bus/intv/slot.cpp
+++ b/src/devices/bus/intv/slot.cpp
@@ -116,7 +116,7 @@ device_intv_cart_interface::~device_intv_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_intv_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_intv_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -131,7 +131,7 @@ void device_intv_cart_interface::rom_alloc(UINT32 size, const char *tag)
// ram_alloc - alloc the space for the ram
//-------------------------------------------------
-void device_intv_cart_interface::ram_alloc(UINT32 size)
+void device_intv_cart_interface::ram_alloc(uint32_t size)
{
m_ram.resize(size);
}
@@ -144,7 +144,7 @@ void device_intv_cart_interface::ram_alloc(UINT32 size)
//-------------------------------------------------
// intv_cart_slot_device - constructor
//-------------------------------------------------
-intv_cart_slot_device::intv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+intv_cart_slot_device::intv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, INTV_CART_SLOT, "Intellivision Cartridge Slot", tag, owner, clock, "intv_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -235,18 +235,18 @@ static const char *intv_get_slot(int type)
image_init_result intv_cart_slot_device::load_fullpath()
{
- UINT8 temp;
- UINT8 num_segments;
- UINT8 start_seg;
- UINT8 end_seg;
+ uint8_t temp;
+ uint8_t num_segments;
+ uint8_t start_seg;
+ uint8_t end_seg;
- UINT32 current_address;
- UINT32 end_address;
+ uint32_t current_address;
+ uint32_t end_address;
- UINT8 high_byte;
- UINT8 low_byte;
+ uint8_t high_byte;
+ uint8_t low_byte;
- UINT8 *ROM;
+ uint8_t *ROM;
/* if it is in .rom format, we enter here */
if (is_filetype("rom"))
@@ -263,7 +263,7 @@ image_init_result intv_cart_slot_device::load_fullpath()
return image_init_result::FAIL;
m_cart->rom_alloc(0x20000, tag());
- ROM = (UINT8 *)m_cart->get_rom_base();
+ ROM = (uint8_t *)m_cart->get_rom_base();
for (int i = 0; i < num_segments; i++)
{
@@ -312,7 +312,7 @@ image_init_result intv_cart_slot_device::load_fullpath()
std::string extrainfo;
m_cart->rom_alloc(0x20000, tag());
- ROM = (UINT8 *)m_cart->get_rom_base();
+ ROM = (uint8_t *)m_cart->get_rom_base();
if (!hashfile_extrainfo(*this, extrainfo))
{
@@ -395,7 +395,7 @@ image_init_result intv_cart_slot_device::call_load()
return load_fullpath();
else
{
- UINT16 offset[] = { 0x400, 0x2000, 0x4000, 0x4800, 0x5000, 0x6000, 0x7000, 0x8000, 0x8800, 0x9000, 0xa000, 0xb000, 0xc000, 0xd000, 0xe000, 0xf000};
+ uint16_t offset[] = { 0x400, 0x2000, 0x4000, 0x4800, 0x5000, 0x6000, 0x7000, 0x8000, 0x8800, 0x9000, 0xa000, 0xb000, 0xc000, 0xd000, 0xe000, 0xf000};
const char* region_name[] = {"0400", "2000", "4000", "4800", "5000", "6000", "7000", "8000", "8800", "9000", "A000", "B000", "C000", "D000", "E000", "F000"};
const char *pcb_name = get_feature("slot");
bool extra_bank = false;
@@ -408,9 +408,9 @@ image_init_result intv_cart_slot_device::call_load()
if (m_type == INTV_WSMLB)
extra_bank = true;
- UINT32 size;
- UINT16 address;
- UINT8 *ROM, *region;
+ uint32_t size;
+ uint16_t address;
+ uint8_t *ROM, *region;
m_cart->rom_alloc(extra_bank ? 0x22000 : 0x20000, tag());
ROM = m_cart->get_rom_base();
@@ -452,8 +452,8 @@ std::string intv_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- UINT32 len = m_file->size();
- std::vector<UINT8> rom(len);
+ uint32_t len = m_file->size();
+ std::vector<uint8_t> rom(len);
int type = INTV_STD;
m_file->read(&rom[0], len);
diff --git a/src/devices/bus/intv/slot.h b/src/devices/bus/intv/slot.h
index 37434b4e83d..2c70ae88534 100644
--- a/src/devices/bus/intv/slot.h
+++ b/src/devices/bus/intv/slot.h
@@ -25,7 +25,7 @@ enum
#define INTV_ROM16_READ(addr) \
- (UINT16) (m_rom[(addr) << 1] | (m_rom[((addr) << 1) + 1] << 8))
+ (uint16_t) (m_rom[(addr) << 1] | (m_rom[((addr) << 1) + 1] << 8))
// ======================> device_intv_cart_interface
@@ -69,21 +69,21 @@ public:
virtual DECLARE_WRITE16_MEMBER(write_rome0) {}
virtual DECLARE_WRITE16_MEMBER(write_romf0) {}
- void rom_alloc(UINT32 size, const char *tag);
- void ram_alloc(UINT32 size);
- UINT8* get_rom_base() { return m_rom; }
- UINT8* get_ram_base() { return &m_ram[0]; }
- UINT32 get_rom_size() { return m_rom_size; }
- UINT32 get_ram_size() { return m_ram.size(); }
+ void rom_alloc(uint32_t size, const char *tag);
+ void ram_alloc(uint32_t size);
+ uint8_t* get_rom_base() { return m_rom; }
+ uint8_t* get_ram_base() { return &m_ram[0]; }
+ uint32_t get_rom_size() { return m_rom_size; }
+ uint32_t get_ram_size() { return m_ram.size(); }
void save_ram() { device().save_item(NAME(m_ram)); }
virtual void late_subslot_setup() {}
protected:
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT8> m_ram;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint8_t> m_ram;
};
@@ -95,7 +95,7 @@ class intv_cart_slot_device : public device_t,
{
public:
// construction/destruction
- intv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~intv_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/intv/voice.cpp b/src/devices/bus/intv/voice.cpp
index 08d0f7c8b10..9470e1314cf 100644
--- a/src/devices/bus/intv/voice.cpp
+++ b/src/devices/bus/intv/voice.cpp
@@ -21,7 +21,7 @@
const device_type INTV_ROM_VOICE = &device_creator<intv_voice_device>;
-intv_voice_device::intv_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intv_voice_device::intv_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: intv_rom_device(mconfig, INTV_ROM_VOICE, "Intellivision Intellivoice Expansion", tag, owner, clock, "intv_voice", __FILE__),
m_speech(*this, "sp0256_speech"),
m_subslot(*this, "subslot"),
diff --git a/src/devices/bus/intv/voice.h b/src/devices/bus/intv/voice.h
index 379a286ad12..133f16c62a6 100644
--- a/src/devices/bus/intv/voice.h
+++ b/src/devices/bus/intv/voice.h
@@ -14,7 +14,7 @@ class intv_voice_device : public intv_rom_device
{
public:
// construction/destruction
- intv_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intv_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/intv_ctrl/ctrl.cpp b/src/devices/bus/intv_ctrl/ctrl.cpp
index d322a22cb46..2c55e2093c0 100644
--- a/src/devices/bus/intv_ctrl/ctrl.cpp
+++ b/src/devices/bus/intv_ctrl/ctrl.cpp
@@ -50,7 +50,7 @@ device_intv_control_port_interface::~device_intv_control_port_interface()
// intv_control_port_device - constructor
//-------------------------------------------------
-intv_control_port_device::intv_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+intv_control_port_device::intv_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, INTV_CONTROL_PORT, "Mattel Intellivision control port", tag, owner, clock, "intv_control_port", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr)
{
@@ -76,9 +76,9 @@ void intv_control_port_device::device_start()
}
-UINT8 intv_control_port_device::read_ctrl()
+uint8_t intv_control_port_device::read_ctrl()
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_device)
data |= m_device->read_ctrl();
return data;
diff --git a/src/devices/bus/intv_ctrl/ctrl.h b/src/devices/bus/intv_ctrl/ctrl.h
index 8188d1e0b60..d22be155f62 100644
--- a/src/devices/bus/intv_ctrl/ctrl.h
+++ b/src/devices/bus/intv_ctrl/ctrl.h
@@ -29,7 +29,7 @@ public:
device_intv_control_port_interface(const machine_config &mconfig, device_t &device);
virtual ~device_intv_control_port_interface();
- virtual UINT8 read_ctrl() { return 0; };
+ virtual uint8_t read_ctrl() { return 0; };
protected:
intv_control_port_device *m_port;
@@ -42,11 +42,11 @@ class intv_control_port_device : public device_t,
{
public:
// construction/destruction
- intv_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intv_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~intv_control_port_device();
DECLARE_READ8_MEMBER( ctrl_r ) { return read_ctrl(); }
- UINT8 read_ctrl();
+ uint8_t read_ctrl();
protected:
// device-level overrides
diff --git a/src/devices/bus/intv_ctrl/ecs_ctrl.cpp b/src/devices/bus/intv_ctrl/ecs_ctrl.cpp
index dddd93093b8..0aa50e20e89 100644
--- a/src/devices/bus/intv_ctrl/ecs_ctrl.cpp
+++ b/src/devices/bus/intv_ctrl/ecs_ctrl.cpp
@@ -64,7 +64,7 @@ device_intvecs_control_port_interface::~device_intvecs_control_port_interface()
// intvecs_control_port_device - constructor
//-------------------------------------------------
-intvecs_control_port_device::intvecs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+intvecs_control_port_device::intvecs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, INTVECS_CONTROL_PORT, "Mattel Intellivision ECS control port (HACK)", tag, owner, clock, "intvecs_control_port", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr)
{
@@ -90,23 +90,23 @@ void intvecs_control_port_device::device_start()
}
-UINT8 intvecs_control_port_device::read_portA()
+uint8_t intvecs_control_port_device::read_portA()
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_device)
data |= m_device->read_portA();
return data;
}
-UINT8 intvecs_control_port_device::read_portB()
+uint8_t intvecs_control_port_device::read_portB()
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_device)
data |= m_device->read_portB();
return data;
}
-void intvecs_control_port_device::write_portA(UINT8 data)
+void intvecs_control_port_device::write_portA(uint8_t data)
{
if (m_device)
m_device->write_portA(data);
@@ -153,7 +153,7 @@ machine_config_constructor intvecs_ctrls_device::device_mconfig_additions() cons
return MACHINE_CONFIG_NAME( intvecs_ctrls );
}
-intvecs_ctrls_device::intvecs_ctrls_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+intvecs_ctrls_device::intvecs_ctrls_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ECS_CTRLS, "Mattel Intellivision ECS Hand Controller x2 (HACK)", tag, owner, clock, "intvecs_ctrls", __FILE__),
device_intvecs_control_port_interface(mconfig, *this),
m_hand1(*this, "port1"),
@@ -169,12 +169,12 @@ void intvecs_ctrls_device::device_reset()
{
}
-UINT8 intvecs_ctrls_device::read_portA()
+uint8_t intvecs_ctrls_device::read_portA()
{
return m_hand1->read_ctrl();
}
-UINT8 intvecs_ctrls_device::read_portB()
+uint8_t intvecs_ctrls_device::read_portB()
{
return m_hand2->read_ctrl();
}
@@ -279,7 +279,7 @@ ioport_constructor intvecs_keybd_device::device_input_ports() const
return INPUT_PORTS_NAME( intvecs_keybd );
}
-intvecs_keybd_device::intvecs_keybd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+intvecs_keybd_device::intvecs_keybd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ECS_KEYBD, "Mattel Intellivision ECS Keyboard", tag, owner, clock, "intvecs_keybd", __FILE__)
, device_intvecs_control_port_interface(mconfig, *this)
, m_keybd(*this, "ROW.%u", 0)
@@ -296,9 +296,9 @@ void intvecs_keybd_device::device_reset()
m_psg_portA = 0;
}
-UINT8 intvecs_keybd_device::read_portB()
+uint8_t intvecs_keybd_device::read_portB()
{
- UINT8 val = 0xff;
+ uint8_t val = 0xff;
// return correct result if more than one bit of 0xFE is set
for (int i = 0; i < 7; i++)
{
@@ -308,7 +308,7 @@ UINT8 intvecs_keybd_device::read_portB()
return val;
}
-void intvecs_keybd_device::write_portA(UINT8 data)
+void intvecs_keybd_device::write_portA(uint8_t data)
{
m_psg_portA = (~data) & 0xff;
}
@@ -412,7 +412,7 @@ ioport_constructor intvecs_synth_device::device_input_ports() const
}
-intvecs_synth_device::intvecs_synth_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+intvecs_synth_device::intvecs_synth_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ECS_SYNTH, "Mattel Intellivision ECS Synthetizer", tag, owner, clock, "intvecs_synth", __FILE__),
device_intvecs_control_port_interface(mconfig, *this),
m_synth(*this, "SYNTH.%u", 0)
@@ -429,9 +429,9 @@ void intvecs_synth_device::device_reset()
m_psg_portA = 0;
}
-UINT8 intvecs_synth_device::read_portB()
+uint8_t intvecs_synth_device::read_portB()
{
- UINT8 val = 0xff;
+ uint8_t val = 0xff;
// return correct result if more than one bit of 0xFE is set
for (int i = 0; i < 7; i++)
{
@@ -441,7 +441,7 @@ UINT8 intvecs_synth_device::read_portB()
return val;
}
-void intvecs_synth_device::write_portA(UINT8 data)
+void intvecs_synth_device::write_portA(uint8_t data)
{
m_psg_portA = (~data) & 0xff;
}
diff --git a/src/devices/bus/intv_ctrl/ecs_ctrl.h b/src/devices/bus/intv_ctrl/ecs_ctrl.h
index 136c7bfa9d9..61c70a529bd 100644
--- a/src/devices/bus/intv_ctrl/ecs_ctrl.h
+++ b/src/devices/bus/intv_ctrl/ecs_ctrl.h
@@ -31,9 +31,9 @@ public:
device_intvecs_control_port_interface(const machine_config &mconfig, device_t &device);
virtual ~device_intvecs_control_port_interface();
- virtual UINT8 read_portA() { return 0xff; };
- virtual UINT8 read_portB() { return 0xff; };
- virtual void write_portA(UINT8 data) { };
+ virtual uint8_t read_portA() { return 0xff; };
+ virtual uint8_t read_portB() { return 0xff; };
+ virtual void write_portA(uint8_t data) { };
protected:
intvecs_control_port_device *m_port;
@@ -46,7 +46,7 @@ class intvecs_control_port_device : public device_t,
{
public:
// construction/destruction
- intvecs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intvecs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~intvecs_control_port_device();
DECLARE_READ8_MEMBER( portA_r ) { return read_portA(); }
@@ -56,9 +56,9 @@ public:
protected:
// device-level overrides
virtual void device_start() override;
- UINT8 read_portA();
- UINT8 read_portB();
- void write_portA(UINT8 data);
+ uint8_t read_portA();
+ uint8_t read_portB();
+ void write_portA(uint8_t data);
device_intvecs_control_port_interface *m_device;
};
@@ -92,7 +92,7 @@ class intvecs_ctrls_device : public device_t,
{
public:
// construction/destruction
- intvecs_ctrls_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intvecs_ctrls_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -102,8 +102,8 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_portA() override;
- virtual UINT8 read_portB() override;
+ virtual uint8_t read_portA() override;
+ virtual uint8_t read_portB() override;
private:
required_device<intv_control_port_device> m_hand1;
@@ -117,7 +117,7 @@ class intvecs_keybd_device : public device_t,
{
public:
// construction/destruction
- intvecs_keybd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intvecs_keybd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -127,11 +127,11 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_portB() override;
- virtual void write_portA(UINT8 data) override;
+ virtual uint8_t read_portB() override;
+ virtual void write_portA(uint8_t data) override;
private:
- UINT8 m_psg_portA;
+ uint8_t m_psg_portA;
required_ioport_array<7> m_keybd;
};
@@ -142,7 +142,7 @@ class intvecs_synth_device : public device_t,
{
public:
// construction/destruction
- intvecs_synth_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intvecs_synth_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -152,11 +152,11 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_portB() override;
- virtual void write_portA(UINT8 data) override;
+ virtual uint8_t read_portB() override;
+ virtual void write_portA(uint8_t data) override;
private:
- UINT8 m_psg_portA;
+ uint8_t m_psg_portA;
required_ioport_array<7> m_synth;
};
diff --git a/src/devices/bus/intv_ctrl/handctrl.cpp b/src/devices/bus/intv_ctrl/handctrl.cpp
index 07154829d51..b1ccafdca4f 100644
--- a/src/devices/bus/intv_ctrl/handctrl.cpp
+++ b/src/devices/bus/intv_ctrl/handctrl.cpp
@@ -85,7 +85,7 @@ ioport_constructor intv_handctrl_device::device_input_ports() const
// intv_handctrl_device - constructor
//-------------------------------------------------
-intv_handctrl_device::intv_handctrl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+intv_handctrl_device::intv_handctrl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, INTV_HANDCTRL, "Mattel Intellivision Hand Controller", tag, owner, clock, "intv_hand", __FILE__),
device_intv_control_port_interface(mconfig, *this),
m_cfg(*this, "OPTIONS"),
@@ -119,21 +119,21 @@ void intv_handctrl_device::device_reset()
// read_ctrl
//-------------------------------------------------
-UINT8 intv_handctrl_device::read_ctrl()
+uint8_t intv_handctrl_device::read_ctrl()
{
- static const UINT8 keypad_table[] =
+ static const uint8_t keypad_table[] =
{
0xff, 0x3f, 0x9f, 0x5f, 0xd7, 0xb7, 0x77, 0xdb,
0xbb, 0x7b, 0xdd, 0xbd, 0x7d, 0xde, 0xbe, 0x7e
};
- static const UINT8 disc_table[] =
+ static const uint8_t disc_table[] =
{
0xf3, 0xe3, 0xe7, 0xf7, 0xf6, 0xe6, 0xee, 0xfe,
0xfc, 0xec, 0xed, 0xfd, 0xf9, 0xe9, 0xeb, 0xfb
};
- static const UINT8 discyx_table[5][5] =
+ static const uint8_t discyx_table[5][5] =
{
{ 0xe3, 0xf3, 0xfb, 0xeb, 0xe9 },
{ 0xe7, 0xe3, 0xfb, 0xe9, 0xf9 },
@@ -143,7 +143,7 @@ UINT8 intv_handctrl_device::read_ctrl()
};
int x, y;
- UINT8 res = 0xff;
+ uint8_t res = 0xff;
/* keypad */
x = m_keypad->read();
diff --git a/src/devices/bus/intv_ctrl/handctrl.h b/src/devices/bus/intv_ctrl/handctrl.h
index 90c02d74793..e19921acb85 100644
--- a/src/devices/bus/intv_ctrl/handctrl.h
+++ b/src/devices/bus/intv_ctrl/handctrl.h
@@ -26,7 +26,7 @@ class intv_handctrl_device : public device_t,
{
public:
// construction/destruction
- intv_handctrl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ intv_handctrl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,7 +37,7 @@ protected:
virtual void device_reset() override;
// device_intv_control_port_interface overrides
- virtual UINT8 read_ctrl() override;
+ virtual uint8_t read_ctrl() override;
private:
required_ioport m_cfg;
diff --git a/src/devices/bus/iq151/disc2.cpp b/src/devices/bus/iq151/disc2.cpp
index 73690188954..d4eb9cb2139 100644
--- a/src/devices/bus/iq151/disc2.cpp
+++ b/src/devices/bus/iq151/disc2.cpp
@@ -48,7 +48,7 @@ const device_type IQ151_DISC2 = &device_creator<iq151_disc2_device>;
// iq151_disc2_device - constructor
//-------------------------------------------------
-iq151_disc2_device::iq151_disc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_disc2_device::iq151_disc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, IQ151_DISC2, "IQ151 Disc2", tag, owner, clock, "iq151_disc2", __FILE__),
device_iq151cart_interface( mconfig, *this ),
m_fdc(*this, "fdc"), m_rom(nullptr), m_rom_enabled(false)
@@ -61,7 +61,7 @@ iq151_disc2_device::iq151_disc2_device(const machine_config &mconfig, const char
void iq151_disc2_device::device_start()
{
- m_rom = (UINT8*)memregion("disc2")->base();
+ m_rom = (uint8_t*)memregion("disc2")->base();
}
//-------------------------------------------------
@@ -96,7 +96,7 @@ const tiny_rom_entry *iq151_disc2_device::device_rom_region() const
// read
//-------------------------------------------------
-void iq151_disc2_device::read(offs_t offset, UINT8 &data)
+void iq151_disc2_device::read(offs_t offset, uint8_t &data)
{
// interal ROM is mapped at 0xe000-0xe7ff
if (offset >= 0xe000 && offset < 0xe800 && m_rom_enabled)
@@ -108,7 +108,7 @@ void iq151_disc2_device::read(offs_t offset, UINT8 &data)
// IO read
//-------------------------------------------------
-void iq151_disc2_device::io_read(offs_t offset, UINT8 &data)
+void iq151_disc2_device::io_read(offs_t offset, uint8_t &data)
{
/* This is gross */
address_space *space = nullptr;
@@ -122,7 +122,7 @@ void iq151_disc2_device::io_read(offs_t offset, UINT8 &data)
// IO write
//-------------------------------------------------
-void iq151_disc2_device::io_write(offs_t offset, UINT8 data)
+void iq151_disc2_device::io_write(offs_t offset, uint8_t data)
{
address_space *space = nullptr;
if (offset == 0xab)
diff --git a/src/devices/bus/iq151/disc2.h b/src/devices/bus/iq151/disc2.h
index c4bffaa4333..f5f97698571 100644
--- a/src/devices/bus/iq151/disc2.h
+++ b/src/devices/bus/iq151/disc2.h
@@ -21,7 +21,7 @@ class iq151_disc2_device :
{
public:
// construction/destruction
- iq151_disc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_disc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -35,14 +35,14 @@ protected:
virtual void device_reset() override;
// iq151cart_interface overrides
- virtual void read(offs_t offset, UINT8 &data) override;
- virtual void io_read(offs_t offset, UINT8 &data) override;
- virtual void io_write(offs_t offset, UINT8 data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
+ virtual void io_read(offs_t offset, uint8_t &data) override;
+ virtual void io_write(offs_t offset, uint8_t data) override;
private:
required_device<upd765a_device> m_fdc;
- UINT8 * m_rom;
+ uint8_t * m_rom;
bool m_rom_enabled;
};
diff --git a/src/devices/bus/iq151/grafik.cpp b/src/devices/bus/iq151/grafik.cpp
index 4d4a5f93bef..5e8793bb432 100644
--- a/src/devices/bus/iq151/grafik.cpp
+++ b/src/devices/bus/iq151/grafik.cpp
@@ -37,7 +37,7 @@ const device_type IQ151_GRAFIK = &device_creator<iq151_grafik_device>;
// iq151_grafik_device - constructor
//-------------------------------------------------
-iq151_grafik_device::iq151_grafik_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_grafik_device::iq151_grafik_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, IQ151_GRAFIK, "IQ151 grafik", tag, owner, clock, "iq151_grafik", __FILE__),
device_iq151cart_interface( mconfig, *this ),
m_ppi8255(*this, "ppi8255"), m_posx(0), m_posy(0), m_all(0), m_pen(0), m_fast(0), m_ev(0), m_ex(0), m_sel(0)
@@ -119,7 +119,7 @@ WRITE8_MEMBER(iq151_grafik_device::control_w)
// IO read
//-------------------------------------------------
-void iq151_grafik_device::io_read(offs_t offset, UINT8 &data)
+void iq151_grafik_device::io_read(offs_t offset, uint8_t &data)
{
if (offset >= 0xd0 && offset < 0xd4)
{
@@ -139,7 +139,7 @@ void iq151_grafik_device::io_read(offs_t offset, UINT8 &data)
// IO write
//-------------------------------------------------
-void iq151_grafik_device::io_write(offs_t offset, UINT8 data)
+void iq151_grafik_device::io_write(offs_t offset, uint8_t data)
{
if (offset >= 0xd0 && offset < 0xd4)
{
diff --git a/src/devices/bus/iq151/grafik.h b/src/devices/bus/iq151/grafik.h
index 47a6287ec91..7f1ab66a5ef 100644
--- a/src/devices/bus/iq151/grafik.h
+++ b/src/devices/bus/iq151/grafik.h
@@ -21,7 +21,7 @@ class iq151_grafik_device :
{
public:
// construction/destruction
- iq151_grafik_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_grafik_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -37,23 +37,23 @@ protected:
virtual void device_reset() override;
// iq151cart_interface overrides
- virtual void io_read(offs_t offset, UINT8 &data) override;
- virtual void io_write(offs_t offset, UINT8 data) override;
+ virtual void io_read(offs_t offset, uint8_t &data) override;
+ virtual void io_write(offs_t offset, uint8_t data) override;
virtual void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect) override;
private:
required_device<i8255_device> m_ppi8255;
- UINT8 m_posx; // horizontal position
- UINT8 m_posy; // vertical position
- UINT8 m_all; // 0: bit mode 1: byte mode
- UINT8 m_pen;
- UINT8 m_fast;
- UINT8 m_ev; // enable video out
- UINT8 m_ex;
- UINT8 m_sel; // enable vram access
- UINT8 m_videoram[0x4000];
+ uint8_t m_posx; // horizontal position
+ uint8_t m_posy; // vertical position
+ uint8_t m_all; // 0: bit mode 1: byte mode
+ uint8_t m_pen;
+ uint8_t m_fast;
+ uint8_t m_ev; // enable video out
+ uint8_t m_ex;
+ uint8_t m_sel; // enable vram access
+ uint8_t m_videoram[0x4000];
};
diff --git a/src/devices/bus/iq151/iq151.cpp b/src/devices/bus/iq151/iq151.cpp
index 9b4e4f0b107..2c478eeb8cf 100644
--- a/src/devices/bus/iq151/iq151.cpp
+++ b/src/devices/bus/iq151/iq151.cpp
@@ -52,7 +52,7 @@ device_iq151cart_interface::~device_iq151cart_interface()
//-------------------------------------------------
// iq151cart_slot_device - constructor
//-------------------------------------------------
-iq151cart_slot_device::iq151cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+iq151cart_slot_device::iq151cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, IQ151CART_SLOT, "IQ151 cartridge slot", tag, owner, clock, "iq151cart_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this),
@@ -109,7 +109,7 @@ void iq151cart_slot_device::device_config_complete()
read
-------------------------------------------------*/
-void iq151cart_slot_device::read(offs_t offset, UINT8 &data)
+void iq151cart_slot_device::read(offs_t offset, uint8_t &data)
{
if (m_cart)
m_cart->read(offset, data);
@@ -119,7 +119,7 @@ void iq151cart_slot_device::read(offs_t offset, UINT8 &data)
write
-------------------------------------------------*/
-void iq151cart_slot_device::write(offs_t offset, UINT8 data)
+void iq151cart_slot_device::write(offs_t offset, uint8_t data)
{
if (m_cart)
m_cart->write(offset, data);
@@ -129,7 +129,7 @@ void iq151cart_slot_device::write(offs_t offset, UINT8 data)
IO read
-------------------------------------------------*/
-void iq151cart_slot_device::io_read(offs_t offset, UINT8 &data)
+void iq151cart_slot_device::io_read(offs_t offset, uint8_t &data)
{
if (m_cart)
m_cart->io_read(offset, data);
@@ -140,7 +140,7 @@ void iq151cart_slot_device::io_read(offs_t offset, UINT8 &data)
IO write
-------------------------------------------------*/
-void iq151cart_slot_device::io_write(offs_t offset, UINT8 data)
+void iq151cart_slot_device::io_write(offs_t offset, uint8_t data)
{
if (m_cart)
m_cart->io_write(offset, data);
@@ -167,7 +167,7 @@ image_init_result iq151cart_slot_device::call_load()
if (m_cart)
{
offs_t read_length;
- UINT8 *cart_base = m_cart->get_cart_base();
+ uint8_t *cart_base = m_cart->get_cart_base();
if (cart_base != nullptr)
{
diff --git a/src/devices/bus/iq151/iq151.h b/src/devices/bus/iq151/iq151.h
index 684aa00b8fd..851263f30f8 100644
--- a/src/devices/bus/iq151/iq151.h
+++ b/src/devices/bus/iq151/iq151.h
@@ -61,11 +61,11 @@ public:
virtual ~device_iq151cart_interface();
// reading and writing
- virtual void read(offs_t offset, UINT8 &data) { }
- virtual void write(offs_t offset, UINT8 data) { }
- virtual void io_read(offs_t offset, UINT8 &data) { }
- virtual void io_write(offs_t offset, UINT8 data) { }
- virtual UINT8* get_cart_base() { return nullptr; }
+ virtual void read(offs_t offset, uint8_t &data) { }
+ virtual void write(offs_t offset, uint8_t data) { }
+ virtual void io_read(offs_t offset, uint8_t &data) { }
+ virtual void io_write(offs_t offset, uint8_t data) { }
+ virtual uint8_t* get_cart_base() { return nullptr; }
// video update
virtual void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect) { }
@@ -79,7 +79,7 @@ class iq151cart_slot_device : public device_t,
{
public:
// construction/destruction
- iq151cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~iq151cart_slot_device();
template<class _Object> static devcb_base &set_out_irq0_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq0_cb.set_callback(object); }
@@ -110,10 +110,10 @@ public:
virtual std::string get_default_card_software() override;
// reading and writing
- virtual void read(offs_t offset, UINT8 &data);
- virtual void write(offs_t offset, UINT8 data);
- virtual void io_read(offs_t offset, UINT8 &data);
- virtual void io_write(offs_t offset, UINT8 data);
+ virtual void read(offs_t offset, uint8_t &data);
+ virtual void write(offs_t offset, uint8_t data);
+ virtual void io_read(offs_t offset, uint8_t &data);
+ virtual void io_write(offs_t offset, uint8_t data);
virtual void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect);
devcb_write_line m_out_irq0_cb;
diff --git a/src/devices/bus/iq151/minigraf.cpp b/src/devices/bus/iq151/minigraf.cpp
index 82fc74ad523..be89a612a75 100644
--- a/src/devices/bus/iq151/minigraf.cpp
+++ b/src/devices/bus/iq151/minigraf.cpp
@@ -47,7 +47,7 @@ const device_type IQ151_MINIGRAF = &device_creator<iq151_minigraf_device>;
// iq151_minigraf_device - constructor
//-------------------------------------------------
-iq151_minigraf_device::iq151_minigraf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_minigraf_device::iq151_minigraf_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, IQ151_MINIGRAF, "IQ151 Minigraf", tag, owner, clock, "iq151_minigraf", __FILE__),
device_iq151cart_interface( mconfig, *this ), m_rom(nullptr), m_posx(0), m_posy(0), m_pen(0), m_control(0), m_paper(nullptr)
{
@@ -59,7 +59,7 @@ iq151_minigraf_device::iq151_minigraf_device(const machine_config &mconfig, cons
void iq151_minigraf_device::device_start()
{
- m_rom = (UINT8*)memregion("minigraf")->base();
+ m_rom = (uint8_t*)memregion("minigraf")->base();
// allocate a bitmap for represent the paper
m_paper = std::make_unique<bitmap_ind16>(PAPER_WIDTH, PAPER_HEIGHT);
@@ -103,7 +103,7 @@ const tiny_rom_entry *iq151_minigraf_device::device_rom_region() const
// read
//-------------------------------------------------
-void iq151_minigraf_device::read(offs_t offset, UINT8 &data)
+void iq151_minigraf_device::read(offs_t offset, uint8_t &data)
{
// interal ROM is mapped at 0xc000-0xc7ff
if (offset >= 0xc000 && offset < 0xc800)
@@ -114,7 +114,7 @@ void iq151_minigraf_device::read(offs_t offset, UINT8 &data)
// IO write
//-------------------------------------------------
-void iq151_minigraf_device::io_write(offs_t offset, UINT8 data)
+void iq151_minigraf_device::io_write(offs_t offset, uint8_t data)
{
if (offset >= 0xf0 && offset < 0xf4)
{
@@ -136,7 +136,7 @@ void iq151_minigraf_device::io_write(offs_t offset, UINT8 data)
// Aritma MINIGRAF 0507
//**************************************************************************
-inline int iq151_minigraf_device::get_direction(UINT8 old_val, UINT8 new_val)
+inline int iq151_minigraf_device::get_direction(uint8_t old_val, uint8_t new_val)
{
if (new_val == 0 && old_val == 7) return +1;
if (new_val == 7 && old_val == 0) return -1;
@@ -144,7 +144,7 @@ inline int iq151_minigraf_device::get_direction(UINT8 old_val, UINT8 new_val)
return (new_val - old_val);
}
-void iq151_minigraf_device::plotter_update(UINT8 control)
+void iq151_minigraf_device::plotter_update(uint8_t control)
{
// update pen and paper positions
m_posy += get_direction(m_control & 7, control & 7);
@@ -154,10 +154,10 @@ void iq151_minigraf_device::plotter_update(UINT8 control)
m_pen = BIT(control, 7);
// clamp within range
- m_posx = std::max<INT16>(m_posx, 0);
- m_posx = std::min<INT16>(m_posx, PAPER_MAX_X);
- m_posy = std::max<INT16>(m_posy, 0);
- m_posy = std::min<INT16>(m_posy, PAPER_MAX_Y);
+ m_posx = std::max<int16_t>(m_posx, 0);
+ m_posx = std::min<int16_t>(m_posx, PAPER_MAX_X);
+ m_posy = std::max<int16_t>(m_posy, 0);
+ m_posy = std::min<int16_t>(m_posy, PAPER_MAX_Y);
// if pen is down draws a point
if (m_pen)
diff --git a/src/devices/bus/iq151/minigraf.h b/src/devices/bus/iq151/minigraf.h
index a4e382b8b43..ab70a07ad3c 100644
--- a/src/devices/bus/iq151/minigraf.h
+++ b/src/devices/bus/iq151/minigraf.h
@@ -20,7 +20,7 @@ class iq151_minigraf_device :
{
public:
// construction/destruction
- iq151_minigraf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_minigraf_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -31,20 +31,20 @@ protected:
virtual void device_stop() override;
// iq151cart_interface overrides
- virtual void read(offs_t offset, UINT8 &data) override;
- virtual void io_write(offs_t offset, UINT8 data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
+ virtual void io_write(offs_t offset, uint8_t data) override;
// Aritma MINIGRAF 0507
- void plotter_update(UINT8 control);
- int get_direction(UINT8 old_val, UINT8 new_val);
+ void plotter_update(uint8_t control);
+ int get_direction(uint8_t old_val, uint8_t new_val);
private:
- UINT8 * m_rom;
- INT16 m_posx;
- INT16 m_posy;
- UINT8 m_pen;
- UINT8 m_control;
+ uint8_t * m_rom;
+ int16_t m_posx;
+ int16_t m_posy;
+ uint8_t m_pen;
+ uint8_t m_control;
std::unique_ptr<bitmap_ind16> m_paper;
};
diff --git a/src/devices/bus/iq151/ms151a.cpp b/src/devices/bus/iq151/ms151a.cpp
index 4961fd61335..f9a35fc7a51 100644
--- a/src/devices/bus/iq151/ms151a.cpp
+++ b/src/devices/bus/iq151/ms151a.cpp
@@ -46,7 +46,7 @@ const device_type IQ151_MS151A = &device_creator<iq151_ms151a_device>;
// iq151_ms151a_device - constructor
//-------------------------------------------------
-iq151_ms151a_device::iq151_ms151a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_ms151a_device::iq151_ms151a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, IQ151_MS151A, "IQ151 MS151A", tag, owner, clock, "iq151_ms151a", __FILE__),
device_iq151cart_interface( mconfig, *this ), m_rom(nullptr), m_posx(0), m_posy(0), m_pen(0), m_paper(nullptr)
{
@@ -58,7 +58,7 @@ iq151_ms151a_device::iq151_ms151a_device(const machine_config &mconfig, const ch
void iq151_ms151a_device::device_start()
{
- m_rom = (UINT8*)memregion("ms151a")->base();
+ m_rom = (uint8_t*)memregion("ms151a")->base();
// allocate a bitmap for represent the paper
m_paper = std::make_unique<bitmap_ind16>(PAPER_WIDTH, PAPER_HEIGHT);
@@ -102,7 +102,7 @@ const tiny_rom_entry *iq151_ms151a_device::device_rom_region() const
// read
//-------------------------------------------------
-void iq151_ms151a_device::read(offs_t offset, UINT8 &data)
+void iq151_ms151a_device::read(offs_t offset, uint8_t &data)
{
// interal ROM is mapped at 0xc000-0xc7ff
if (offset >= 0xc000 && offset < 0xc800)
@@ -113,7 +113,7 @@ void iq151_ms151a_device::read(offs_t offset, UINT8 &data)
// IO read
//-------------------------------------------------
-void iq151_ms151a_device::io_read(offs_t offset, UINT8 &data)
+void iq151_ms151a_device::io_read(offs_t offset, uint8_t &data)
{
if (offset == 0xc4)
data = plotter_status();
@@ -123,7 +123,7 @@ void iq151_ms151a_device::io_read(offs_t offset, UINT8 &data)
// IO write
//-------------------------------------------------
-void iq151_ms151a_device::io_write(offs_t offset, UINT8 data)
+void iq151_ms151a_device::io_write(offs_t offset, uint8_t data)
{
if (offset >= 0xc0 && offset <= 0xc4)
plotter_update(offset - 0xc0, data);
@@ -134,7 +134,7 @@ void iq151_ms151a_device::io_write(offs_t offset, UINT8 data)
// XY 4130/4131
//**************************************************************************
-UINT8 iq151_ms151a_device::plotter_status()
+uint8_t iq151_ms151a_device::plotter_status()
{
/*
bit 7 - plotter READY line
@@ -143,7 +143,7 @@ UINT8 iq151_ms151a_device::plotter_status()
return 0x80;
}
-void iq151_ms151a_device::plotter_update(UINT8 offset, UINT8 data)
+void iq151_ms151a_device::plotter_update(uint8_t offset, uint8_t data)
{
// update pen and paper positions
switch (offset)
diff --git a/src/devices/bus/iq151/ms151a.h b/src/devices/bus/iq151/ms151a.h
index 56a6f39f0ef..1b090f5c093 100644
--- a/src/devices/bus/iq151/ms151a.h
+++ b/src/devices/bus/iq151/ms151a.h
@@ -20,7 +20,7 @@ class iq151_ms151a_device :
{
public:
// construction/destruction
- iq151_ms151a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_ms151a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -31,20 +31,20 @@ protected:
virtual void device_stop() override;
// iq151cart_interface overrides
- virtual void read(offs_t offset, UINT8 &data) override;
- virtual void io_read(offs_t offset, UINT8 &data) override;
- virtual void io_write(offs_t offset, UINT8 data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
+ virtual void io_read(offs_t offset, uint8_t &data) override;
+ virtual void io_write(offs_t offset, uint8_t data) override;
// XY 4130/4131
- UINT8 plotter_status();
- void plotter_update(UINT8 offset, UINT8 data);
+ uint8_t plotter_status();
+ void plotter_update(uint8_t offset, uint8_t data);
private:
- UINT8 * m_rom;
- INT32 m_posx;
- INT32 m_posy;
- UINT8 m_pen;
+ uint8_t * m_rom;
+ int32_t m_posx;
+ int32_t m_posy;
+ uint8_t m_pen;
std::unique_ptr<bitmap_ind16> m_paper;
};
diff --git a/src/devices/bus/iq151/rom.cpp b/src/devices/bus/iq151/rom.cpp
index 3079b731820..8a2f1816433 100644
--- a/src/devices/bus/iq151/rom.cpp
+++ b/src/devices/bus/iq151/rom.cpp
@@ -41,7 +41,7 @@ const device_type IQ151_AMOS3 = &device_creator<iq151_amos3_device>;
// iq151_rom_device - constructor
//-------------------------------------------------
-iq151_rom_device::iq151_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+iq151_rom_device::iq151_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_iq151cart_interface(mconfig, *this), m_rom(nullptr)
{
@@ -53,7 +53,7 @@ iq151_rom_device::iq151_rom_device(const machine_config &mconfig, device_type ty
void iq151_rom_device::device_start()
{
- m_rom = (UINT8*)memregion("rom")->base();
+ m_rom = (uint8_t*)memregion("rom")->base();
}
//-------------------------------------------------
@@ -69,7 +69,7 @@ const tiny_rom_entry *iq151_rom_device::device_rom_region() const
get_cart_base
-------------------------------------------------*/
-UINT8* iq151_rom_device::get_cart_base()
+uint8_t* iq151_rom_device::get_cart_base()
{
return m_rom;
}
@@ -83,7 +83,7 @@ UINT8* iq151_rom_device::get_cart_base()
// iq151_basic6_device - constructor
//-------------------------------------------------
-iq151_basic6_device::iq151_basic6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_basic6_device::iq151_basic6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: iq151_rom_device(mconfig, IQ151_BASIC6, "IQ151 BASIC6", tag, owner, clock, "iq151_basic6", __FILE__)
{
}
@@ -93,7 +93,7 @@ iq151_basic6_device::iq151_basic6_device(const machine_config &mconfig, const ch
// read
//-------------------------------------------------
-void iq151_basic6_device::read(offs_t offset, UINT8 &data)
+void iq151_basic6_device::read(offs_t offset, uint8_t &data)
{
if (offset >= 0xc800 && offset < 0xe800)
data = m_rom[offset - 0xc800];
@@ -108,7 +108,7 @@ void iq151_basic6_device::read(offs_t offset, UINT8 &data)
// iq151_basicg_device - constructor
//-------------------------------------------------
-iq151_basicg_device::iq151_basicg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_basicg_device::iq151_basicg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: iq151_rom_device(mconfig, IQ151_BASICG, "IQ151 BASICG", tag, owner, clock, "iq151_basicg", __FILE__)
{
}
@@ -117,7 +117,7 @@ iq151_basicg_device::iq151_basicg_device(const machine_config &mconfig, const ch
read
-------------------------------------------------*/
-void iq151_basicg_device::read(offs_t offset, UINT8 &data)
+void iq151_basicg_device::read(offs_t offset, uint8_t &data)
{
if (offset >= 0xb000 && offset < 0xc000)
data = m_rom[offset & 0x0fff];
@@ -134,7 +134,7 @@ void iq151_basicg_device::read(offs_t offset, UINT8 &data)
// iq151_amos1_device - constructor
//-------------------------------------------------
-iq151_amos1_device::iq151_amos1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_amos1_device::iq151_amos1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: iq151_rom_device(mconfig, IQ151_AMOS1, "IQ151 AMOS cart 1", tag, owner, clock, "iq151_amos1", __FILE__),
m_active(true)
{
@@ -144,7 +144,7 @@ iq151_amos1_device::iq151_amos1_device(const machine_config &mconfig, const char
read
-------------------------------------------------*/
-void iq151_amos1_device::read(offs_t offset, UINT8 &data)
+void iq151_amos1_device::read(offs_t offset, uint8_t &data)
{
if (offset >= 0x8000 && offset < 0xc000 && m_active)
data = m_rom[offset & 0x3fff];
@@ -154,7 +154,7 @@ void iq151_amos1_device::read(offs_t offset, UINT8 &data)
IO write
-------------------------------------------------*/
-void iq151_amos1_device::io_write(offs_t offset, UINT8 data)
+void iq151_amos1_device::io_write(offs_t offset, uint8_t data)
{
if (offset >= 0xec && offset < 0xf0)
m_active = data == 0x00;
@@ -168,7 +168,7 @@ void iq151_amos1_device::io_write(offs_t offset, UINT8 data)
// iq151_amos2_device - constructor
//-------------------------------------------------
-iq151_amos2_device::iq151_amos2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_amos2_device::iq151_amos2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: iq151_rom_device(mconfig, IQ151_AMOS2, "IQ151 AMOS cart 2", tag, owner, clock, "iq151_amos2", __FILE__),
m_active(false)
{
@@ -178,7 +178,7 @@ iq151_amos2_device::iq151_amos2_device(const machine_config &mconfig, const char
read
-------------------------------------------------*/
-void iq151_amos2_device::read(offs_t offset, UINT8 &data)
+void iq151_amos2_device::read(offs_t offset, uint8_t &data)
{
if (offset >= 0x8000 && offset < 0xc000 && m_active)
data = m_rom[offset & 0x3fff];
@@ -188,7 +188,7 @@ void iq151_amos2_device::read(offs_t offset, UINT8 &data)
IO write
-------------------------------------------------*/
-void iq151_amos2_device::io_write(offs_t offset, UINT8 data)
+void iq151_amos2_device::io_write(offs_t offset, uint8_t data)
{
if (offset >= 0xec && offset < 0xf0)
m_active = data == 0x01;
@@ -202,7 +202,7 @@ void iq151_amos2_device::io_write(offs_t offset, UINT8 data)
// iq151_amos3_device - constructor
//-------------------------------------------------
-iq151_amos3_device::iq151_amos3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_amos3_device::iq151_amos3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: iq151_rom_device(mconfig, IQ151_AMOS3, "IQ151 AMOS cart 3", tag, owner, clock, "iq151_amos3", __FILE__),
m_active(true)
{
@@ -212,7 +212,7 @@ iq151_amos3_device::iq151_amos3_device(const machine_config &mconfig, const char
read
-------------------------------------------------*/
-void iq151_amos3_device::read(offs_t offset, UINT8 &data)
+void iq151_amos3_device::read(offs_t offset, uint8_t &data)
{
if (offset >= 0x8000 && offset < 0xc000 && m_active)
data = m_rom[offset & 0x3fff];
@@ -222,7 +222,7 @@ void iq151_amos3_device::read(offs_t offset, UINT8 &data)
IO write
-------------------------------------------------*/
-void iq151_amos3_device::io_write(offs_t offset, UINT8 data)
+void iq151_amos3_device::io_write(offs_t offset, uint8_t data)
{
if (offset >= 0xec && offset < 0xf0)
m_active = data == 0x02;
diff --git a/src/devices/bus/iq151/rom.h b/src/devices/bus/iq151/rom.h
index 0c8b52fc136..bb9aac2676c 100644
--- a/src/devices/bus/iq151/rom.h
+++ b/src/devices/bus/iq151/rom.h
@@ -21,7 +21,7 @@ class iq151_rom_device :
{
public:
// construction/destruction
- iq151_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ iq151_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -31,9 +31,9 @@ protected:
virtual void device_start() override;
// iq151cart_interface overrides
- virtual UINT8* get_cart_base() override;
+ virtual uint8_t* get_cart_base() override;
- UINT8 * m_rom;
+ uint8_t * m_rom;
};
@@ -44,11 +44,11 @@ class iq151_basic6_device :
{
public:
// construction/destruction
- iq151_basic6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_basic6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// iq151cart_interface overrides
- virtual void read(offs_t offset, UINT8 &data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
};
// ======================> iq151_basicg_device
@@ -58,11 +58,11 @@ class iq151_basicg_device :
{
public:
// construction/destruction
- iq151_basicg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_basicg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// iq151cart_interface overrides
- virtual void read(offs_t offset, UINT8 &data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
};
@@ -73,12 +73,12 @@ class iq151_amos1_device :
{
public:
// construction/destruction
- iq151_amos1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_amos1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// iq151cart_interface overrides
- virtual void read(offs_t offset, UINT8 &data) override;
- virtual void io_write(offs_t offset, UINT8 data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
+ virtual void io_write(offs_t offset, uint8_t data) override;
bool m_active;
};
@@ -91,12 +91,12 @@ class iq151_amos2_device :
{
public:
// construction/destruction
- iq151_amos2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_amos2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// iq151cart_interface overrides
- virtual void read(offs_t offset, UINT8 &data) override;
- virtual void io_write(offs_t offset, UINT8 data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
+ virtual void io_write(offs_t offset, uint8_t data) override;
bool m_active;
};
@@ -109,12 +109,12 @@ class iq151_amos3_device :
{
public:
// construction/destruction
- iq151_amos3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_amos3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// iq151cart_interface overrides
- virtual void read(offs_t offset, UINT8 &data) override;
- virtual void io_write(offs_t offset, UINT8 data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
+ virtual void io_write(offs_t offset, uint8_t data) override;
bool m_active;
};
diff --git a/src/devices/bus/iq151/staper.cpp b/src/devices/bus/iq151/staper.cpp
index 9bd55c4d986..7e9225e4297 100644
--- a/src/devices/bus/iq151/staper.cpp
+++ b/src/devices/bus/iq151/staper.cpp
@@ -44,7 +44,7 @@ const device_type IQ151_STAPER = &device_creator<iq151_staper_device>;
// iq151_staper_device - constructor
//-------------------------------------------------
-iq151_staper_device::iq151_staper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_staper_device::iq151_staper_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, IQ151_STAPER, "IQ151 STAPER", tag, owner, clock, "iq151_staper", __FILE__),
device_iq151cart_interface( mconfig, *this ),
m_ppi(*this, "ppi8255"),
@@ -86,7 +86,7 @@ void iq151_staper_device::device_timer(emu_timer &timer, device_timer_id id, int
// IO read
//-------------------------------------------------
-void iq151_staper_device::io_read(offs_t offset, UINT8 &data)
+void iq151_staper_device::io_read(offs_t offset, uint8_t &data)
{
address_space& space = machine().device("maincpu")->memory().space(AS_IO);
@@ -98,7 +98,7 @@ void iq151_staper_device::io_read(offs_t offset, UINT8 &data)
// IO write
//-------------------------------------------------
-void iq151_staper_device::io_write(offs_t offset, UINT8 data)
+void iq151_staper_device::io_write(offs_t offset, uint8_t data)
{
address_space& space = machine().device("maincpu")->memory().space(AS_IO);
diff --git a/src/devices/bus/iq151/staper.h b/src/devices/bus/iq151/staper.h
index 426f87116f0..0579f075c3f 100644
--- a/src/devices/bus/iq151/staper.h
+++ b/src/devices/bus/iq151/staper.h
@@ -22,7 +22,7 @@ class iq151_staper_device :
{
public:
// construction/destruction
- iq151_staper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_staper_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -38,8 +38,8 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
// iq151cart_interface overrides
- virtual void io_read(offs_t offset, UINT8 &data) override;
- virtual void io_write(offs_t offset, UINT8 data) override;
+ virtual void io_read(offs_t offset, uint8_t &data) override;
+ virtual void io_write(offs_t offset, uint8_t data) override;
private:
@@ -49,7 +49,7 @@ private:
required_device<printer_image_device> m_printer;
emu_timer* m_printer_timer;
- UINT8 m_ppi_portc;
+ uint8_t m_ppi_portc;
};
diff --git a/src/devices/bus/iq151/video32.cpp b/src/devices/bus/iq151/video32.cpp
index f3d2657c520..09b245d1336 100644
--- a/src/devices/bus/iq151/video32.cpp
+++ b/src/devices/bus/iq151/video32.cpp
@@ -50,7 +50,7 @@ const device_type IQ151_VIDEO32 = &device_creator<iq151_video32_device>;
// iq151_video32_device - constructor
//-------------------------------------------------
-iq151_video32_device::iq151_video32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_video32_device::iq151_video32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, IQ151_VIDEO32, "IQ151 video32", tag, owner, clock, "iq151_video32", __FILE__),
device_gfx_interface(mconfig, *this, nullptr, "^^palette"),
device_iq151cart_interface( mconfig, *this ), m_videoram(nullptr), m_chargen(nullptr)
@@ -64,8 +64,8 @@ iq151_video32_device::iq151_video32_device(const machine_config &mconfig, const
void iq151_video32_device::device_start()
{
- m_videoram = (UINT8*)memregion("videoram")->base();
- m_chargen = (UINT8*)memregion("chargen")->base();
+ m_videoram = (uint8_t*)memregion("videoram")->base();
+ m_chargen = (uint8_t*)memregion("chargen")->base();
set_gfx(0, std::make_unique<gfx_element>(palette(), iq151_video32_charlayout, m_chargen, 0, 1, 0));
}
@@ -96,7 +96,7 @@ const tiny_rom_entry *iq151_video32_device::device_rom_region() const
// read
//-------------------------------------------------
-void iq151_video32_device::read(offs_t offset, UINT8 &data)
+void iq151_video32_device::read(offs_t offset, uint8_t &data)
{
// videoram is mapped at 0xec00-0xefff
if (offset >= 0xec00 && offset < 0xf000)
@@ -107,7 +107,7 @@ void iq151_video32_device::read(offs_t offset, UINT8 &data)
// write
//-------------------------------------------------
-void iq151_video32_device::write(offs_t offset, UINT8 data)
+void iq151_video32_device::write(offs_t offset, uint8_t data)
{
if (offset >= 0xec00 && offset < 0xf000)
m_videoram[offset & 0x3ff] = data;
@@ -119,18 +119,18 @@ void iq151_video32_device::write(offs_t offset, UINT8 data)
void iq151_video32_device::video_update(bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- UINT16 ma = 0, sy = 0;
+ uint16_t ma = 0, sy = 0;
for (int y = 0; y < 32; y++)
{
for (int ra = 0; ra < 8; ra++)
{
- UINT16 *p = &bitmap.pix16(sy++);
+ uint16_t *p = &bitmap.pix16(sy++);
for (int x = ma; x < ma + 32; x++)
{
- UINT8 chr = m_videoram[x] & 0x7f; // rom only has 128 characters
- UINT8 gfx = m_chargen[(chr<<3) | ra ];
+ uint8_t chr = m_videoram[x] & 0x7f; // rom only has 128 characters
+ uint8_t gfx = m_chargen[(chr<<3) | ra ];
// chars above 0x7f have colors inverted
if (m_videoram[x] > 0x7f)
diff --git a/src/devices/bus/iq151/video32.h b/src/devices/bus/iq151/video32.h
index 08833e21e9b..43b778c5f0e 100644
--- a/src/devices/bus/iq151/video32.h
+++ b/src/devices/bus/iq151/video32.h
@@ -21,7 +21,7 @@ class iq151_video32_device :
{
public:
// construction/destruction
- iq151_video32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_video32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -32,13 +32,13 @@ protected:
virtual void device_reset() override;
// iq151cart_interface overrides
- virtual void read(offs_t offset, UINT8 &data) override;
- virtual void write(offs_t offset, UINT8 data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
+ virtual void write(offs_t offset, uint8_t data) override;
virtual void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect) override;
private:
- UINT8 * m_videoram;
- UINT8 * m_chargen;
+ uint8_t * m_videoram;
+ uint8_t * m_chargen;
};
diff --git a/src/devices/bus/iq151/video64.cpp b/src/devices/bus/iq151/video64.cpp
index b46d7b4257e..cfa70c7d469 100644
--- a/src/devices/bus/iq151/video64.cpp
+++ b/src/devices/bus/iq151/video64.cpp
@@ -50,7 +50,7 @@ const device_type IQ151_VIDEO64 = &device_creator<iq151_video64_device>;
// iq151_video64_device - constructor
//-------------------------------------------------
-iq151_video64_device::iq151_video64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iq151_video64_device::iq151_video64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, IQ151_VIDEO64, "IQ151 video64", tag, owner, clock, "iq151_video64", __FILE__),
device_gfx_interface(mconfig, *this, nullptr, "^^palette"),
device_iq151cart_interface( mconfig, *this ), m_videoram(nullptr), m_chargen(nullptr)
@@ -63,8 +63,8 @@ iq151_video64_device::iq151_video64_device(const machine_config &mconfig, const
void iq151_video64_device::device_start()
{
- m_videoram = (UINT8*)memregion("videoram")->base();
- m_chargen = (UINT8*)memregion("chargen")->base();
+ m_videoram = (uint8_t*)memregion("videoram")->base();
+ m_chargen = (uint8_t*)memregion("chargen")->base();
set_gfx(0,std::make_unique<gfx_element>(palette(), iq151_video64_charlayout, m_chargen, 0, 1, 0));
}
@@ -95,7 +95,7 @@ const tiny_rom_entry *iq151_video64_device::device_rom_region() const
// read
//-------------------------------------------------
-void iq151_video64_device::read(offs_t offset, UINT8 &data)
+void iq151_video64_device::read(offs_t offset, uint8_t &data)
{
// videoram is mapped at 0xe800-0xefff
if (offset >= 0xe800 && offset < 0xf000)
@@ -106,7 +106,7 @@ void iq151_video64_device::read(offs_t offset, UINT8 &data)
// write
//-------------------------------------------------
-void iq151_video64_device::write(offs_t offset, UINT8 data)
+void iq151_video64_device::write(offs_t offset, uint8_t data)
{
if (offset >= 0xe800 && offset < 0xf000)
m_videoram[offset & 0x7ff] = data;
@@ -116,7 +116,7 @@ void iq151_video64_device::write(offs_t offset, UINT8 data)
// IO read
//-------------------------------------------------
-void iq151_video64_device::io_read(offs_t offset, UINT8 &data)
+void iq151_video64_device::io_read(offs_t offset, uint8_t &data)
{
if (offset >= 0xfc && offset < 0x100)
{
@@ -132,18 +132,18 @@ void iq151_video64_device::io_read(offs_t offset, UINT8 &data)
void iq151_video64_device::video_update(bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- UINT16 ma = 0, sy = 0;
+ uint16_t ma = 0, sy = 0;
for (int y = 0; y < 32; y++)
{
for (int ra = 0; ra < 8; ra++)
{
- UINT16 *p = &bitmap.pix16(sy++);
+ uint16_t *p = &bitmap.pix16(sy++);
for (int x = ma; x < ma + 64; x++)
{
- UINT8 chr = m_videoram[x];
- UINT8 gfx = m_chargen[(chr<<3) | ra ];
+ uint8_t chr = m_videoram[x];
+ uint8_t gfx = m_chargen[(chr<<3) | ra ];
/* Display a scanline of a character */
*p++ |= BIT(gfx, 5);
diff --git a/src/devices/bus/iq151/video64.h b/src/devices/bus/iq151/video64.h
index c1cc0f8f343..e9f0b2428ff 100644
--- a/src/devices/bus/iq151/video64.h
+++ b/src/devices/bus/iq151/video64.h
@@ -21,7 +21,7 @@ class iq151_video64_device :
{
public:
// construction/destruction
- iq151_video64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iq151_video64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -32,14 +32,14 @@ protected:
virtual void device_reset() override;
// iq151cart_interface overrides
- virtual void read(offs_t offset, UINT8 &data) override;
- virtual void write(offs_t offset, UINT8 data) override;
- virtual void io_read(offs_t offset, UINT8 &data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
+ virtual void write(offs_t offset, uint8_t data) override;
+ virtual void io_read(offs_t offset, uint8_t &data) override;
virtual void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect) override;
private:
- UINT8 * m_videoram;
- UINT8 * m_chargen;
+ uint8_t * m_videoram;
+ uint8_t * m_chargen;
};
diff --git a/src/devices/bus/isa/3c503.cpp b/src/devices/bus/isa/3c503.cpp
index e1f44cbe4d5..3bc90516cde 100644
--- a/src/devices/bus/isa/3c503.cpp
+++ b/src/devices/bus/isa/3c503.cpp
@@ -18,7 +18,7 @@ machine_config_constructor el2_3c503_device::device_mconfig_additions() const {
return MACHINE_CONFIG_NAME(el2_3c503_config);
}
-el2_3c503_device::el2_3c503_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock)
+el2_3c503_device::el2_3c503_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
: device_t(mconfig, EL2_3C503, "3C503 Network Adapter", tag, owner, clock, "el2_3c503", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_dp8390(*this, "dp8390d"),
@@ -28,7 +28,7 @@ el2_3c503_device::el2_3c503_device(const machine_config& mconfig, const char* ta
void el2_3c503_device::device_start() {
char mac[7];
- UINT32 num = rand();
+ uint32_t num = rand();
memset(m_prom, 0x57, 16);
sprintf(mac, "\x02\x60\x8c%c%c%c", (num >> 16) & 0xff, (num >> 8) & 0xff, num & 0xff);
memcpy(m_prom, mac, 6);
@@ -100,12 +100,12 @@ void el2_3c503_device::eop_w(int state) {
}
}
-UINT8 el2_3c503_device::dack_r(int line) {
+uint8_t el2_3c503_device::dack_r(int line) {
set_drq(CLEAR_LINE);
return el2_3c503_mem_read(m_regs.da++);
}
-void el2_3c503_device::dack_w(int line, UINT8 data) {
+void el2_3c503_device::dack_w(int line, uint8_t data) {
set_drq(CLEAR_LINE);
el2_3c503_mem_write(m_regs.da++, data);
}
@@ -295,12 +295,12 @@ WRITE8_MEMBER(el2_3c503_device::el2_3c503_mem_write) {
el2_3c503_mem_write(offset, data);
}
-UINT8 el2_3c503_device::el2_3c503_mem_read(offs_t offset) {
+uint8_t el2_3c503_device::el2_3c503_mem_read(offs_t offset) {
if((offset < 8*1024) || (offset >= 16*1024)) return 0xff;
return m_board_ram[offset - (8*1024)];
}
-void el2_3c503_device::el2_3c503_mem_write(offs_t offset, UINT8 data) {
+void el2_3c503_device::el2_3c503_mem_write(offs_t offset, uint8_t data) {
if((offset < 8*1024) || (offset >= 16*1024)) return;
m_board_ram[offset - (8*1024)] = data;
}
diff --git a/src/devices/bus/isa/3c503.h b/src/devices/bus/isa/3c503.h
index 5a31c2948fe..0db8d3da809 100644
--- a/src/devices/bus/isa/3c503.h
+++ b/src/devices/bus/isa/3c503.h
@@ -13,7 +13,7 @@ class el2_3c503_device: public device_t,
public device_isa8_card_interface
{
public:
- el2_3c503_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ el2_3c503_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
void el2_3c503_irq_w(int state);
@@ -24,38 +24,38 @@ public:
DECLARE_READ8_MEMBER(el2_3c503_hiport_r);
DECLARE_WRITE8_MEMBER(el2_3c503_hiport_w);
void eop_w(int state) override;
- UINT8 dack_r(int line) override;
- void dack_w(int line, UINT8 data) override;
+ uint8_t dack_r(int line) override;
+ void dack_w(int line, uint8_t data) override;
protected:
virtual void device_start() override;
virtual void device_reset() override;
private:
required_device<dp8390d_device> m_dp8390;
- UINT8 m_board_ram[8*1024];
- UINT8 m_rom[8*1024];
- UINT8 m_prom[32];
- UINT8 m_irq_state;
+ uint8_t m_board_ram[8*1024];
+ uint8_t m_rom[8*1024];
+ uint8_t m_prom[32];
+ uint8_t m_irq_state;
- UINT8 el2_3c503_mem_read(offs_t offset);
- void el2_3c503_mem_write(offs_t offset, UINT8 data);
+ uint8_t el2_3c503_mem_read(offs_t offset);
+ void el2_3c503_mem_write(offs_t offset, uint8_t data);
void set_irq(int state);
void set_drq(int state);
struct {
- UINT8 pstr;
- UINT8 pspr;
- UINT8 dqtr;
- UINT8 bcfr;
- UINT8 pcfr;
- UINT8 gacfr;
- UINT8 ctrl;
- UINT8 streg;
- UINT8 idcfr;
- UINT16 da;
- UINT32 vptr;
- UINT8 rfmsb;
- UINT8 rflsb;
+ uint8_t pstr;
+ uint8_t pspr;
+ uint8_t dqtr;
+ uint8_t bcfr;
+ uint8_t pcfr;
+ uint8_t gacfr;
+ uint8_t ctrl;
+ uint8_t streg;
+ uint8_t idcfr;
+ uint16_t da;
+ uint32_t vptr;
+ uint8_t rfmsb;
+ uint8_t rflsb;
} m_regs;
};
diff --git a/src/devices/bus/isa/3c505.cpp b/src/devices/bus/isa/3c505.cpp
index c878a540315..b50b341d82d 100644
--- a/src/devices/bus/isa/3c505.cpp
+++ b/src/devices/bus/isa/3c505.cpp
@@ -27,22 +27,22 @@ static int verbose = VERBOSE;
#define LOG2(d,x) { if (verbose > 1) LOG(d,x)}
#ifdef LSB_FIRST
-static UINT16 uint16_to_le(UINT16 value)
+static uint16_t uint16_to_le(uint16_t value)
{
return value;
}
-static UINT16 uint16_from_le(UINT16 value)
+static uint16_t uint16_from_le(uint16_t value)
{
return value;
}
#else
-static UINT16 uint16_to_le(UINT16 value)
+static uint16_t uint16_to_le(uint16_t value)
{
return ((value&0x00ff)<<8)|((value&0xff00)>>8);
}
-static UINT16 uint16_from_le(UINT16 value)
+static uint16_t uint16_from_le(uint16_t value)
{
return ((value&0x00ff)<<8)|((value&0xff00)>>8);
}
@@ -301,7 +301,7 @@ const device_type ISA16_3C505 = &device_creator<threecom3c505_device> ;
// threecom3c505_device - constructor
//-------------------------------------------------
-threecom3c505_device::threecom3c505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+threecom3c505_device::threecom3c505_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ISA16_3C505, "3Com 3C505 Network Adaptor", tag, owner, clock, "3c505", __FILE__),
device_network_interface(mconfig, *this, 10.0f),
device_isa16_card_interface(mconfig, *this),
@@ -311,7 +311,7 @@ threecom3c505_device::threecom3c505_device(const machine_config &mconfig, const
{
}
-threecom3c505_device::threecom3c505_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock)
+threecom3c505_device::threecom3c505_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, type, "3Com 3C505 Network Adaptor", tag, owner, clock, "3c505", __FILE__),
device_network_interface(mconfig, *this, 10.0f),
device_isa16_card_interface(mconfig, *this),
@@ -459,7 +459,7 @@ threecom3c505_device::data_buffer::data_buffer() :
{
}
-void threecom3c505_device::data_buffer::start(threecom3c505_device *device, INT32 size)
+void threecom3c505_device::data_buffer::start(threecom3c505_device *device, int32_t size)
{
m_device = device;
LOG2(device,("start threecom3c505_device::data_buffer with size %0x", size));
@@ -479,7 +479,7 @@ void threecom3c505_device::data_buffer::copy(data_buffer *db) const
memcpy(&db->m_data[0], &m_data[0], m_data.size());
}
-int threecom3c505_device::data_buffer::append(UINT8 data)
+int threecom3c505_device::data_buffer::append(uint8_t data)
{
if (m_length >= m_data.size())
{
@@ -522,7 +522,7 @@ threecom3c505_device::data_buffer_fifo::data_buffer_fifo() :
}
void threecom3c505_device::data_buffer_fifo::start(
- threecom3c505_device *device, INT32 size, INT32 db_size)
+ threecom3c505_device *device, int32_t size, int32_t db_size)
{
m_device = device;
LOG2(m_device,("start threecom3c505_device::data_buffer_fifo"));
@@ -552,9 +552,9 @@ threecom3c505_device::data_buffer_fifo::~data_buffer_fifo()
}
}
-int threecom3c505_device::data_buffer_fifo::put(const UINT8 data[], const int length)
+int threecom3c505_device::data_buffer_fifo::put(const uint8_t data[], const int length)
{
- UINT16 next_index = (m_put_index + 1) % m_size;
+ uint16_t next_index = (m_put_index + 1) % m_size;
LOG2(m_device,("threecom3c505_device::data_buffer_fifo::put %d", m_count));
@@ -832,7 +832,7 @@ void threecom3c505_device::do_receive_command()
m_response.data.rcv_resp.timetag = 0; // TODO: time tag
// compute and check no of bytes to be DMA'ed (must be even)
- UINT16 buf_len = uint16_from_le(m_response.data.rcv_resp.buf_len) & ~1;
+ uint16_t buf_len = uint16_from_le(m_response.data.rcv_resp.buf_len) & ~1;
if (m_rx_data_buffer.get_length() > buf_len)
{
LOG1(this,("do_receive_command !!! buffer size too small (%d < %d)", buf_len, m_rx_data_buffer.get_length()));
@@ -1027,7 +1027,7 @@ void threecom3c505_device::do_command()
break;
case CMD_DOWNLOAD_PROGRAM: // 0x0d
- UINT16 mc_version = m_program_buffer.get_word(1);
+ uint16_t mc_version = m_program_buffer.get_word(1);
switch (mc_version)
{
case APOLLO_MC_VERSION_SR10_2:
@@ -1060,13 +1060,13 @@ void threecom3c505_device::do_command()
ethernet_packet_is_for_me - check if ethernet address is for me
***************************************************************************/
-int threecom3c505_device::ethernet_packet_is_for_me(const UINT8 mac_address[])
+int threecom3c505_device::ethernet_packet_is_for_me(const uint8_t mac_address[])
{
// tcpdump -i eth0 -q ether host 08:00:1e:01:ae:a5 or ether broadcast or ether dst 09:00:1e:00:00:00 or ether dst 09:00:1e:00:00:01
// wireshark filter: eth.addr eq 08:00:1e:01:ae:a5 or eth.dst eq ff:ff:ff:ff:ff:ff or eth.dst eq 09:00:1e:00:00:00 or eth.dst eq 09:00:1e:00:00:01
int i;
- static const UINT8 broadcast_address[ETHERNET_ADDR_SIZE] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+ static const uint8_t broadcast_address[ETHERNET_ADDR_SIZE] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
// accept all packets if RECV_PROMISC is set
if (m_i82586_config & RECV_PROMISC)
@@ -1108,7 +1108,7 @@ int threecom3c505_device::ethernet_packet_is_for_me(const UINT8 mac_address[])
recv_cb - receive callback - receive and process an ethernet packet
***************************************************************************/
-void threecom3c505_device::recv_cb(UINT8 *data, int length)
+void threecom3c505_device::recv_cb(uint8_t *data, int length)
{
if (length < ETHERNET_ADDR_SIZE || !ethernet_packet_is_for_me(data))
{
@@ -1135,7 +1135,7 @@ void threecom3c505_device::recv_cb(UINT8 *data, int length)
write_command_port
***************************************************************************/
-void threecom3c505_device::write_command_port(UINT8 data)
+void threecom3c505_device::write_command_port(uint8_t data)
{
LOG2(this,("writing 3C505 command port %02x - m_status=%02x m_control=%02x m_command_index=%02x",
data, m_status, m_control, m_command_index));
@@ -1217,9 +1217,9 @@ void threecom3c505_device::write_command_port(UINT8 data)
read_command_port
***************************************************************************/
-UINT8 threecom3c505_device::read_command_port()
+uint8_t threecom3c505_device::read_command_port()
{
- UINT8 data;
+ uint8_t data;
// the interrupt request is cleared when the Command Register is read
set_interrupt(CLEAR_LINE);
@@ -1292,15 +1292,15 @@ UINT8 threecom3c505_device::read_command_port()
// see also http://www.edaboard.com/thread120700.html
{
// compute the Ethernet Frame Check Sequence
- static const UINT32 crc_table[] =
+ static const uint32_t crc_table[] =
{ 0x4DBDF21C, 0x500AE278, 0x76D3D2D4, 0x6B64C2B0,
0x3B61B38C, 0x26D6A3E8, 0x000F9344, 0x1DB88320,
0xA005713C, 0xBDB26158, 0x9B6B51F4, 0x86DC4190,
0xD6D930AC, 0xCB6E20C8, 0xEDB71064, 0xF0000000 };
- UINT32 n, crc = 0;
+ uint32_t n, crc = 0;
for (n = 0; n < m_tx_data_buffer.get_length(); n++)
{
- UINT8 data = m_tx_data_buffer.get(n);
+ uint8_t data = m_tx_data_buffer.get(n);
crc = (crc >> 4) ^ crc_table[(crc ^ (data >> 0)) & 0x0f]; /* lower nibble */
crc = (crc >> 4) ^ crc_table[(crc ^ (data >> 4)) & 0x0f]; /* upper nibble */
}
@@ -1350,7 +1350,7 @@ UINT8 threecom3c505_device::read_command_port()
write_data_port
***************************************************************************/
-void threecom3c505_device::write_data_port(UINT8 data)
+void threecom3c505_device::write_data_port(uint8_t data)
{
if (m_control & FLSH)
{
@@ -1460,12 +1460,12 @@ void threecom3c505_device::write_data_port(UINT8 data)
read_data_port
***************************************************************************/
-UINT8 threecom3c505_device::read_data_port()
+uint8_t threecom3c505_device::read_data_port()
{
- UINT8 data;
- UINT16 data_length = m_rx_data_buffer.get_length();
+ uint8_t data;
+ uint16_t data_length = m_rx_data_buffer.get_length();
// DomainOS will read words (i.e. even number of bytes); must handle packets with odd byte length
- UINT16 even_data_length = (data_length + 1) & ~1;
+ uint16_t even_data_length = (data_length + 1) & ~1;
if (m_rx_data_index < even_data_length)
{
@@ -1497,7 +1497,7 @@ UINT8 threecom3c505_device::read_data_port()
write_control_port
***************************************************************************/
-void threecom3c505_device::write_control_port(UINT8 data)
+void threecom3c505_device::write_control_port(uint8_t data)
{
switch (data & (ATTN | FLSH))
{
@@ -1587,9 +1587,9 @@ void threecom3c505_device::write_control_port(UINT8 data)
read_status_port
***************************************************************************/
-UINT8 threecom3c505_device::read_status_port()
+uint8_t threecom3c505_device::read_status_port()
{
- UINT8 data = m_status;
+ uint8_t data = m_status;
m_status &= ~ASF_PCB_MASK;
switch (data & ASF_PCB_MASK)
@@ -1640,13 +1640,13 @@ WRITE16_MEMBER(threecom3c505_device::write)
READ16_MEMBER(threecom3c505_device::read)
{
// data to omit excessive logging
- static UINT16 last_data = 0xff;
- static UINT32 last_pc = 0;
+ static uint16_t last_data = 0xff;
+ static uint32_t last_pc = 0;
// make byte offset
offset *= 2;
- UINT16 data = m_reg[offset & 0x0f];
+ uint16_t data = m_reg[offset & 0x0f];
switch (offset)
{
case PORT_COMMAND: /* 0x00 read/write, 8-bit */
@@ -1658,7 +1658,7 @@ READ16_MEMBER(threecom3c505_device::read)
// omit excessive logging
if (data == last_data)
{
- UINT32 pc = space.device().safe_pcbase();
+ uint32_t pc = space.device().safe_pcbase();
if (pc == last_pc)
{
return data;
@@ -1688,7 +1688,7 @@ void threecom3c505_device::set_verbose(int on_off)
verbose = on_off == 0 ? 0 : VERBOSE > 1 ? VERBOSE : 1;
}
-int threecom3c505_device::tx_data(device_t *device, const UINT8 data[], int length)
+int threecom3c505_device::tx_data(device_t *device, const uint8_t data[], int length)
{
LOG1(this,("threecom3c505_device::tx_data length=%d", length));
return 1;
diff --git a/src/devices/bus/isa/3c505.h b/src/devices/bus/isa/3c505.h
index 127dc41afb6..459db446bb5 100644
--- a/src/devices/bus/isa/3c505.h
+++ b/src/devices/bus/isa/3c505.h
@@ -30,59 +30,59 @@
struct Memconf
{
- UINT16 cmd_q, rcv_q, mcast, frame, rcv_b, progs;
+ uint16_t cmd_q, rcv_q, mcast, frame, rcv_b, progs;
};
struct Rcv_pkt
{
- UINT16 buf_ofs, buf_seg, buf_len, timeout;
+ uint16_t buf_ofs, buf_seg, buf_len, timeout;
};
struct Xmit_pkt
{
- UINT16 buf_ofs, buf_seg, pkt_len;
+ uint16_t buf_ofs, buf_seg, pkt_len;
};
struct Rcv_resp
{
- UINT16 buf_ofs, buf_seg, buf_len, pkt_len, timeout, status;
- UINT32 timetag;
+ uint16_t buf_ofs, buf_seg, buf_len, pkt_len, timeout, status;
+ uint32_t timetag;
};
struct Xmit_resp
{
- UINT16 buf_ofs, buf_seg, c_stat, status;
+ uint16_t buf_ofs, buf_seg, c_stat, status;
};
struct Netstat
{
- UINT32 tot_recv, tot_xmit;
- UINT16 err_CRC, err_align, err_res, err_ovrrun;
+ uint32_t tot_recv, tot_xmit;
+ uint16_t err_CRC, err_align, err_res, err_ovrrun;
};
struct Selftest
{
- UINT16 error;
+ uint16_t error;
union
{
- UINT16 ROM_cksum;
+ uint16_t ROM_cksum;
struct
{
- UINT16 ofs, seg;
+ uint16_t ofs, seg;
} RAM;
- UINT16 i82586;
+ uint16_t i82586;
} failure;
};
struct Info
{
- UINT8 minor_vers, major_vers;
- UINT16 ROM_cksum, RAM_sz, free_ofs, free_seg;
+ uint8_t minor_vers, major_vers;
+ uint16_t ROM_cksum, RAM_sz, free_ofs, free_seg;
};
struct Memdump
{
- UINT16 size, off, seg;
+ uint16_t size, off, seg;
};
/*
@@ -92,24 +92,24 @@ struct Memdump
*/
struct pcb_struct
{
- UINT8 command;
- UINT8 length;
+ uint8_t command;
+ uint8_t length;
union
{
struct Memconf memconf;
- UINT16 configure;
+ uint16_t configure;
struct Rcv_pkt rcv_pkt;
struct Xmit_pkt xmit_pkt;
- UINT8 multicast[10][6];
- UINT8 eth_addr[6];
- INT16 failed;
+ uint8_t multicast[10][6];
+ uint8_t eth_addr[6];
+ int16_t failed;
struct Rcv_resp rcv_resp;
struct Xmit_resp xmit_resp;
struct Netstat netstat;
struct Selftest selftest;
struct Info info;
struct Memdump memdump;
- UINT8 raw[62];
+ uint8_t raw[62];
} data;
};
@@ -123,8 +123,8 @@ class threecom3c505_device: public device_t,
{
public:
// construction/destruction
- threecom3c505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- threecom3c505_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock);
+ threecom3c505_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ threecom3c505_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
// device register I/O
virtual DECLARE_READ16_MEMBER(read);
@@ -136,10 +136,10 @@ public:
required_ioport m_irqdrq;
required_ioport m_romopts;
- virtual void recv_cb(UINT8 *data, int length) override;
+ virtual void recv_cb(uint8_t *data, int length) override;
protected:
- virtual int tx_data(device_t *, const UINT8 *, int);
+ virtual int tx_data(device_t *, const uint8_t *, int);
virtual int setfilter(device_t *, int);
const char *cpu_context();
@@ -164,16 +164,16 @@ private:
public:
data_buffer();
- void start(threecom3c505_device *device, INT32 size);
+ void start(threecom3c505_device *device, int32_t size);
void reset();
- int append(UINT8 data);
- UINT8 get(int i) { return m_data[i]; };
- UINT16 get_word(int i) { return (m_data[i*2+1] << 8) + m_data[i*2]; };
+ int append(uint8_t data);
+ uint8_t get(int i) { return m_data[i]; };
+ uint16_t get_word(int i) { return (m_data[i*2+1] << 8) + m_data[i*2]; };
int is_empty() {return m_length == 0; };
int is_full() {return m_length >= m_data.size(); };
- UINT16 get_length() { return m_length; };
- UINT16 get_size() { return m_data.size(); };
- UINT8 *get_data() { return &m_data[0]; };
+ uint16_t get_length() { return m_length; };
+ uint16_t get_size() { return m_data.size(); };
+ uint8_t *get_data() { return &m_data[0]; };
void copy(data_buffer *db) const;
void log(const char *title) const;
@@ -181,8 +181,8 @@ private:
const char *cpu_context() { return m_device->cpu_context(); }
threecom3c505_device *m_device; // pointer back to our device
- UINT16 m_length;
- std::vector<UINT8> m_data;
+ uint16_t m_length;
+ std::vector<uint8_t> m_data;
};
/* data_buffer fifo (used to buffer the received data) */
@@ -191,9 +191,9 @@ private:
public:
data_buffer_fifo();
~data_buffer_fifo();
- void start(threecom3c505_device *device, INT32 size, INT32 db_size);
+ void start(threecom3c505_device *device, int32_t size, int32_t db_size);
void reset();
- int put(const UINT8 data[], const int length);
+ int put(const uint8_t data[], const int length);
int get(data_buffer *db);
int is_empty () { return m_get_index == m_put_index; }
int is_full () { return ((m_put_index + 1) % m_size) == m_get_index; }
@@ -201,10 +201,10 @@ private:
const char *cpu_context() { return m_device->cpu_context(); }
threecom3c505_device *m_device; // pointer back to our device
- UINT16 m_size;
- UINT16 m_count;
- UINT16 m_get_index;
- UINT16 m_put_index;
+ uint16_t m_size;
+ uint16_t m_count;
+ uint16_t m_get_index;
+ uint16_t m_put_index;
data_buffer *m_db[RX_FIFO_SIZE];
};
@@ -217,23 +217,23 @@ private:
void do_receive_command();
void set_command_pending(int onoff);
- int ethernet_packet_is_for_me(const UINT8 mac_address[]);
+ int ethernet_packet_is_for_me(const uint8_t mac_address[]);
- void write_command_port( UINT8 data);
- UINT8 read_command_port();
- void write_data_port( UINT8 data);
- UINT8 read_data_port();
- void write_control_port( UINT8 data);
- UINT8 read_status_port();
+ void write_command_port( uint8_t data);
+ uint8_t read_command_port();
+ void write_data_port( uint8_t data);
+ uint8_t read_data_port();
+ void write_control_port( uint8_t data);
+ uint8_t read_status_port();
void do_command();
- UINT8 m_reg[16];
+ uint8_t m_reg[16];
- UINT8 m_status;
- UINT8 m_control;
+ uint8_t m_status;
+ uint8_t m_control;
- UINT8 m_command_buffer[CMD_BUFFER_SIZE];
+ uint8_t m_command_buffer[CMD_BUFFER_SIZE];
int m_command_index;
int m_command_pending;
int m_wait_for_ack;
@@ -257,16 +257,16 @@ private:
pcb_struct m_rcv_response;
- UINT16 m_microcode_version;
- UINT16 m_microcode_running;
+ uint16_t m_microcode_version;
+ uint16_t m_microcode_running;
- UINT16 m_i82586_config;
+ uint16_t m_i82586_config;
struct Netstat m_netstat;
- UINT8 m_station_address[ETHERNET_ADDR_SIZE];
- UINT8 m_multicast_list[ETHERNET_ADDR_SIZE*2];
- UINT8 m_filter_list[ETHERNET_ADDR_SIZE*4];
+ uint8_t m_station_address[ETHERNET_ADDR_SIZE];
+ uint8_t m_multicast_list[ETHERNET_ADDR_SIZE*2];
+ uint8_t m_filter_list[ETHERNET_ADDR_SIZE*4];
enum line_state irq_state;
diff --git a/src/devices/bus/isa/adlib.cpp b/src/devices/bus/isa/adlib.cpp
index 66e7bc29ca3..206ffe878cb 100644
--- a/src/devices/bus/isa/adlib.cpp
+++ b/src/devices/bus/isa/adlib.cpp
@@ -20,7 +20,7 @@ MACHINE_CONFIG_END
READ8_MEMBER( isa8_adlib_device::ym3812_16_r )
{
- UINT8 retVal = 0xff;
+ uint8_t retVal = 0xff;
switch(offset)
{
case 0 : retVal = m_ym3812->status_port_r( space, offset ); break;
@@ -61,7 +61,7 @@ machine_config_constructor isa8_adlib_device::device_mconfig_additions() const
// isa8_adlib_device - constructor
//-------------------------------------------------
-isa8_adlib_device::isa8_adlib_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+isa8_adlib_device::isa8_adlib_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ISA8_ADLIB, "Ad Lib Sound Card", tag, owner, clock, "isa_adlib", __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_ym3812(*this, "ym3812")
diff --git a/src/devices/bus/isa/adlib.h b/src/devices/bus/isa/adlib.h
index da22516fd72..27549f4ae23 100644
--- a/src/devices/bus/isa/adlib.h
+++ b/src/devices/bus/isa/adlib.h
@@ -21,7 +21,7 @@ class isa8_adlib_device :
{
public:
// construction/destruction
- isa8_adlib_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_adlib_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/aga.cpp b/src/devices/bus/isa/aga.cpp
index 0499fa40022..38a1afbfae5 100644
--- a/src/devices/bus/isa/aga.cpp
+++ b/src/devices/bus/isa/aga.cpp
@@ -56,7 +56,7 @@ const device_type ISA8_AGA = &device_creator<isa8_aga_device>;
// isa8_aga_device - constructor
//-------------------------------------------------
-isa8_aga_device::isa8_aga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_aga_device::isa8_aga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t( mconfig, ISA8_AGA, "AGA", tag, owner, clock, "aga", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_palette(*this, "palette"),
@@ -78,7 +78,7 @@ isa8_aga_device::isa8_aga_device(const machine_config &mconfig, const char *tag,
{
}
-isa8_aga_device::isa8_aga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+isa8_aga_device::isa8_aga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_isa8_card_interface(mconfig, *this),
m_palette(*this, "palette"),
@@ -107,7 +107,7 @@ void isa8_aga_device::device_start()
m_mode = AGA_COLOR;
m_mda_chr_gen = memregion("gfx1")->base() + 0x1000;
m_cga_chr_gen = memregion("gfx1")->base();
- m_videoram = std::make_unique<UINT8[]>(0x10000);
+ m_videoram = std::make_unique<uint8_t[]>(0x10000);
set_isa_device();
m_isa->install_memory(0xb0000, 0xbffff, read8_delegate(FUNC(isa8_aga_device::pc_aga_videoram_r),this), write8_delegate(FUNC(isa8_aga_device::pc_aga_videoram_w),this));
@@ -135,7 +135,7 @@ void isa8_aga_device::device_start()
}
}
- UINT8 *gfx = &memregion("gfx1")->base()[0x8000];
+ uint8_t *gfx = &memregion("gfx1")->base()[0x8000];
/* just a plain bit pattern for graphics data generation */
for (i = 0; i < 256; i++)
gfx[i] = i;
@@ -164,7 +164,7 @@ const device_type ISA8_AGA_PC200 = &device_creator<isa8_aga_pc200_device>;
// isa8_aga_pc200_device - constructor
//-------------------------------------------------
-isa8_aga_pc200_device::isa8_aga_pc200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_aga_pc200_device::isa8_aga_pc200_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
isa8_aga_device( mconfig, ISA8_AGA_PC200, "AGA PC200", tag, owner, clock, "aga_pc200", __FILE__),
m_port8(0),
m_portd(0),
@@ -194,7 +194,7 @@ void isa8_aga_pc200_device::device_start()
m_mode = AGA_COLOR;
m_mda_chr_gen = memregion("gfx1")->base();
m_cga_chr_gen = memregion("gfx1")->base() + 0x1000;
- m_videoram = std::make_unique<UINT8[]>(0x10000);
+ m_videoram = std::make_unique<uint8_t[]>(0x10000);
set_isa_device();
m_isa->install_memory(0xb0000, 0xbffff, read8_delegate(FUNC(isa8_aga_pc200_device::pc200_videoram_r),this), write8_delegate(FUNC(isa8_aga_pc200_device::pc200_videoram_w),this));
@@ -222,7 +222,7 @@ void isa8_aga_pc200_device::device_start()
}
}
- UINT8 *gfx = &memregion("gfx1")->base()[0x8000];
+ uint8_t *gfx = &memregion("gfx1")->base()[0x8000];
/* just a plain bit pattern for graphics data generation */
for (i = 0; i < 256; i++)
gfx[i] = i;
@@ -315,19 +315,19 @@ machine_config_constructor isa8_aga_device::device_mconfig_additions() const
MC6845_UPDATE_ROW( isa8_aga_device::mda_text_inten_update_row )
{
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT8 *videoram = m_videoram.get();
- UINT32 *p = &bitmap.pix32(y);
- UINT16 chr_base = ( ra & 0x08 ) ? 0x800 | ( ra & 0x07 ) : ra;
+ uint8_t *videoram = m_videoram.get();
+ uint32_t *p = &bitmap.pix32(y);
+ uint16_t chr_base = ( ra & 0x08 ) ? 0x800 | ( ra & 0x07 ) : ra;
int i;
if ( y == 0 ) logerror("mda_text_inten_update_row\n");
for ( i = 0; i < x_count; i++ ) {
- UINT16 offset = ( ( ma + i ) << 1 ) & 0x0FFF;
- UINT8 chr = videoram[ offset ];
- UINT8 attr = videoram[ offset + 1 ];
- UINT8 data = m_mda_chr_gen[ chr_base + chr * 8 ];
- UINT8 fg = ( attr & 0x08 ) ? 3 : 2;
- UINT8 bg = 0;
+ uint16_t offset = ( ( ma + i ) << 1 ) & 0x0FFF;
+ uint8_t chr = videoram[ offset ];
+ uint8_t attr = videoram[ offset + 1 ];
+ uint8_t data = m_mda_chr_gen[ chr_base + chr * 8 ];
+ uint8_t fg = ( attr & 0x08 ) ? 3 : 2;
+ uint8_t bg = 0;
if ( ( attr & ~0x88 ) == 0 ) {
data = 0x00;
@@ -375,20 +375,20 @@ MC6845_UPDATE_ROW( isa8_aga_device::mda_text_inten_update_row )
MC6845_UPDATE_ROW( isa8_aga_device::mda_text_blink_update_row )
{
- UINT8 *videoram = m_videoram.get();
+ uint8_t *videoram = m_videoram.get();
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT32 *p = &bitmap.pix32(y);
- UINT16 chr_base = ( ra & 0x08 ) ? 0x800 | ( ra & 0x07 ) : ra;
+ uint32_t *p = &bitmap.pix32(y);
+ uint16_t chr_base = ( ra & 0x08 ) ? 0x800 | ( ra & 0x07 ) : ra;
int i;
if ( y == 0 ) logerror("mda_text_blink_update_row\n");
for ( i = 0; i < x_count; i++ ) {
- UINT16 offset = ( ( ma + i ) << 1 ) & 0x0FFF;
- UINT8 chr = videoram[ offset ];
- UINT8 attr = videoram[ offset + 1 ];
- UINT8 data = m_mda_chr_gen[ chr_base + chr * 8 ];
- UINT8 fg = ( attr & 0x08 ) ? 3 : 2;
- UINT8 bg = 0;
+ uint16_t offset = ( ( ma + i ) << 1 ) & 0x0FFF;
+ uint8_t chr = videoram[ offset ];
+ uint8_t attr = videoram[ offset + 1 ];
+ uint8_t data = m_mda_chr_gen[ chr_base + chr * 8 ];
+ uint8_t fg = ( attr & 0x08 ) ? 3 : 2;
+ uint8_t bg = 0;
if ( ( attr & ~0x88 ) == 0 ) {
data = 0x00;
@@ -437,19 +437,19 @@ MC6845_UPDATE_ROW( isa8_aga_device::mda_text_blink_update_row )
MC6845_UPDATE_ROW( isa8_aga_device::cga_text_inten_update_row )
{
- UINT8 *videoram = m_videoram.get();
+ uint8_t *videoram = m_videoram.get();
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT32 *p = &bitmap.pix32(y);
+ uint32_t *p = &bitmap.pix32(y);
int i;
if ( y == 0 ) logerror("cga_text_inten_update_row\n");
for ( i = 0; i < x_count; i++ ) {
- UINT16 offset = ( ( ma + i ) << 1 ) & 0x3fff;
- UINT8 chr = videoram[ offset ];
- UINT8 attr = videoram[ offset +1 ];
- UINT8 data = m_cga_chr_gen[ chr * 16 + ra ];
- UINT16 fg = attr & 0x0F;
- UINT16 bg = ( attr >> 4 ) & 0x07;
+ uint16_t offset = ( ( ma + i ) << 1 ) & 0x3fff;
+ uint8_t chr = videoram[ offset ];
+ uint8_t attr = videoram[ offset +1 ];
+ uint8_t data = m_cga_chr_gen[ chr * 16 + ra ];
+ uint16_t fg = attr & 0x0F;
+ uint16_t bg = ( attr >> 4 ) & 0x07;
if ( i == cursor_x ) {
data = 0xFF;
@@ -469,17 +469,17 @@ MC6845_UPDATE_ROW( isa8_aga_device::cga_text_inten_update_row )
MC6845_UPDATE_ROW( isa8_aga_device::cga_text_inten_alt_update_row )
{
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT8 *videoram = m_videoram.get();
- UINT32 *p = &bitmap.pix32(y);
+ uint8_t *videoram = m_videoram.get();
+ uint32_t *p = &bitmap.pix32(y);
int i;
if ( y == 0 ) logerror("cga_text_inten_alt_update_row\n");
for ( i = 0; i < x_count; i++ ) {
- UINT16 offset = ( ( ma + i ) << 1 ) & 0x3fff;
- UINT8 chr = videoram[ offset ];
- UINT8 attr = videoram[ offset +1 ];
- UINT8 data = m_cga_chr_gen[ chr * 16 + ra ];
- UINT16 fg = attr & 0x0F;
+ uint16_t offset = ( ( ma + i ) << 1 ) & 0x3fff;
+ uint8_t chr = videoram[ offset ];
+ uint8_t attr = videoram[ offset +1 ];
+ uint8_t data = m_cga_chr_gen[ chr * 16 + ra ];
+ uint16_t fg = attr & 0x0F;
if ( i == cursor_x ) {
data = 0xFF;
@@ -499,17 +499,17 @@ MC6845_UPDATE_ROW( isa8_aga_device::cga_text_inten_alt_update_row )
MC6845_UPDATE_ROW( isa8_aga_device::cga_text_blink_update_row )
{
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT8 *videoram = m_videoram.get();
- UINT32 *p = &bitmap.pix32(y);
+ uint8_t *videoram = m_videoram.get();
+ uint32_t *p = &bitmap.pix32(y);
int i;
for ( i = 0; i < x_count; i++ ) {
- UINT16 offset = ( ( ma + i ) << 1 ) & 0x3fff;
- UINT8 chr = videoram[ offset ];
- UINT8 attr = videoram[ offset +1 ];
- UINT8 data = m_cga_chr_gen[ chr * 16 + ra ];
- UINT16 fg = attr & 0x0F;
- UINT16 bg = (attr >> 4) & 0x07;
+ uint16_t offset = ( ( ma + i ) << 1 ) & 0x3fff;
+ uint8_t chr = videoram[ offset ];
+ uint8_t attr = videoram[ offset +1 ];
+ uint8_t data = m_cga_chr_gen[ chr * 16 + ra ];
+ uint16_t fg = attr & 0x0F;
+ uint16_t bg = (attr >> 4) & 0x07;
if ( i == cursor_x ) {
data = 0xFF;
@@ -533,18 +533,18 @@ MC6845_UPDATE_ROW( isa8_aga_device::cga_text_blink_update_row )
MC6845_UPDATE_ROW( isa8_aga_device::cga_text_blink_alt_update_row )
{
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT8 *videoram = m_videoram.get();
- UINT32 *p = &bitmap.pix32(y);
+ uint8_t *videoram = m_videoram.get();
+ uint32_t *p = &bitmap.pix32(y);
int i;
if ( y == 0 ) logerror("cga_text_blink_alt_update_row\n");
for ( i = 0; i < x_count; i++ ) {
- UINT16 offset = ( ( ma + i ) << 1 ) & 0x3fff;
- UINT8 chr = videoram[ offset ];
- UINT8 attr = videoram[ offset +1 ];
- UINT8 data = m_cga_chr_gen[ chr * 16 + ra ];
- UINT16 fg = attr & 0x07;
- UINT16 bg = 0;
+ uint16_t offset = ( ( ma + i ) << 1 ) & 0x3fff;
+ uint8_t chr = videoram[ offset ];
+ uint8_t attr = videoram[ offset +1 ];
+ uint8_t data = m_cga_chr_gen[ chr * 16 + ra ];
+ uint16_t fg = attr & 0x07;
+ uint16_t bg = 0;
if ( i == cursor_x ) {
data = 0xFF;
@@ -569,14 +569,14 @@ MC6845_UPDATE_ROW( isa8_aga_device::cga_text_blink_alt_update_row )
MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_4bppl_update_row )
{
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT8 *videoram = m_videoram.get();
- UINT32 *p = &bitmap.pix32(y);
+ uint8_t *videoram = m_videoram.get();
+ uint32_t *p = &bitmap.pix32(y);
int i;
if ( y == 0 ) logerror("cga_gfx_4bppl_update_row\n");
for ( i = 0; i < x_count; i++ ) {
- UINT16 offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( y & 1 ) << 13 );
- UINT8 data = videoram[ offset ];
+ uint16_t offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( y & 1 ) << 13 );
+ uint8_t data = videoram[ offset ];
*p = palette[data >> 4]; p++;
*p = palette[data >> 4]; p++;
@@ -594,15 +594,15 @@ MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_4bppl_update_row )
MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_4bpph_update_row )
{
- UINT8 *videoram = m_videoram.get();
+ uint8_t *videoram = m_videoram.get();
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT32 *p = &bitmap.pix32(y);
+ uint32_t *p = &bitmap.pix32(y);
int i;
if ( y == 0 ) logerror("cga_gfx_4bpph_update_row\n");
for ( i = 0; i < x_count; i++ ) {
- UINT16 offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( y & 1 ) << 13 );
- UINT8 data = videoram[ offset ];
+ uint16_t offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( y & 1 ) << 13 );
+ uint8_t data = videoram[ offset ];
*p = palette[data >> 4]; p++;
*p = palette[data >> 4]; p++;
@@ -628,15 +628,15 @@ MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_4bpph_update_row )
MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_2bpp_update_row )
{
- UINT8 *videoram = m_videoram.get();
+ uint8_t *videoram = m_videoram.get();
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT32 *p = &bitmap.pix32(y);
+ uint32_t *p = &bitmap.pix32(y);
int i;
// if ( y == 0 ) logerror("cga_gfx_2bpp_update_row\n");
for ( i = 0; i < x_count; i++ ) {
- UINT16 offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( y & 1 ) << 13 );
- UINT8 data = videoram[ offset ];
+ uint16_t offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( y & 1 ) << 13 );
+ uint8_t data = videoram[ offset ];
*p = palette[m_cga_palette_lut_2bpp[ ( data >> 6 ) & 0x03 ]]; p++;
*p = palette[m_cga_palette_lut_2bpp[ ( data >> 4 ) & 0x03 ]]; p++;
@@ -654,16 +654,16 @@ MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_2bpp_update_row )
MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_1bpp_update_row )
{
- UINT8 *videoram = m_videoram.get();
+ uint8_t *videoram = m_videoram.get();
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT32 *p = &bitmap.pix32(y);
- UINT8 fg = m_cga_color_select & 0x0F;
+ uint32_t *p = &bitmap.pix32(y);
+ uint8_t fg = m_cga_color_select & 0x0F;
int i;
if ( y == 0 ) logerror("cga_gfx_1bpp_update_row\n");
for ( i = 0; i < x_count; i++ ) {
- UINT16 offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( ra & 1 ) << 13 );
- UINT8 data = videoram[ offset ];
+ uint16_t offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( ra & 1 ) << 13 );
+ uint8_t data = videoram[ offset ];
*p = palette[( data & 0x80 ) ? fg : 0]; p++;
*p = palette[( data & 0x40 ) ? fg : 0]; p++;
@@ -695,7 +695,7 @@ MC6845_UPDATE_ROW( isa8_aga_device::cga_gfx_1bpp_update_row )
READ8_MEMBER ( isa8_aga_device::pc_aga_mda_r )
{
- UINT8 data = 0xFF;
+ uint8_t data = 0xFF;
if ( m_mode == AGA_MONO ) {
switch( offset )
@@ -747,7 +747,7 @@ WRITE8_MEMBER ( isa8_aga_device::pc_aga_mda_w )
READ8_MEMBER ( isa8_aga_device::pc_aga_cga_r )
{
- UINT8 data = 0xFF;
+ uint8_t data = 0xFF;
if ( m_mode == AGA_COLOR ) {
switch( offset ) {
@@ -985,7 +985,7 @@ WRITE8_MEMBER( isa8_aga_pc200_device::pc200_cga_w )
READ8_MEMBER ( isa8_aga_pc200_device::pc200_cga_r )
{
- UINT8 result;
+ uint8_t result;
switch(offset) {
case 8:
diff --git a/src/devices/bus/isa/aga.h b/src/devices/bus/isa/aga.h
index f9ec0d19afe..54871eee91d 100644
--- a/src/devices/bus/isa/aga.h
+++ b/src/devices/bus/isa/aga.h
@@ -37,8 +37,8 @@ class isa8_aga_device :
{
public:
// construction/destruction
- isa8_aga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_aga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ isa8_aga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ isa8_aga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
// optional information overrides
@@ -77,23 +77,23 @@ public:
int m_update_row_type;
AGA_MODE m_mode;
- UINT8 m_mda_mode_control;
- UINT8 m_mda_status;
- UINT8 *m_mda_chr_gen;
+ uint8_t m_mda_mode_control;
+ uint8_t m_mda_status;
+ uint8_t *m_mda_chr_gen;
- UINT8 m_cga_mode_control;
- UINT8 m_cga_color_select;
- UINT8 m_cga_status;
- UINT8 *m_cga_chr_gen;
+ uint8_t m_cga_mode_control;
+ uint8_t m_cga_color_select;
+ uint8_t m_cga_status;
+ uint8_t *m_cga_chr_gen;
int m_framecnt;
- UINT8 m_vsync;
- UINT8 m_hsync;
+ uint8_t m_vsync;
+ uint8_t m_hsync;
- UINT8 m_cga_palette_lut_2bpp[4];
+ uint8_t m_cga_palette_lut_2bpp[4];
- std::unique_ptr<UINT8[]> m_videoram;
+ std::unique_ptr<uint8_t[]> m_videoram;
};
// device type definition
@@ -106,15 +106,15 @@ class isa8_aga_pc200_device :
{
public:
// construction/destruction
- isa8_aga_pc200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_aga_pc200_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
- UINT8 m_port8;
- UINT8 m_portd;
- UINT8 m_porte;
+ uint8_t m_port8;
+ uint8_t m_portd;
+ uint8_t m_porte;
DECLARE_READ8_MEMBER( pc200_videoram_r );
DECLARE_WRITE8_MEMBER( pc200_videoram_w );
diff --git a/src/devices/bus/isa/aha1542.cpp b/src/devices/bus/isa/aha1542.cpp
index 51a296e2e62..4ea36e2671e 100644
--- a/src/devices/bus/isa/aha1542.cpp
+++ b/src/devices/bus/isa/aha1542.cpp
@@ -183,7 +183,7 @@ machine_config_constructor aha1542_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( aha1542 );
}
-aha1542_device::aha1542_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+aha1542_device::aha1542_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, AHA1542, "AHA1542 SCSI Controller", tag, owner, clock, "aha1542", __FILE__ ),
device_isa16_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/isa/aha1542.h b/src/devices/bus/isa/aha1542.h
index 57229a99d04..710ce36b6df 100644
--- a/src/devices/bus/isa/aha1542.h
+++ b/src/devices/bus/isa/aha1542.h
@@ -30,7 +30,7 @@ class aha1542_device : public device_t,
{
public:
// construction/destruction
- aha1542_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ aha1542_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp
index 6a379459336..99f446b7524 100644
--- a/src/devices/bus/isa/cga.cpp
+++ b/src/devices/bus/isa/cga.cpp
@@ -304,7 +304,7 @@ const tiny_rom_entry *isa8_cga_device::device_rom_region() const
// isa8_cga_device - constructor
//-------------------------------------------------
-isa8_cga_device::isa8_cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_cga_device::isa8_cga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8_CGA, "IBM Color/Graphics Monitor Adapter", tag, owner, clock, "cga", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_cga_config(*this, "cga_config"), m_framecnt(0), m_mode_control(0), m_color_select(0),
@@ -320,7 +320,7 @@ isa8_cga_device::isa8_cga_device(const machine_config &mconfig, const char *tag,
m_superimpose = false;
}
-isa8_cga_device::isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+isa8_cga_device::isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_isa8_card_interface(mconfig, *this),
m_cga_config(*this, "cga_config"), m_framecnt(0), m_mode_control(0), m_color_select(0),
@@ -413,7 +413,7 @@ void isa8_cga_device::device_reset()
***************************************************************************/
-UINT32 isa8_cga_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t isa8_cga_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
mc6845_device *mc6845 = subdevice<mc6845_device>(CGA_MC6845_NAME);
@@ -445,7 +445,7 @@ const device_type ISA8_CGA_POISK2 = &device_creator<isa8_cga_poisk2_device>;
// isa8_cga_poisk2_device - constructor
//-------------------------------------------------
-isa8_cga_poisk2_device::isa8_cga_poisk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_cga_poisk2_device::isa8_cga_poisk2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
isa8_cga_device( mconfig, ISA8_CGA_POISK2, "ISA8_CGA_POISK2", tag, owner, clock, "cga_poisk2", __FILE__)
{
m_chr_gen_offset[0] = 0x0000;
@@ -474,13 +474,13 @@ const device_type ISA8_CGA_SUPERIMPOSE = &device_creator<isa8_cga_superimpose_de
// isa8_cga_superimpose_device - constructor
//-------------------------------------------------
-isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
isa8_cga_device( mconfig, ISA8_CGA_SUPERIMPOSE, "ISA8_CGA_SUPERIMPOSE", tag, owner, clock, "cga_superimpose", __FILE__)
{
m_superimpose = true;
}
-isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
isa8_cga_device( mconfig, type, name, tag, owner, clock, shortname, source)
{
m_superimpose = true;
@@ -493,20 +493,20 @@ isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &m
MC6845_UPDATE_ROW( isa8_cga_device::cga_text_inten_update_row )
{
- UINT8 *videoram = &m_vram[m_start_offset];
- UINT32 *p = &bitmap.pix32(y);
+ uint8_t *videoram = &m_vram[m_start_offset];
+ uint32_t *p = &bitmap.pix32(y);
const rgb_t *palette = m_palette->palette()->entry_list_raw();
int i;
if ( y == 0 ) CGA_LOG(1,"cga_text_inten_update_row",("\n"));
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ( ma + i ) << 1 ) & 0x3fff;
- UINT8 chr = videoram[ offset ];
- UINT8 attr = videoram[ offset +1 ];
- UINT8 data = m_chr_gen[ chr * 8 + ra ];
- UINT16 fg = attr & 0x0F;
- UINT16 bg = attr >> 4;
+ uint16_t offset = ( ( ma + i ) << 1 ) & 0x3fff;
+ uint8_t chr = videoram[ offset ];
+ uint8_t attr = videoram[ offset +1 ];
+ uint8_t data = m_chr_gen[ chr * 8 + ra ];
+ uint16_t fg = attr & 0x0F;
+ uint16_t bg = attr >> 4;
if ( i == cursor_x && ( m_framecnt & 0x08 ) )
{
@@ -532,20 +532,20 @@ MC6845_UPDATE_ROW( isa8_cga_device::cga_text_inten_update_row )
MC6845_UPDATE_ROW( isa8_cga_device::cga_text_inten_comp_grey_update_row )
{
- UINT8 *videoram = &m_vram[m_start_offset];
- UINT32 *p = &bitmap.pix32(y);
+ uint8_t *videoram = &m_vram[m_start_offset];
+ uint32_t *p = &bitmap.pix32(y);
const rgb_t *palette = m_palette->palette()->entry_list_raw();
int i;
if ( y == 0 ) CGA_LOG(1,"cga_text_inten_comp_grey_update_row",("\n"));
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ( ma + i ) << 1 ) & 0x3fff;
- UINT8 chr = videoram[ offset ];
- UINT8 attr = videoram[ offset +1 ];
- UINT8 data = m_chr_gen[ chr * 8 + ra ];
- UINT16 fg = 0x10 + ( attr & 0x0F );
- UINT16 bg = 0x10 + ( ( attr >> 4 ) & 0x07 );
+ uint16_t offset = ( ( ma + i ) << 1 ) & 0x3fff;
+ uint8_t chr = videoram[ offset ];
+ uint8_t attr = videoram[ offset +1 ];
+ uint8_t data = m_chr_gen[ chr * 8 + ra ];
+ uint16_t fg = 0x10 + ( attr & 0x0F );
+ uint16_t bg = 0x10 + ( ( attr >> 4 ) & 0x07 );
if ( i == cursor_x && ( m_framecnt & 0x08 ) )
{
@@ -570,19 +570,19 @@ MC6845_UPDATE_ROW( isa8_cga_device::cga_text_inten_comp_grey_update_row )
MC6845_UPDATE_ROW( isa8_cga_device::cga_text_inten_alt_update_row )
{
- UINT8 *videoram = &m_vram[m_start_offset];
- UINT32 *p = &bitmap.pix32(y);
+ uint8_t *videoram = &m_vram[m_start_offset];
+ uint32_t *p = &bitmap.pix32(y);
const rgb_t *palette = m_palette->palette()->entry_list_raw();
int i;
if ( y == 0 ) CGA_LOG(1,"cga_text_inten_alt_update_row",("\n"));
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ( ma + i ) << 1 ) & 0x3fff;
- UINT8 chr = videoram[ offset ];
- UINT8 attr = videoram[ offset +1 ];
- UINT8 data = m_chr_gen[ chr * 8 + ra ];
- UINT16 fg = attr & 0x0F;
+ uint16_t offset = ( ( ma + i ) << 1 ) & 0x3fff;
+ uint8_t chr = videoram[ offset ];
+ uint8_t attr = videoram[ offset +1 ];
+ uint8_t data = m_chr_gen[ chr * 8 + ra ];
+ uint16_t fg = attr & 0x0F;
if ( i == cursor_x && ( m_framecnt & 0x08 ) )
{
@@ -608,20 +608,20 @@ MC6845_UPDATE_ROW( isa8_cga_device::cga_text_inten_alt_update_row )
MC6845_UPDATE_ROW( isa8_cga_device::cga_text_blink_update_row )
{
- UINT8 *videoram = &m_vram[m_start_offset];
- UINT32 *p = &bitmap.pix32(y);
+ uint8_t *videoram = &m_vram[m_start_offset];
+ uint32_t *p = &bitmap.pix32(y);
const rgb_t *palette = m_palette->palette()->entry_list_raw();
int i;
if ( y == 0 ) CGA_LOG(1,"cga_text_blink_update_row",("\n"));
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ( ma + i ) << 1 ) & 0x3fff;
- UINT8 chr = videoram[ offset ];
- UINT8 attr = videoram[ offset +1 ];
- UINT8 data = m_chr_gen[ chr * 8 + ra ];
- UINT16 fg = attr & 0x0F;
- UINT16 bg = (attr >> 4) & 0x07;
+ uint16_t offset = ( ( ma + i ) << 1 ) & 0x3fff;
+ uint8_t chr = videoram[ offset ];
+ uint8_t attr = videoram[ offset +1 ];
+ uint8_t data = m_chr_gen[ chr * 8 + ra ];
+ uint16_t fg = attr & 0x0F;
+ uint16_t bg = (attr >> 4) & 0x07;
if ( i == cursor_x )
{
@@ -651,21 +651,21 @@ MC6845_UPDATE_ROW( isa8_cga_device::cga_text_blink_update_row )
MC6845_UPDATE_ROW( isa8_cga_device::cga_text_blink_update_row_si )
{
- UINT8 *videoram = &m_vram[m_start_offset];
- UINT32 *p = &bitmap.pix32(y);
+ uint8_t *videoram = &m_vram[m_start_offset];
+ uint32_t *p = &bitmap.pix32(y);
const rgb_t *palette = m_palette->palette()->entry_list_raw();
int i;
if ( y == 0 ) CGA_LOG(1,"cga_text_blink_update_row_si",("\n"));
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ( ma + i ) << 1 ) & 0x3fff;
- UINT8 chr = videoram[ offset ];
- UINT8 attr = videoram[ offset +1 ];
- UINT8 data = m_chr_gen[ chr * 8 + ra ];
- UINT16 fg = attr & 0x0F;
- UINT16 bg = (attr >> 4) & 0x07;
- UINT8 xi;
+ uint16_t offset = ( ( ma + i ) << 1 ) & 0x3fff;
+ uint8_t chr = videoram[ offset ];
+ uint8_t attr = videoram[ offset +1 ];
+ uint8_t data = m_chr_gen[ chr * 8 + ra ];
+ uint16_t fg = attr & 0x0F;
+ uint16_t bg = (attr >> 4) & 0x07;
+ uint8_t xi;
if ( i == cursor_x )
{
@@ -684,7 +684,7 @@ MC6845_UPDATE_ROW( isa8_cga_device::cga_text_blink_update_row_si )
for(xi=0;xi<8;xi++)
{
- UINT8 pen_data, dot;
+ uint8_t pen_data, dot;
dot = (data & (1 << (7-xi)));
pen_data = dot ? fg : bg;
@@ -702,20 +702,20 @@ MC6845_UPDATE_ROW( isa8_cga_device::cga_text_blink_update_row_si )
MC6845_UPDATE_ROW( isa8_cga_device::cga_text_blink_alt_update_row )
{
- UINT8 *videoram = &m_vram[m_start_offset];
- UINT32 *p = &bitmap.pix32(y);
+ uint8_t *videoram = &m_vram[m_start_offset];
+ uint32_t *p = &bitmap.pix32(y);
const rgb_t *palette = m_palette->palette()->entry_list_raw();
int i;
if ( y == 0 ) CGA_LOG(1,"cga_text_blink_alt_update_row",("\n"));
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ( ma + i ) << 1 ) & 0x3fff;
- UINT8 chr = videoram[ offset ];
- UINT8 attr = videoram[ offset +1 ];
- UINT8 data = m_chr_gen[ chr * 8 + ra ];
- UINT16 fg = attr & 0x07;
- UINT16 bg = 0;
+ uint16_t offset = ( ( ma + i ) << 1 ) & 0x3fff;
+ uint8_t chr = videoram[ offset ];
+ uint8_t attr = videoram[ offset +1 ];
+ uint8_t data = m_chr_gen[ chr * 8 + ra ];
+ uint16_t fg = attr & 0x07;
+ uint16_t bg = 0;
if ( i == cursor_x )
{
@@ -749,16 +749,16 @@ MC6845_UPDATE_ROW( isa8_cga_device::cga_text_blink_alt_update_row )
MC6845_UPDATE_ROW( isa8_cga_device::cga_gfx_4bppl_update_row )
{
- UINT8 *videoram = &m_vram[m_start_offset];
- UINT32 *p = &bitmap.pix32(y);
+ uint8_t *videoram = &m_vram[m_start_offset];
+ uint32_t *p = &bitmap.pix32(y);
const rgb_t *palette = m_palette->palette()->entry_list_raw();
int i;
if ( y == 0 ) CGA_LOG(1,"cga_gfx_4bppl_update_row",("\n"));
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( y & 1 ) << 13 );
- UINT8 data = videoram[ offset ];
+ uint16_t offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( y & 1 ) << 13 );
+ uint8_t data = videoram[ offset ];
*p = palette[data >> 4]; p++;
*p = palette[data >> 4]; p++;
@@ -782,9 +782,9 @@ MC6845_UPDATE_ROW( isa8_cga_device::cga_gfx_4bppl_update_row )
* are the same size as the normal colour ones.
*/
-static const UINT8 yc_lut2[4] = { 0, 182, 71, 255 };
+static const uint8_t yc_lut2[4] = { 0, 182, 71, 255 };
-static const UINT8 yc_lut[16][8] =
+static const uint8_t yc_lut[16][8] =
{
{ 0, 0, 0, 0, 0, 0, 0, 0 }, /* black */
{ 0, 0, 0, 0, 1, 1, 1, 1 }, /* blue */
@@ -808,8 +808,8 @@ static const UINT8 yc_lut[16][8] =
MC6845_UPDATE_ROW( isa8_cga_device::cga_gfx_4bpph_update_row )
{
- UINT8 *videoram = &m_vram[m_start_offset];
- UINT32 *p = &bitmap.pix32(y);
+ uint8_t *videoram = &m_vram[m_start_offset];
+ uint32_t *p = &bitmap.pix32(y);
const rgb_t *palette = m_palette->palette()->entry_list_raw();
int i;
@@ -817,8 +817,8 @@ MC6845_UPDATE_ROW( isa8_cga_device::cga_gfx_4bpph_update_row )
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( y & 1 ) << 13 );
- UINT8 data = videoram[ offset ];
+ uint16_t offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( y & 1 ) << 13 );
+ uint8_t data = videoram[ offset ];
*p = palette[data >> 4]; p++;
*p = palette[data >> 4]; p++;
@@ -851,16 +851,16 @@ MC6845_UPDATE_ROW( isa8_cga_device::cga_gfx_4bpph_update_row )
MC6845_UPDATE_ROW( isa8_cga_device::cga_gfx_2bpp_update_row )
{
- UINT8 *videoram = &m_vram[m_start_offset];
- UINT32 *p = &bitmap.pix32(y);
+ uint8_t *videoram = &m_vram[m_start_offset];
+ uint32_t *p = &bitmap.pix32(y);
const rgb_t *palette = m_palette->palette()->entry_list_raw();
int i;
if ( y == 0 ) CGA_LOG(1,"cga_gfx_2bpp_update_row",("\n"));
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( ra & 1 ) << 13 );
- UINT8 data = videoram[ offset ];
+ uint16_t offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( ra & 1 ) << 13 );
+ uint8_t data = videoram[ offset ];
*p = palette[m_palette_lut_2bpp[ ( data >> 6 ) & 0x03 ]]; p++;
*p = palette[m_palette_lut_2bpp[ ( data >> 4 ) & 0x03 ]]; p++;
@@ -886,17 +886,17 @@ MC6845_UPDATE_ROW( isa8_cga_device::cga_gfx_2bpp_update_row )
MC6845_UPDATE_ROW( isa8_cga_device::cga_gfx_1bpp_update_row )
{
- UINT8 *videoram = &m_vram[m_start_offset];
- UINT32 *p = &bitmap.pix32(y);
+ uint8_t *videoram = &m_vram[m_start_offset];
+ uint32_t *p = &bitmap.pix32(y);
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT8 fg = m_color_select & 0x0F;
+ uint8_t fg = m_color_select & 0x0F;
int i;
if ( y == 0 ) CGA_LOG(1,"cga_gfx_1bpp_update_row",("\n"));
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( ra & 1 ) << 13 );
- UINT8 data = videoram[ offset ];
+ uint16_t offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( ra & 1 ) << 13 );
+ uint8_t data = videoram[ offset ];
*p = palette[( data & 0x80 ) ? fg : 0]; p++;
*p = palette[( data & 0x40 ) ? fg : 0]; p++;
@@ -1007,10 +1007,10 @@ void isa8_cga_device::set_palette_luts(void)
* x x x 1 1 1 1 0 - 640x200 graphics. Colour on black on RGB monitor, monochrome on composite monitor.
* x x x 1 1 1 1 1 - unknown/invalid.
*/
-void isa8_cga_device::mode_control_w(UINT8 data)
+void isa8_cga_device::mode_control_w(uint8_t data)
{
mc6845_device *mc6845 = subdevice<mc6845_device>(CGA_MC6845_NAME);
- UINT8 monitor = CGA_MONITOR;
+ uint8_t monitor = CGA_MONITOR;
m_mode_control = data;
@@ -1114,7 +1114,7 @@ void isa8_cga_device::mode_control_w(UINT8 data)
/*
* Select Plantronics modes
*/
-void isa8_cga_device::plantronics_w(UINT8 data)
+void isa8_cga_device::plantronics_w(uint8_t data)
{
if ( ( CGA_CHIPSET ) != CGA_CHIPSET_ATI) return;
@@ -1135,7 +1135,7 @@ void isa8_cga_device::plantronics_w(UINT8 data)
READ8_MEMBER( isa8_cga_device::io_read )
{
mc6845_device *mc6845 = subdevice<mc6845_device>(CGA_MC6845_NAME);
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
switch( offset )
{
@@ -1262,11 +1262,11 @@ WRITE8_MEMBER( isa8_cga_device::io_write )
//
//
//static inline void pgfx_plot_unit_2bpp(bitmap_ind16 &bitmap,
-// int x, int y, const UINT16 *palette, int offs)
+// int x, int y, const uint16_t *palette, int offs)
//{
// int i;
-// UINT8 bmap[2], values[2];
-// UINT16 *dest;
+// uint8_t bmap[2], values[2];
+// uint16_t *dest;
//
// if (cga.plantronics & 0x40)
// {
@@ -1316,7 +1316,7 @@ WRITE8_MEMBER( isa8_cga_device::io_write )
// int height = mscrtc6845_get_char_height(crtc);
// int columns = mscrtc6845_get_char_columns(crtc)*2;
// int colorset = cga.color_select & 0x3F;
-// const UINT16 *palette;
+// const uint16_t *palette;
//
// /* Most chipsets use bit 2 of the mode control register to
// * access a third palette. But not consistently. */
@@ -1369,20 +1369,20 @@ WRITE8_MEMBER( isa8_cga_device::io_write )
MC6845_UPDATE_ROW( isa8_cga_pc1512_device::pc1512_gfx_4bpp_update_row )
{
- UINT8 *videoram = &m_vram[m_start_offset];
- UINT32 *p = &bitmap.pix32(y);
+ uint8_t *videoram = &m_vram[m_start_offset];
+ uint32_t *p = &bitmap.pix32(y);
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT16 offset_base = ra << 13;
+ uint16_t offset_base = ra << 13;
int j;
if ( y == 0 ) CGA_LOG(1,"pc1512_gfx_4bpp_update_row",("\n"));
for ( j = 0; j < x_count; j++ )
{
- UINT16 offset = offset_base | ( ( ma + j ) & 0x1FFF );
- UINT16 i = ( m_color_select & 8 ) ? videoram[ isa8_cga_pc1512_device::vram_offset[3] | offset ] << 3 : 0;
- UINT16 r = ( m_color_select & 4 ) ? videoram[ isa8_cga_pc1512_device::vram_offset[2] | offset ] << 2 : 0;
- UINT16 g = ( m_color_select & 2 ) ? videoram[ isa8_cga_pc1512_device::vram_offset[1] | offset ] << 1 : 0;
- UINT16 b = ( m_color_select & 1 ) ? videoram[ isa8_cga_pc1512_device::vram_offset[0] | offset ] : 0;
+ uint16_t offset = offset_base | ( ( ma + j ) & 0x1FFF );
+ uint16_t i = ( m_color_select & 8 ) ? videoram[ isa8_cga_pc1512_device::vram_offset[3] | offset ] << 3 : 0;
+ uint16_t r = ( m_color_select & 4 ) ? videoram[ isa8_cga_pc1512_device::vram_offset[2] | offset ] << 2 : 0;
+ uint16_t g = ( m_color_select & 2 ) ? videoram[ isa8_cga_pc1512_device::vram_offset[1] | offset ] << 1 : 0;
+ uint16_t b = ( m_color_select & 1 ) ? videoram[ isa8_cga_pc1512_device::vram_offset[0] | offset ] : 0;
*p = palette[( ( i & 0x400 ) | ( r & 0x200 ) | ( g & 0x100 ) | ( b & 0x80 ) ) >> 7]; p++;
*p = palette[( ( i & 0x200 ) | ( r & 0x100 ) | ( g & 0x080 ) | ( b & 0x40 ) ) >> 6]; p++;
@@ -1498,7 +1498,7 @@ WRITE8_MEMBER( isa8_cga_pc1512_device::io_write )
READ8_MEMBER( isa8_cga_pc1512_device::io_read )
{
- UINT8 data;
+ uint8_t data;
switch (offset)
{
@@ -1541,7 +1541,7 @@ WRITE8_MEMBER( isa8_cga_pc1512_device::vram_w )
const device_type ISA8_CGA_PC1512 = &device_creator<isa8_cga_pc1512_device>;
const offs_t isa8_cga_pc1512_device::vram_offset[4]= { 0x0000, 0x4000, 0x8000, 0xC000 };
-const UINT8 isa8_cga_pc1512_device::mc6845_writeonce_register[31] =
+const uint8_t isa8_cga_pc1512_device::mc6845_writeonce_register[31] =
{
1, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
@@ -1550,7 +1550,7 @@ const UINT8 isa8_cga_pc1512_device::mc6845_writeonce_register[31] =
// isa8_cga_pc1512_device - constructor
//-------------------------------------------------
-isa8_cga_pc1512_device::isa8_cga_pc1512_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_cga_pc1512_device::isa8_cga_pc1512_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
isa8_cga_device( mconfig, ISA8_CGA_PC1512, "ISA8_CGA_PC1512", tag, owner, clock, "cga_pc1512", __FILE__), m_write(0), m_read(0), m_mc6845_address(0)
{
m_vram_size = 0x10000;
@@ -1604,7 +1604,7 @@ void isa8_cga_pc1512_device::device_reset()
membank("bank1")->set_base(&m_vram[isa8_cga_pc1512_device::vram_offset[0]]);
}
-void isa8_wyse700_device::change_resolution(UINT8 mode)
+void isa8_wyse700_device::change_resolution(uint8_t mode)
{
int width = 0, height = 0;
if (mode & 2) {
@@ -1650,7 +1650,7 @@ WRITE8_MEMBER( isa8_wyse700_device::io_write )
READ8_MEMBER( isa8_wyse700_device::io_read )
{
- UINT8 data;
+ uint8_t data;
switch (offset)
{
@@ -1680,7 +1680,7 @@ const device_type ISA8_WYSE700 = &device_creator<isa8_wyse700_device>;
// isa8_wyse700_device - constructor
//-------------------------------------------------
-isa8_wyse700_device::isa8_wyse700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_wyse700_device::isa8_wyse700_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
isa8_cga_device( mconfig, ISA8_WYSE700, "Wyse 700", tag, owner, clock, "wyse700", __FILE__), m_bank_offset(0), m_bank_base(0), m_control(0)
{
m_vram_size = 0x20000;
@@ -1732,14 +1732,14 @@ void isa8_wyse700_device::device_reset()
m_bank_base = 0;
}
-UINT32 isa8_wyse700_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t isa8_wyse700_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
if (m_control & 0x08) {
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT8 fg = m_color_select & 0x0F;
- UINT32 addr = 0;
+ uint8_t fg = m_color_select & 0x0F;
+ uint32_t addr = 0;
for (int y = 0; y < 800; y++) {
- UINT8 *src = &m_vram[addr];
+ uint8_t *src = &m_vram[addr];
if (y & 1) {
src += 0x10000;
@@ -1747,7 +1747,7 @@ UINT32 isa8_wyse700_device::screen_update(screen_device &screen, bitmap_rgb32 &b
}
for (int x = 0; x < (1280 / 8); x++) {
- UINT8 val = src[x];
+ uint8_t val = src[x];
for (int i = 0; i < 8; i++) {
bitmap.pix32(y,x*8+i) = (val & 0x80) ? palette[fg] : palette[0x00];
@@ -1768,7 +1768,7 @@ const device_type ISA8_EC1841_0002 = &device_creator<isa8_ec1841_0002_device>;
// isa8_ec1841_0002_device - constructor
//-------------------------------------------------
-isa8_ec1841_0002_device::isa8_ec1841_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_ec1841_0002_device::isa8_ec1841_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
isa8_cga_device( mconfig, ISA8_EC1841_0002, "EC 1841.0002 (CGA)", tag, owner, clock, "ec1841_0002", __FILE__), m_p3df(0)
{
}
@@ -1834,7 +1834,7 @@ WRITE8_MEMBER( isa8_ec1841_0002_device::io_write )
READ8_MEMBER( isa8_ec1841_0002_device::io_read )
{
- UINT8 data;
+ uint8_t data;
switch (offset)
{
@@ -1854,7 +1854,7 @@ const device_type ISA8_CGA_MC1502 = &device_creator<isa8_cga_mc1502_device>;
// isa8_cga_mc1502_device - constructor
//-------------------------------------------------
-isa8_cga_mc1502_device::isa8_cga_mc1502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_cga_mc1502_device::isa8_cga_mc1502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
isa8_cga_device( mconfig, ISA8_CGA_MC1502, "MC1502 CGA", tag, owner, clock, "cga_mc1502", __FILE__)
{
m_vram_size = 0x8000;
@@ -1883,7 +1883,7 @@ const device_type ISA8_CGA_ISKR1031 = &device_creator<isa8_cga_iskr1031_device>;
// isa8_cga_iskr1031_device - constructor
//-------------------------------------------------
-isa8_cga_iskr1031_device::isa8_cga_iskr1031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_cga_iskr1031_device::isa8_cga_iskr1031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
isa8_cga_device( mconfig, ISA8_CGA_ISKR1031, "Iskra-1031 CGA", tag, owner, clock, "cga_iskr1031", __FILE__)
{
}
@@ -1908,7 +1908,7 @@ const device_type ISA8_CGA_ISKR1030M = &device_creator<isa8_cga_iskr1030m_device
// isa8_cga_iskr1030m_device - constructor
//-------------------------------------------------
-isa8_cga_iskr1030m_device::isa8_cga_iskr1030m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_cga_iskr1030m_device::isa8_cga_iskr1030m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
isa8_cga_device( mconfig, ISA8_CGA_ISKR1030M, "Iskra-1030M CGA", tag, owner, clock, "cga_iskr1030m", __FILE__)
{
}
@@ -1939,7 +1939,7 @@ machine_config_constructor isa8_cga_m24_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( m24 );
}
-isa8_cga_m24_device::isa8_cga_m24_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_cga_m24_device::isa8_cga_m24_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
isa8_cga_device( mconfig, ISA8_CGA_M24, "Olivetti M24 CGA", tag, owner, clock, "cga_m24", __FILE__), m_mode2(0), m_index(0)
{
m_vram_size = 0x8000;
@@ -2001,7 +2001,7 @@ WRITE8_MEMBER( isa8_cga_m24_device::io_write )
READ8_MEMBER( isa8_cga_m24_device::io_read )
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
switch(offset)
{
@@ -2028,17 +2028,17 @@ MC6845_UPDATE_ROW( isa8_cga_m24_device::crtc_update_row )
MC6845_UPDATE_ROW( isa8_cga_m24_device::m24_gfx_1bpp_m24_update_row )
{
- UINT8 *videoram = &m_vram[m_start_offset];
- UINT32 *p = &bitmap.pix32(y);
+ uint8_t *videoram = &m_vram[m_start_offset];
+ uint32_t *p = &bitmap.pix32(y);
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT8 fg = m_color_select & 0x0F;
+ uint8_t fg = m_color_select & 0x0F;
int i;
if ( y == 0 ) CGA_LOG(1,"m24_gfx_1bpp_m24_update_row",("\n"));
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( ra & 3 ) << 13 );
- UINT8 data = videoram[ offset ];
+ uint16_t offset = ( ( ( ma + i ) << 1 ) & 0x1fff ) | ( ( ra & 3 ) << 13 );
+ uint8_t data = videoram[ offset ];
*p = palette[( data & 0x80 ) ? fg : 0]; p++;
*p = palette[( data & 0x40 ) ? fg : 0]; p++;
diff --git a/src/devices/bus/isa/cga.h b/src/devices/bus/isa/cga.h
index 8fdabd41ebb..54db66e4e10 100644
--- a/src/devices/bus/isa/cga.h
+++ b/src/devices/bus/isa/cga.h
@@ -26,8 +26,8 @@ class isa8_cga_device :
public:
// construction/destruction
- isa8_cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ isa8_cga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ isa8_cga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual MC6845_UPDATE_ROW( crtc_update_row );
MC6845_UPDATE_ROW( cga_text_inten_update_row );
@@ -53,34 +53,34 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
public:
- void mode_control_w(UINT8 data);
+ void mode_control_w(uint8_t data);
void set_palette_luts();
- void plantronics_w(UINT8 data);
+ void plantronics_w(uint8_t data);
virtual DECLARE_READ8_MEMBER( io_read );
virtual DECLARE_WRITE8_MEMBER( io_write );
DECLARE_WRITE_LINE_MEMBER( hsync_changed );
DECLARE_WRITE_LINE_MEMBER( vsync_changed );
- virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
MC6845_RECONFIGURE(reconfigure);
public:
int m_framecnt;
- UINT8 m_mode_control; /* wo 0x3d8 */
- UINT8 m_color_select; /* wo 0x3d9 */
- //UINT8 m_status; //unused? /* ro 0x3da */
+ uint8_t m_mode_control; /* wo 0x3d8 */
+ uint8_t m_color_select; /* wo 0x3d9 */
+ //uint8_t m_status; //unused? /* ro 0x3da */
int m_update_row_type, m_y;
- UINT8 m_palette_lut_2bpp[4];
+ uint8_t m_palette_lut_2bpp[4];
offs_t m_chr_gen_offset[4];
- UINT8 m_font_selection_mask;
- UINT8 *m_chr_gen_base;
- UINT8 *m_chr_gen;
- UINT8 m_vsync;
- UINT8 m_hsync;
+ uint8_t m_font_selection_mask;
+ uint8_t *m_chr_gen_base;
+ uint8_t *m_chr_gen;
+ uint8_t m_vsync;
+ uint8_t m_hsync;
size_t m_vram_size;
- std::vector<UINT8> m_vram;
+ std::vector<uint8_t> m_vram;
bool m_superimpose;
- UINT8 m_plantronics; /* This should be moved into the appropriate subclass */
+ uint8_t m_plantronics; /* This should be moved into the appropriate subclass */
offs_t m_start_offset;
required_device<palette_device> m_palette;
required_device<screen_device> m_screen;
@@ -97,8 +97,8 @@ class isa8_cga_superimpose_device :
{
public:
// construction/destruction
- isa8_cga_superimpose_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ isa8_cga_superimpose_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
};
// device type definition
@@ -112,7 +112,7 @@ class isa8_cga_poisk2_device :
{
public:
// construction/destruction
- isa8_cga_poisk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_cga_poisk2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
};
@@ -128,7 +128,7 @@ class isa8_cga_pc1512_device :
{
public:
// construction/destruction
- isa8_cga_pc1512_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_cga_pc1512_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -142,17 +142,17 @@ protected:
virtual void device_reset() override;
public:
- UINT8 m_write;
- UINT8 m_read;
- UINT8 m_mc6845_address;
- UINT8 m_mc6845_locked_register[31];
+ uint8_t m_write;
+ uint8_t m_read;
+ uint8_t m_mc6845_address;
+ uint8_t m_mc6845_locked_register[31];
public:
// Static information
// mapping of the 4 planes into videoram
// (text data should be readable at videoram+0)
static const offs_t vram_offset[4];
- static const UINT8 mc6845_writeonce_register[31];
+ static const uint8_t mc6845_writeonce_register[31];
virtual DECLARE_READ8_MEMBER( io_read ) override;
virtual DECLARE_WRITE8_MEMBER( io_write ) override;
@@ -170,7 +170,7 @@ class isa8_wyse700_device :
{
public:
// construction/destruction
- isa8_wyse700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_wyse700_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -182,12 +182,12 @@ protected:
public:
virtual DECLARE_READ8_MEMBER( io_read ) override;
virtual DECLARE_WRITE8_MEMBER( io_write ) override;
- virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
- void change_resolution(UINT8 mode);
+ virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
+ void change_resolution(uint8_t mode);
- UINT8 m_bank_offset;
- UINT8 m_bank_base;
- UINT8 m_control;
+ uint8_t m_bank_offset;
+ uint8_t m_bank_base;
+ uint8_t m_control;
};
// device type definition
@@ -200,7 +200,7 @@ class isa8_ec1841_0002_device :
{
public:
// construction/destruction
- isa8_ec1841_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_ec1841_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -211,7 +211,7 @@ public:
virtual DECLARE_READ8_MEMBER( io_read ) override;
virtual DECLARE_WRITE8_MEMBER( io_write ) override;
- UINT8 m_p3df;
+ uint8_t m_p3df;
DECLARE_READ8_MEMBER( char_ram_read );
DECLARE_WRITE8_MEMBER( char_ram_write );
};
@@ -226,7 +226,7 @@ class isa8_cga_iskr1030m_device :
{
public:
// construction/destruction
- isa8_cga_iskr1030m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_cga_iskr1030m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
@@ -240,7 +240,7 @@ class isa8_cga_iskr1031_device :
{
public:
// construction/destruction
- isa8_cga_iskr1031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_cga_iskr1031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
@@ -254,7 +254,7 @@ class isa8_cga_mc1502_device :
{
public:
// construction/destruction
- isa8_cga_mc1502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_cga_mc1502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
};
@@ -268,7 +268,7 @@ class isa8_cga_m24_device :
{
public:
// construction/destruction
- isa8_cga_m24_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_cga_m24_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
// optional information overrides
//virtual const rom_entry *device_rom_region() const;
@@ -280,7 +280,7 @@ public:
protected:
virtual void device_reset() override;
private:
- UINT8 m_mode2, m_index;
+ uint8_t m_mode2, m_index;
};
// device type definition
diff --git a/src/devices/bus/isa/com.cpp b/src/devices/bus/isa/com.cpp
index cd374756229..6e346bcc13e 100644
--- a/src/devices/bus/isa/com.cpp
+++ b/src/devices/bus/isa/com.cpp
@@ -95,13 +95,13 @@ machine_config_constructor isa8_com_device::device_mconfig_additions() const
// isa8_com_device - constructor
//-------------------------------------------------
-isa8_com_device::isa8_com_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_com_device::isa8_com_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8_COM, "Communications Adapter PC/XT", tag, owner, clock, "isa_com", __FILE__),
device_isa8_card_interface(mconfig, *this)
{
}
-isa8_com_device::isa8_com_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+isa8_com_device::isa8_com_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_isa8_card_interface(mconfig, *this)
{
@@ -188,7 +188,7 @@ machine_config_constructor isa8_com_at_device::device_mconfig_additions() const
// isa8_com_device - constructor
//-------------------------------------------------
-isa8_com_at_device::isa8_com_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_com_at_device::isa8_com_at_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
isa8_com_device(mconfig, ISA8_COM_AT, "Communications Adapter", tag, owner, clock, "isa_com_at", __FILE__)
{
}
diff --git a/src/devices/bus/isa/com.h b/src/devices/bus/isa/com.h
index 807d390ef83..3574bac9cfb 100644
--- a/src/devices/bus/isa/com.h
+++ b/src/devices/bus/isa/com.h
@@ -21,8 +21,8 @@ class isa8_com_device :
{
public:
// construction/destruction
- isa8_com_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_com_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ isa8_com_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ isa8_com_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -45,7 +45,7 @@ class isa8_com_at_device :
{
public:
// construction/destruction
- isa8_com_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_com_at_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/dectalk.cpp b/src/devices/bus/isa/dectalk.cpp
index 10f8bdb58f4..36e8f78accd 100644
--- a/src/devices/bus/isa/dectalk.cpp
+++ b/src/devices/bus/isa/dectalk.cpp
@@ -5,7 +5,7 @@
const device_type ISA8_DECTALK = &device_creator<dectalk_isa_device>;
-dectalk_isa_device::dectalk_isa_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) :
+dectalk_isa_device::dectalk_isa_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) :
device_t(mconfig, ISA8_DECTALK, "DECTalk-PC", tag, owner, clock, "dectalk_isa", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_cmd(0),
diff --git a/src/devices/bus/isa/dectalk.h b/src/devices/bus/isa/dectalk.h
index 971d8915e96..448124815fd 100644
--- a/src/devices/bus/isa/dectalk.h
+++ b/src/devices/bus/isa/dectalk.h
@@ -13,7 +13,7 @@ class dectalk_isa_device : public device_t,
public device_isa8_card_interface
{
public:
- dectalk_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dectalk_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -43,8 +43,8 @@ protected:
virtual void device_reset() override;
private:
- UINT16 m_cmd, m_stat, m_data, m_dsp_dma, m_ctl;
- UINT8 m_dma, m_vol, m_bio;
+ uint16_t m_cmd, m_stat, m_data, m_dsp_dma, m_ctl;
+ uint8_t m_dma, m_vol, m_bio;
required_device<i80186_cpu_device> m_cpu;
required_device<dac_12bit_r2r_device> m_dac;
diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp
index 1c0a4e78be9..e782c18573b 100644
--- a/src/devices/bus/isa/ega.cpp
+++ b/src/devices/bus/isa/ega.cpp
@@ -570,7 +570,7 @@ ioport_constructor isa8_ega_device::device_input_ports() const
// isa8_ega_device - constructor
//-------------------------------------------------
-isa8_ega_device::isa8_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_ega_device::isa8_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8_EGA, "IBM Enhanced Graphics Adapter", tag, owner, clock, "ega", __FILE__),
device_isa8_card_interface(mconfig, *this), m_crtc_ega(nullptr), m_vram(nullptr), m_videoram(nullptr), m_charA(nullptr), m_charB(nullptr),
m_misc_output(0), m_feature_control(0), m_frame_cnt(0), m_hsync(0), m_vsync(0), m_vblank(0), m_display_enable(0), m_video_mode(0),
@@ -578,7 +578,7 @@ isa8_ega_device::isa8_ega_device(const machine_config &mconfig, const char *tag,
{
}
-isa8_ega_device::isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+isa8_ega_device::isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_isa8_card_interface(mconfig, *this), m_crtc_ega(nullptr), m_vram(nullptr), m_videoram(nullptr), m_charA(nullptr), m_charB(nullptr),
m_misc_output(0), m_feature_control(0), m_frame_cnt(0), m_hsync(0), m_vsync(0), m_vblank(0), m_display_enable(0), m_video_mode(0),
@@ -599,17 +599,17 @@ void isa8_ega_device::device_start()
for (int i = 0; i < 64; i++ )
{
- UINT8 r = ( ( i & 0x04 ) ? 0xAA : 0x00 ) + ( ( i & 0x20 ) ? 0x55 : 0x00 );
- UINT8 g = ( ( i & 0x02 ) ? 0xAA : 0x00 ) + ( ( i & 0x10 ) ? 0x55 : 0x00 );
- UINT8 b = ( ( i & 0x01 ) ? 0xAA : 0x00 ) + ( ( i & 0x08 ) ? 0x55 : 0x00 );
+ uint8_t r = ( ( i & 0x04 ) ? 0xAA : 0x00 ) + ( ( i & 0x20 ) ? 0x55 : 0x00 );
+ uint8_t g = ( ( i & 0x02 ) ? 0xAA : 0x00 ) + ( ( i & 0x10 ) ? 0x55 : 0x00 );
+ uint8_t b = ( ( i & 0x01 ) ? 0xAA : 0x00 ) + ( ( i & 0x08 ) ? 0x55 : 0x00 );
m_palette->set_pen_color( i, r, g, b );
}
if(m_default_bios_tag != "iskr3104")
{
- UINT8 *dst = memregion(subtag("user2").c_str())->base() + 0x0000;
- UINT8 *src = memregion(subtag("user1").c_str())->base() + 0x3fff;
+ uint8_t *dst = memregion(subtag("user2").c_str())->base() + 0x0000;
+ uint8_t *src = memregion(subtag("user1").c_str())->base() + 0x3fff;
int i;
/* Perform the EGA bios address line swaps */
@@ -626,13 +626,13 @@ void isa8_ega_device::device_start()
m_videoram = m_vram->base();
m_plane[0] = m_videoram + 0x00000;
- memset(m_plane[0], 0, sizeof(UINT8) * 0x10000);
+ memset(m_plane[0], 0, sizeof(uint8_t) * 0x10000);
m_plane[1] = m_videoram + 0x10000;
- memset(m_plane[1], 0, sizeof(UINT8) * 0x10000);
+ memset(m_plane[1], 0, sizeof(uint8_t) * 0x10000);
m_plane[2] = m_videoram + 0x20000;
- memset(m_plane[2], 0, sizeof(UINT8) * 0x10000);
+ memset(m_plane[2], 0, sizeof(uint8_t) * 0x10000);
m_plane[3] = m_videoram + 0x30000;
- memset(m_plane[3], 0, sizeof(UINT8) * 0x10000);
+ memset(m_plane[3], 0, sizeof(uint8_t) * 0x10000);
m_crtc_ega = subdevice<crtc_ega_device>(EGA_CRTC_NAME);
@@ -783,7 +783,7 @@ WRITE_LINE_MEMBER( isa8_ega_device::vblank_changed )
CRTC_EGA_ROW_UPDATE( isa8_ega_device::pc_ega_graphics )
{
- UINT16 *p = &bitmap.pix16(y);
+ uint16_t *p = &bitmap.pix16(y);
// logerror( "pc_ega_graphics: y = %d, x_count = %d, ma = %d, ra = %d\n", y, x_count, ma, ra );
@@ -793,8 +793,8 @@ CRTC_EGA_ROW_UPDATE( isa8_ega_device::pc_ega_graphics )
for ( int i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ( ma + i ) & 0x1fff ) | ( ( y & 1 ) << 12 );
- UINT8 data = m_plane[0][offset];
+ uint16_t offset = ( ( ma + i ) & 0x1fff ) | ( ( y & 1 ) << 12 );
+ uint8_t data = m_plane[0][offset];
*p = m_attribute.data[ ( data >> 6 ) ]; p++;
*p = m_attribute.data[ ( data >> 4 ) & 0x03 ]; p++;
@@ -813,19 +813,19 @@ CRTC_EGA_ROW_UPDATE( isa8_ega_device::pc_ega_graphics )
{
// EGA mode
- UINT8 mask = m_attribute.data[0x12] & 0x0f;
+ uint8_t mask = m_attribute.data[0x12] & 0x0f;
for ( int i = 0; i < x_count; i++ )
{
- UINT16 offset = ma + i;
- UINT16 data0 = m_plane[0][offset];
- UINT16 data1 = m_plane[1][offset] << 1;
- UINT16 data2 = m_plane[2][offset] << 2;
- UINT16 data3 = m_plane[3][offset] << 3;
+ uint16_t offset = ma + i;
+ uint16_t data0 = m_plane[0][offset];
+ uint16_t data1 = m_plane[1][offset] << 1;
+ uint16_t data2 = m_plane[2][offset] << 2;
+ uint16_t data3 = m_plane[3][offset] << 3;
for ( int j = 7; j >= 0; j-- )
{
- UINT16 col = ( data0 & 0x01 ) | ( data1 & 0x02 ) | ( data2 & 0x04 ) | ( data3 & 0x08 );
+ uint16_t col = ( data0 & 0x01 ) | ( data1 & 0x02 ) | ( data2 & 0x04 ) | ( data3 & 0x08 );
col &= mask;
@@ -844,19 +844,19 @@ CRTC_EGA_ROW_UPDATE( isa8_ega_device::pc_ega_graphics )
CRTC_EGA_ROW_UPDATE( isa8_ega_device::pc_ega_text )
{
- UINT16 *p = &bitmap.pix16(y);
+ uint16_t *p = &bitmap.pix16(y);
int i;
// logerror( "pc_ega_text: y = %d, x_count = %d, ma = %d, ra = %d\n", y, x_count, ma, ra );
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ma + i;
- UINT8 chr = m_plane[0][ offset ];
- UINT8 attr = m_plane[1][ offset ];
- UINT8 data;
- UINT16 fg = m_attribute.data[ attr & 0x07 ];
- UINT16 bg = m_attribute.data[ ( attr >> 4 ) & 0x07 ];
+ uint16_t offset = ma + i;
+ uint8_t chr = m_plane[0][ offset ];
+ uint8_t attr = m_plane[1][ offset ];
+ uint8_t data;
+ uint16_t fg = m_attribute.data[ attr & 0x07 ];
+ uint16_t bg = m_attribute.data[ ( attr >> 4 ) & 0x07 ];
/* If character set A and B are equal attribute bit 3 is used as intensity */
if ( m_charA == m_charB )
@@ -961,7 +961,7 @@ void isa8_ega_device::change_mode()
READ8_MEMBER( isa8_ega_device::read )
{
- UINT8 data = 0xFF;
+ uint8_t data = 0xFF;
if ( !space.debugger_access() && ! ( m_sequencer.data[4] & 0x04 ) )
{
@@ -997,9 +997,9 @@ READ8_MEMBER( isa8_ega_device::read )
}
-UINT8 isa8_ega_device::alu_op( UINT8 data, UINT8 latch_data )
+uint8_t isa8_ega_device::alu_op( uint8_t data, uint8_t latch_data )
{
- UINT8 mask = m_graphics_controller.data[8];
+ uint8_t mask = m_graphics_controller.data[8];
switch( m_graphics_controller.data[3] & 0x18 )
{
@@ -1021,9 +1021,9 @@ UINT8 isa8_ega_device::alu_op( UINT8 data, UINT8 latch_data )
WRITE8_MEMBER( isa8_ega_device::write )
{
- UINT8 d[4];
- UINT8 alu[4];
- UINT8 target_mask = m_graphics_controller.data[8];
+ uint8_t d[4];
+ uint8_t alu[4];
+ uint8_t target_mask = m_graphics_controller.data[8];
alu[0] =alu[1] = alu[2] = alu[3] = 0;
@@ -1286,7 +1286,7 @@ READ8_MEMBER(isa8_ega_device::pc_ega8_3c0_r )
/* Feature Read */
case 2:
{
- UINT8 dips = ioport("config")->read();
+ uint8_t dips = ioport("config")->read();
data = ( data & 0x0f );
data |= ( ( m_feature_control & 0x03 ) << 5 );
@@ -1313,18 +1313,18 @@ READ8_MEMBER(isa8_ega_device::pc_ega8_3c0_r )
WRITE8_MEMBER(isa8_ega_device::pc_ega8_3c0_w )
{
- static const UINT8 ar_reg_mask[0x20] =
+ static const uint8_t ar_reg_mask[0x20] =
{
0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,
0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,
0x7F, 0x3F, 0x3F, 0x0F, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
- static const UINT8 sr_reg_mask[0x08] =
+ static const uint8_t sr_reg_mask[0x08] =
{
0x03, 0x0F, 0x0F, 0x0F, 0x07, 0x00, 0x00, 0x00
};
- static const UINT8 gr_reg_mask[0x10] =
+ static const uint8_t gr_reg_mask[0x10] =
{
0x0F, 0x0F, 0x0F, 0x1F, 0x07, 0x3F, 0x0F, 0x0F,
0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
diff --git a/src/devices/bus/isa/ega.h b/src/devices/bus/isa/ega.h
index 6c09f34214c..9f40b1c577e 100644
--- a/src/devices/bus/isa/ega.h
+++ b/src/devices/bus/isa/ega.h
@@ -21,8 +21,8 @@ class isa8_ega_device :
{
public:
// construction/destruction
- isa8_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ isa8_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -51,7 +51,7 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- UINT8 alu_op( UINT8 data, UINT8 latch_data );
+ uint8_t alu_op( uint8_t data, uint8_t latch_data );
public:
crtc_ega_device *m_crtc_ega;
@@ -63,43 +63,43 @@ public:
/* Video memory and related variables */
memory_region *m_vram;
- UINT8 *m_plane[4];
- UINT8 m_read_latch[4];
- UINT8 *m_videoram;
- UINT8 *m_charA;
- UINT8 *m_charB;
+ uint8_t *m_plane[4];
+ uint8_t m_read_latch[4];
+ uint8_t *m_videoram;
+ uint8_t *m_charA;
+ uint8_t *m_charB;
/* Registers */
- UINT8 m_misc_output;
- UINT8 m_feature_control;
+ uint8_t m_misc_output;
+ uint8_t m_feature_control;
/* Attribute registers AR00 - AR14
*/
struct {
- UINT8 index;
- UINT8 data[32];
- UINT8 index_write;
+ uint8_t index;
+ uint8_t data[32];
+ uint8_t index_write;
} m_attribute;
/* Sequencer registers SR00 - SR04
*/
struct {
- UINT8 index;
- UINT8 data[8];
+ uint8_t index;
+ uint8_t data[8];
} m_sequencer;
/* Graphics controller registers GR00 - GR08
*/
struct {
- UINT8 index;
- UINT8 data[16];
+ uint8_t index;
+ uint8_t data[16];
} m_graphics_controller;
- UINT8 m_frame_cnt;
- UINT8 m_hsync;
- UINT8 m_vsync;
- UINT8 m_vblank;
- UINT8 m_display_enable;
+ uint8_t m_frame_cnt;
+ uint8_t m_hsync;
+ uint8_t m_vsync;
+ uint8_t m_vblank;
+ uint8_t m_display_enable;
int m_video_mode;
required_device<palette_device> m_palette;
};
diff --git a/src/devices/bus/isa/fdc.cpp b/src/devices/bus/isa/fdc.cpp
index a7698784a26..c3b1d18eb69 100644
--- a/src/devices/bus/isa/fdc.cpp
+++ b/src/devices/bus/isa/fdc.cpp
@@ -72,7 +72,7 @@ static MACHINE_CONFIG_FRAGMENT( cfg_superio )
MACHINE_CONFIG_END
-isa8_fdc_device::isa8_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+isa8_fdc_device::isa8_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_isa8_card_interface(mconfig, *this),
fdc(*this, "fdc")
@@ -100,12 +100,12 @@ WRITE_LINE_MEMBER( isa8_fdc_device::drq_w )
m_isa->drq2_w(state ? ASSERT_LINE : CLEAR_LINE);
}
-UINT8 isa8_fdc_device::dack_r(int line)
+uint8_t isa8_fdc_device::dack_r(int line)
{
return fdc->dma_r();
}
-void isa8_fdc_device::dack_w(int line, UINT8 data)
+void isa8_fdc_device::dack_w(int line, uint8_t data)
{
return fdc->dma_w(data);
}
@@ -115,7 +115,7 @@ void isa8_fdc_device::eop_w(int state)
fdc->tc_w(state == ASSERT_LINE);
}
-isa8_fdc_xt_device::isa8_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_XT, "ISA 8bits XT FDC hookup", tag, owner, clock, "isa8_fdc_xt", __FILE__)
+isa8_fdc_xt_device::isa8_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : isa8_fdc_device(mconfig, ISA8_FDC_XT, "ISA 8bits XT FDC hookup", tag, owner, clock, "isa8_fdc_xt", __FILE__)
{
}
@@ -124,7 +124,7 @@ machine_config_constructor isa8_fdc_xt_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME(cfg_xt);
}
-isa8_fdc_at_device::isa8_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_AT, "ISA 8bits AT FDC hookup", tag, owner, clock, "isa8_fdc_at", __FILE__)
+isa8_fdc_at_device::isa8_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : isa8_fdc_device(mconfig, ISA8_FDC_AT, "ISA 8bits AT FDC hookup", tag, owner, clock, "isa8_fdc_at", __FILE__)
{
}
@@ -133,7 +133,7 @@ machine_config_constructor isa8_fdc_at_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME(cfg_at);
}
-isa8_fdc_smc_device::isa8_fdc_smc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_XT, "ISA 8bits SMC FDC hookup", tag, owner, clock, "isa8_fdc_smc", __FILE__)
+isa8_fdc_smc_device::isa8_fdc_smc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : isa8_fdc_device(mconfig, ISA8_FDC_XT, "ISA 8bits SMC FDC hookup", tag, owner, clock, "isa8_fdc_smc", __FILE__)
{
}
@@ -142,7 +142,7 @@ machine_config_constructor isa8_fdc_smc_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME(cfg_smc);
}
-isa8_fdc_ps2_device::isa8_fdc_ps2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_PS2, "ISA 8bits PS/2 FDC hookup", tag, owner, clock, "isa8_fdc_ps2", __FILE__)
+isa8_fdc_ps2_device::isa8_fdc_ps2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : isa8_fdc_device(mconfig, ISA8_FDC_PS2, "ISA 8bits PS/2 FDC hookup", tag, owner, clock, "isa8_fdc_ps2", __FILE__)
{
}
@@ -151,7 +151,7 @@ machine_config_constructor isa8_fdc_ps2_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME(cfg_ps2);
}
-isa8_fdc_superio_device::isa8_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : isa8_fdc_device(mconfig, ISA8_FDC_SUPERIO, "ISA 8bits SUPERIO FDC hookup", tag, owner, clock, "isa8_fdc_superio", __FILE__)
+isa8_fdc_superio_device::isa8_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : isa8_fdc_device(mconfig, ISA8_FDC_SUPERIO, "ISA 8bits SUPERIO FDC hookup", tag, owner, clock, "isa8_fdc_superio", __FILE__)
{
}
diff --git a/src/devices/bus/isa/fdc.h b/src/devices/bus/isa/fdc.h
index 1848df8cd0a..bed6389036c 100644
--- a/src/devices/bus/isa/fdc.h
+++ b/src/devices/bus/isa/fdc.h
@@ -26,7 +26,7 @@ class isa8_fdc_device :
{
public:
// construction/destruction
- isa8_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ isa8_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
required_device<pc_fdc_interface> fdc;
@@ -39,38 +39,38 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 dack_r(int line) override;
- virtual void dack_w(int line, UINT8 data) override;
+ virtual uint8_t dack_r(int line) override;
+ virtual void dack_w(int line, uint8_t data) override;
virtual void eop_w(int state) override;
};
class isa8_fdc_xt_device : public isa8_fdc_device {
public:
- isa8_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
class isa8_fdc_at_device : public isa8_fdc_device {
public:
- isa8_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
class isa8_fdc_smc_device : public isa8_fdc_device {
public:
- isa8_fdc_smc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_fdc_smc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
class isa8_fdc_ps2_device : public isa8_fdc_device {
public:
- isa8_fdc_ps2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_fdc_ps2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
class isa8_fdc_superio_device : public isa8_fdc_device {
public:
- isa8_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
diff --git a/src/devices/bus/isa/finalchs.cpp b/src/devices/bus/isa/finalchs.cpp
index 6a41348ad78..53001ee026b 100644
--- a/src/devices/bus/isa/finalchs.cpp
+++ b/src/devices/bus/isa/finalchs.cpp
@@ -89,7 +89,7 @@ machine_config_constructor isa8_finalchs_device::device_mconfig_additions() cons
// isa8_finalchs_device - constructor
//-------------------------------------------------
-isa8_finalchs_device::isa8_finalchs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+isa8_finalchs_device::isa8_finalchs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ISA8_FINALCHS, "Final Chess Card", tag, owner, clock, "finalchs", __FILE__),
device_isa8_card_interface( mconfig, *this ), m_FCH_latch_data(0)
{
diff --git a/src/devices/bus/isa/finalchs.h b/src/devices/bus/isa/finalchs.h
index b21af6000f0..a7dfa9b71d7 100644
--- a/src/devices/bus/isa/finalchs.h
+++ b/src/devices/bus/isa/finalchs.h
@@ -20,7 +20,7 @@ class isa8_finalchs_device :
{
public:
// construction/destruction
- isa8_finalchs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_finalchs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER(finalchs_r);
DECLARE_WRITE8_MEMBER(finalchs_w);
@@ -40,7 +40,7 @@ protected:
private:
// internal state
- UINT8 m_FCH_latch_data;
+ uint8_t m_FCH_latch_data;
};
diff --git a/src/devices/bus/isa/gblaster.cpp b/src/devices/bus/isa/gblaster.cpp
index 3f36f791c69..59bd7086b85 100644
--- a/src/devices/bus/isa/gblaster.cpp
+++ b/src/devices/bus/isa/gblaster.cpp
@@ -96,7 +96,7 @@ machine_config_constructor isa8_gblaster_device::device_mconfig_additions() cons
// isa8_gblaster_device - constructor
//-------------------------------------------------
-isa8_gblaster_device::isa8_gblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_gblaster_device::isa8_gblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8_GAME_BLASTER, "Game Blaster Sound Card", tag, owner, clock, "isa_gblaster", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_saa1099_1(*this, "saa1099.1"),
diff --git a/src/devices/bus/isa/gblaster.h b/src/devices/bus/isa/gblaster.h
index 7dad823033a..69a580fbdee 100644
--- a/src/devices/bus/isa/gblaster.h
+++ b/src/devices/bus/isa/gblaster.h
@@ -21,7 +21,7 @@ class isa8_gblaster_device :
{
public:
// construction/destruction
- isa8_gblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_gblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -39,7 +39,7 @@ private:
// internal state
required_device<saa1099_device> m_saa1099_1;
required_device<saa1099_device> m_saa1099_2;
- UINT8 detect_reg;
+ uint8_t detect_reg;
};
diff --git a/src/devices/bus/isa/gus.cpp b/src/devices/bus/isa/gus.cpp
index b4294d306ce..165937ea771 100644
--- a/src/devices/bus/isa/gus.cpp
+++ b/src/devices/bus/isa/gus.cpp
@@ -20,7 +20,7 @@
//#define SAVE_WAVE_RAM 1
//#define LOG_SOUND 1
-static const UINT16 rate_table[33] =
+static const uint16_t rate_table[33] =
{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
44100, 41160, 38587, 36317, 34300, 32494, 30870, 29400,
@@ -28,7 +28,7 @@ static const UINT16 rate_table[33] =
20580, 19916, 19293
};
-static const UINT16 volume_ramp_table[4] =
+static const uint16_t volume_ramp_table[4] =
{
1, 8, 64, 512
};
@@ -62,7 +62,7 @@ void gf1_device::update_irq()
/* only the Adlib timers are implemented in hardware */
READ8_MEMBER( gf1_device::adlib_r )
{
- UINT8 retVal = 0xff;
+ uint8_t retVal = 0xff;
switch(offset)
{
case 0:
@@ -241,7 +241,7 @@ void gf1_device::device_timer(emu_timer &timer, device_timer_id id, int param, v
void gf1_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
int x,y;
- //UINT32 count;
+ //uint32_t count;
stream_sample_t* outputl = outputs[0];
stream_sample_t* outputr = outputs[1];
@@ -252,10 +252,10 @@ void gf1_device::sound_stream_update(sound_stream &stream, stream_sample_t **inp
{
stream_sample_t* left = outputl;
stream_sample_t* right = outputr;
- UINT16 vol = (m_volume_table[(m_voice[x].current_vol & 0xfff0) >> 4]);
+ uint16_t vol = (m_volume_table[(m_voice[x].current_vol & 0xfff0) >> 4]);
for(y=samples-1; y>=0; y--)
{
- UINT32 current = m_voice[x].current_addr >> 9;
+ uint32_t current = m_voice[x].current_addr >> 9;
// TODO: implement proper panning
(*left) += ((m_voice[x].sample) * (vol/8192.0));
(*right) += ((m_voice[x].sample) * (vol/8192.0));
@@ -323,11 +323,11 @@ void gf1_device::sound_stream_update(sound_stream &stream, stream_sample_t **inp
if(m_voice[x].voice_ctrl & 0x04)
{ // 16-bit PCM
current = ((m_voice[x].current_addr >> 9) & 0xc0000) + (((m_voice[x].current_addr >> 9) & 0x1ffff) << 1);
- m_voice[x].sample = (INT16)((m_wave_ram[current & 0xffffe]) | ((m_wave_ram[(current & 0xffffe)+1])<<8));
+ m_voice[x].sample = (int16_t)((m_wave_ram[current & 0xffffe]) | ((m_wave_ram[(current & 0xffffe)+1])<<8));
}
else
{ // 8-bit PCM
- m_voice[x].sample = (INT16)(m_wave_ram[current & 0xfffff] << 8);
+ m_voice[x].sample = (int16_t)(m_wave_ram[current & 0xfffff] << 8);
}
if(m_voice[x].voice_ctrl & 0x40) // voice direction
m_voice[x].current_addr -= (m_voice[x].freq_ctrl >> 1);
@@ -335,7 +335,7 @@ void gf1_device::sound_stream_update(sound_stream &stream, stream_sample_t **inp
m_voice[x].current_addr += (m_voice[x].freq_ctrl >> 1);
}
#ifdef LOG_SOUND
- INT16 smp = (m_voice[x].sample) * (vol / 8192.0);
+ int16_t smp = (m_voice[x].sample) * (vol / 8192.0);
fwrite(&smp,4,1,f);
#endif
}
@@ -350,7 +350,7 @@ void gf1_device::sound_stream_update(sound_stream &stream, stream_sample_t **inp
// gf1_device - constructor
//-------------------------------------------------
-gf1_device::gf1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+gf1_device::gf1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
acia6850_device(mconfig, GGF1, "Gravis GF1", tag, owner, clock, "gf1", __FILE__),
device_sound_interface( mconfig, *this ), m_dma_dram_ctrl(0), m_dma_start_addr(0), m_dram_addr(0), m_timer_ctrl(0), m_timer1_count(0), m_timer2_count(0), m_timer1_value(0), m_timer2_value(0), m_sampling_freq(0), m_sampling_ctrl(0), m_joy_trim_dac(0), m_reset(0), m_active_voices(0), m_irq_source(0), m_stream(nullptr), m_timer1(nullptr), m_timer2(nullptr), m_dmatimer(nullptr), m_voltimer(nullptr), m_current_voice(0), m_current_reg(0), m_adlib_cmd(0), m_mix_ctrl(0), m_gf1_irq(0), m_midi_irq(0), m_dma_channel1(0), m_dma_channel2(0), m_irq_combine(0), m_dma_combine(0), m_adlib_timer_cmd(0), m_adlib_timer1_enable(0), m_adlib_timer2_enable(0), m_adlib_status(0), m_adlib_data(0), m_voice_irq_ptr(0), m_voice_irq_current(0), m_dma_16bit(0), m_statread(0), m_sb_data_2xc(0), m_sb_data_2xe(0), m_reg_ctrl(0), m_fake_adlib_status(0), m_dma_current(0), m_txirq(0), m_rxirq(0),
m_txirq_handler(*this),
@@ -413,7 +413,7 @@ void gf1_device::device_start()
for (i=4095;i>=0;i--)
{
- m_volume_table[i] = (INT16)out;
+ m_volume_table[i] = (int16_t)out;
out /= 1.002709201; /* 0.0235 dB Steps */
}
@@ -479,7 +479,7 @@ WRITE8_MEMBER(gf1_device::global_reg_select_w)
READ8_MEMBER(gf1_device::global_reg_data_r)
{
- UINT16 ret;
+ uint16_t ret;
switch(m_current_reg)
{
@@ -1068,7 +1068,7 @@ WRITE8_MEMBER(gf1_device::mix_ctrl_w)
READ8_MEMBER(gf1_device::sb_r)
{
- UINT8 val;
+ uint8_t val;
switch(offset)
{
@@ -1125,7 +1125,7 @@ WRITE8_MEMBER(gf1_device::sb2x6_w)
READ8_MEMBER(gf1_device::stat_r)
{
- UINT8 val = m_statread & 0xf9;
+ uint8_t val = m_statread & 0xf9;
if(m_mix_ctrl & 0x08)
val |= 0x02;
return val;
@@ -1136,7 +1136,7 @@ WRITE8_MEMBER(gf1_device::stat_w)
m_reg_ctrl = data;
}
-void gf1_device::set_irq(UINT8 source, UINT8 voice)
+void gf1_device::set_irq(uint8_t source, uint8_t voice)
{
if(source & IRQ_WAVETABLE)
{
@@ -1157,7 +1157,7 @@ void gf1_device::set_irq(UINT8 source, UINT8 voice)
}
}
-void gf1_device::reset_irq(UINT8 source)
+void gf1_device::reset_irq(uint8_t source)
{
if(source & IRQ_WAVETABLE)
{
@@ -1172,12 +1172,12 @@ void gf1_device::reset_irq(UINT8 source)
}
// TODO: support 16-bit transfers
-UINT8 gf1_device::dack_r(int line)
+uint8_t gf1_device::dack_r(int line)
{
return m_wave_ram[m_dma_current++ & 0xfffff];
}
-void gf1_device::dack_w(int line,UINT8 data)
+void gf1_device::dack_w(int line,uint8_t data)
{
if(m_dma_dram_ctrl & 0x80) // flip data MSB
{
@@ -1273,7 +1273,7 @@ ioport_constructor isa16_gus_device::device_input_ports() const
}
-isa16_gus_device::isa16_gus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_gus_device::isa16_gus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA16_GUS, "Gravis Ultrasound", tag, owner, clock, "isa_gus", __FILE__),
device_isa16_card_interface( mconfig, *this ),
m_gf1(*this, "gf1"), m_irq_status(0)
@@ -1430,7 +1430,7 @@ READ8_MEMBER(isa16_gus_device::joy_r)
{
if(offset == 1)
{
- UINT8 data;
+ uint8_t data;
int delta;
attotime new_time = machine().time();
@@ -1552,7 +1552,7 @@ WRITE_LINE_MEMBER(isa16_gus_device::drq2_w)
}
}
-void isa16_gus_device::set_irq(UINT8 source)
+void isa16_gus_device::set_irq(uint8_t source)
{
m_irq_status |= source;
@@ -1583,7 +1583,7 @@ void isa16_gus_device::set_irq(UINT8 source)
logerror("GUS: Set IRQ %02x\n",source);
}
-void isa16_gus_device::reset_irq(UINT8 source)
+void isa16_gus_device::reset_irq(uint8_t source)
{
m_irq_status &= ~source;
@@ -1614,7 +1614,7 @@ void isa16_gus_device::reset_irq(UINT8 source)
logerror("GUS: Reset IRQ %02x\n",source);
}
-void isa16_gus_device::set_midi_irq(UINT8 source)
+void isa16_gus_device::set_midi_irq(uint8_t source)
{
m_irq_status |= source;
@@ -1645,7 +1645,7 @@ void isa16_gus_device::set_midi_irq(UINT8 source)
logerror("GUS: Set MIDI IRQ %02x\n",source);
}
-void isa16_gus_device::reset_midi_irq(UINT8 source)
+void isa16_gus_device::reset_midi_irq(uint8_t source)
{
m_irq_status &= ~source;
@@ -1704,7 +1704,7 @@ WRITE_LINE_MEMBER( isa16_gus_device::nmi_w)
m_isa->nmi();
}
-UINT8 isa16_gus_device::dack_r(int line)
+uint8_t isa16_gus_device::dack_r(int line)
{
if(line == m_gf1->dma_channel1())
return m_gf1->dack_r(line);
@@ -1712,7 +1712,7 @@ UINT8 isa16_gus_device::dack_r(int line)
return 0;
}
-void isa16_gus_device::dack_w(int line,UINT8 data)
+void isa16_gus_device::dack_w(int line,uint8_t data)
{
if(line == m_gf1->dma_channel1())
m_gf1->dack_w(line,data);
diff --git a/src/devices/bus/isa/gus.h b/src/devices/bus/isa/gus.h
index 0370fd6ed80..cac3c7241a5 100644
--- a/src/devices/bus/isa/gus.h
+++ b/src/devices/bus/isa/gus.h
@@ -99,20 +99,20 @@
struct gus_voice
{
- UINT8 voice_ctrl;
- UINT16 freq_ctrl;
- UINT32 start_addr;
- UINT32 end_addr;
- UINT8 vol_ramp_rate;
- UINT8 vol_ramp_start;
- UINT8 vol_ramp_end;
- UINT16 current_vol;
- UINT32 current_addr;
- UINT8 pan_position;
- UINT8 vol_ramp_ctrl;
- UINT32 vol_count;
+ uint8_t voice_ctrl;
+ uint16_t freq_ctrl;
+ uint32_t start_addr;
+ uint32_t end_addr;
+ uint8_t vol_ramp_rate;
+ uint8_t vol_ramp_start;
+ uint8_t vol_ramp_end;
+ uint16_t current_vol;
+ uint32_t current_addr;
+ uint8_t pan_position;
+ uint8_t vol_ramp_ctrl;
+ uint32_t vol_count;
bool rollover;
- INT16 sample; // current sample data
+ int16_t sample; // current sample data
};
class gf1_device :
@@ -121,7 +121,7 @@ class gf1_device :
{
public:
// construction/destruction
- gf1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gf1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_txirq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_txirq_handler.set_callback(object); }
template<class _Object> static devcb_base &set_rxirq_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_rxirq_handler.set_callback(object); }
@@ -136,10 +136,10 @@ public:
template<class _Object> static devcb_base &set_nmi_handler(device_t &device, _Object object) { return downcast<gf1_device &>(device).m_nmi_handler.set_callback(object); }
// current IRQ/DMA channel getters
- UINT8 gf1_irq() { if(m_gf1_irq != 0) return m_gf1_irq; else return m_midi_irq; } // workaround for win95 loading dumb values
- UINT8 midi_irq() { if(m_irq_combine == 0) return m_midi_irq; else return m_gf1_irq; }
- UINT8 dma_channel1() { return m_dma_channel1; }
- UINT8 dma_channel2() { if(m_dma_combine == 0) return m_dma_channel2; else return m_dma_channel1; }
+ uint8_t gf1_irq() { if(m_gf1_irq != 0) return m_gf1_irq; else return m_midi_irq; } // workaround for win95 loading dumb values
+ uint8_t midi_irq() { if(m_irq_combine == 0) return m_midi_irq; else return m_gf1_irq; }
+ uint8_t dma_channel1() { return m_dma_channel1; }
+ uint8_t dma_channel2() { if(m_dma_combine == 0) return m_dma_channel2; else return m_dma_channel1; }
DECLARE_READ8_MEMBER(global_reg_select_r);
DECLARE_WRITE8_MEMBER(global_reg_select_w);
@@ -160,8 +160,8 @@ public:
DECLARE_WRITE8_MEMBER(sb2x6_w);
// DMA signals
- UINT8 dack_r(int line);
- void dack_w(int line,UINT8 data);
+ uint8_t dack_r(int line);
+ void dack_w(int line,uint8_t data);
void eop_w(int state);
// optional information overrides
@@ -172,26 +172,26 @@ public:
gus_voice m_voice[32];
// global registers (not voice-specific)
- UINT8 m_dma_dram_ctrl;
- UINT16 m_dma_start_addr;
- UINT32 m_dram_addr;
- UINT8 m_timer_ctrl;
- UINT8 m_timer1_count;
- UINT8 m_timer2_count;
- UINT8 m_timer1_value;
- UINT8 m_timer2_value;
- UINT16 m_sampling_freq;
- UINT8 m_sampling_ctrl;
- UINT8 m_joy_trim_dac;
- UINT8 m_reset;
- UINT8 m_active_voices;
- UINT8 m_irq_source;
-
- void set_irq(UINT8 source, UINT8 voice);
- void reset_irq(UINT8 source);
+ uint8_t m_dma_dram_ctrl;
+ uint16_t m_dma_start_addr;
+ uint32_t m_dram_addr;
+ uint8_t m_timer_ctrl;
+ uint8_t m_timer1_count;
+ uint8_t m_timer2_count;
+ uint8_t m_timer1_value;
+ uint8_t m_timer2_value;
+ uint16_t m_sampling_freq;
+ uint8_t m_sampling_ctrl;
+ uint8_t m_joy_trim_dac;
+ uint8_t m_reset;
+ uint8_t m_active_voices;
+ uint8_t m_irq_source;
+
+ void set_irq(uint8_t source, uint8_t voice);
+ void reset_irq(uint8_t source);
void update_volume_ramps();
- std::vector<UINT8> m_wave_ram;
+ std::vector<uint8_t> m_wave_ram;
protected:
// device-level overrides
@@ -210,36 +210,36 @@ private:
emu_timer* m_dmatimer;
emu_timer* m_voltimer;
- UINT8 m_current_voice;
- UINT8 m_current_reg;
- //UINT8 m_port;
- //UINT8 m_irq;
- //UINT8 m_dma;
-
- UINT8 m_adlib_cmd;
- UINT8 m_mix_ctrl;
- UINT8 m_gf1_irq;
- UINT8 m_midi_irq;
- UINT8 m_dma_channel1;
- UINT8 m_dma_channel2;
- UINT8 m_irq_combine;
- UINT8 m_dma_combine;
- UINT8 m_adlib_timer_cmd;
- UINT8 m_adlib_timer1_enable;
- UINT8 m_adlib_timer2_enable;
- UINT8 m_adlib_status;
- UINT8 m_adlib_data;
- UINT8 m_voice_irq_fifo[32];
- UINT8 m_voice_irq_ptr;
- UINT8 m_voice_irq_current;
- UINT8 m_dma_16bit; // set by bit 6 of the DMA DRAM control reg
- UINT8 m_statread;
- UINT8 m_sb_data_2xc;
- UINT8 m_sb_data_2xe;
- UINT8 m_reg_ctrl;
- UINT8 m_fake_adlib_status;
- UINT32 m_dma_current;
- UINT16 m_volume_table[4096];
+ uint8_t m_current_voice;
+ uint8_t m_current_reg;
+ //uint8_t m_port;
+ //uint8_t m_irq;
+ //uint8_t m_dma;
+
+ uint8_t m_adlib_cmd;
+ uint8_t m_mix_ctrl;
+ uint8_t m_gf1_irq;
+ uint8_t m_midi_irq;
+ uint8_t m_dma_channel1;
+ uint8_t m_dma_channel2;
+ uint8_t m_irq_combine;
+ uint8_t m_dma_combine;
+ uint8_t m_adlib_timer_cmd;
+ uint8_t m_adlib_timer1_enable;
+ uint8_t m_adlib_timer2_enable;
+ uint8_t m_adlib_status;
+ uint8_t m_adlib_data;
+ uint8_t m_voice_irq_fifo[32];
+ uint8_t m_voice_irq_ptr;
+ uint8_t m_voice_irq_current;
+ uint8_t m_dma_16bit; // set by bit 6 of the DMA DRAM control reg
+ uint8_t m_statread;
+ uint8_t m_sb_data_2xc;
+ uint8_t m_sb_data_2xe;
+ uint8_t m_reg_ctrl;
+ uint8_t m_fake_adlib_status;
+ uint32_t m_dma_current;
+ uint16_t m_volume_table[4096];
static const device_timer_id ADLIB_TIMER1 = 0;
static const device_timer_id ADLIB_TIMER2 = 1;
@@ -267,11 +267,11 @@ class isa16_gus_device :
public device_isa16_card_interface
{
public:
- isa16_gus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- void set_irq(UINT8 source);
- void reset_irq(UINT8 source);
- void set_midi_irq(UINT8 source);
- void reset_midi_irq(UINT8 source);
+ isa16_gus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ void set_irq(uint8_t source);
+ void reset_irq(uint8_t source);
+ void set_midi_irq(uint8_t source);
+ void reset_midi_irq(uint8_t source);
DECLARE_READ8_MEMBER(board_r);
DECLARE_READ8_MEMBER(synth_r);
@@ -295,8 +295,8 @@ public:
DECLARE_WRITE_LINE_MEMBER(write_acia_clock);
// DMA overrides
- virtual UINT8 dack_r(int line) override;
- virtual void dack_w(int line,UINT8 data) override;
+ virtual uint8_t dack_r(int line) override;
+ virtual void dack_w(int line,uint8_t data) override;
virtual void eop_w(int state) override;
// optional information overrides
@@ -312,7 +312,7 @@ protected:
private:
required_device<gf1_device> m_gf1;
- UINT8 m_irq_status;
+ uint8_t m_irq_status;
attotime m_joy_time;
};
diff --git a/src/devices/bus/isa/hdc.cpp b/src/devices/bus/isa/hdc.cpp
index 5ab75da6644..50859730064 100644
--- a/src/devices/bus/isa/hdc.cpp
+++ b/src/devices/bus/isa/hdc.cpp
@@ -161,7 +161,7 @@ const device_type XT_HDC = &device_creator<xt_hdc_device>;
const device_type EC1841_HDC = &device_creator<ec1841_device>;
const device_type ST11M_HDC = &device_creator<st11m_device>;
-xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, XT_HDC, "Generic PC-XT Fixed Disk Controller", tag, owner, clock, "xt_hdc", __FILE__), buffer_ptr(nullptr), csb(0), status(0), error(0), m_current_cmd(0),
m_irq_handler(*this),
m_drq_handler(*this), drv(0), timer(nullptr), data_cnt(0), hdc_control(0), hdcdma_src(nullptr), hdcdma_dst(nullptr), hdcdma_read(0), hdcdma_write(0), hdcdma_size(0)
@@ -169,14 +169,14 @@ xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, dev
m_type = STANDARD;
}
-xt_hdc_device::xt_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+xt_hdc_device::xt_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), buffer_ptr(nullptr), csb(0), status(0), error(0), m_type(0), m_current_cmd(0),
m_irq_handler(*this),
m_drq_handler(*this), drv(0), timer(nullptr), data_cnt(0), hdc_control(0), hdcdma_src(nullptr), hdcdma_dst(nullptr), hdcdma_read(0), hdcdma_write(0), hdcdma_size(0)
{
}
-ec1841_device::ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ec1841_device::ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
xt_hdc_device(mconfig, EC1841_HDC, "EC1841 Fixed Disk Controller", tag, owner, clock, "ec1481", __FILE__),
m_irq_handler(*this),
m_drq_handler(*this)
@@ -184,7 +184,7 @@ ec1841_device::ec1841_device(const machine_config &mconfig, const char *tag, dev
m_type = EC1841;
}
-st11m_device::st11m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+st11m_device::st11m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
xt_hdc_device(mconfig, EC1841_HDC, "Seagate ST11M Fixed Disk Controller", tag, owner, clock, "st11m", __FILE__),
m_irq_handler(*this),
m_drq_handler(*this)
@@ -323,7 +323,7 @@ int xt_hdc_device::get_lbasector()
int xt_hdc_device::dack_r()
{
- UINT8 result;
+ uint8_t result;
hard_disk_info *info;
hard_disk_file *file;
@@ -368,7 +368,7 @@ int xt_hdc_device::dack_r()
int xt_hdc_device::dack_rs()
{
- UINT8 result;
+ uint8_t result;
logerror("%s dack_rs(%d %d)\n", machine().describe_context(), hdcdma_read, hdcdma_size);
@@ -866,9 +866,9 @@ void xt_hdc_device::control_w(int data)
-UINT8 xt_hdc_device::data_r()
+uint8_t xt_hdc_device::data_r()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if(!(status & STA_COMMAND) && (m_current_cmd == CMD_READ || m_current_cmd == CMD_READLONG || m_current_cmd == CMD_READSBUFF))
{
@@ -914,7 +914,7 @@ UINT8 xt_hdc_device::data_r()
-UINT8 xt_hdc_device::status_r()
+uint8_t xt_hdc_device::status_r()
{
return status;
}
@@ -972,21 +972,21 @@ ioport_constructor isa8_hdc_device::device_input_ports() const
// isa8_hdc_device - constructor
//-------------------------------------------------
-isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8_HDC, "Fixed Disk Controller Card", tag, owner, clock, "hdc", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_hdc(*this,"hdc"), dip(0)
{
}
-isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_isa8_card_interface(mconfig, *this),
m_hdc(*this,"hdc"), dip(0)
{
}
-isa8_hdc_ec1841_device::isa8_hdc_ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_hdc_ec1841_device::isa8_hdc_ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
isa8_hdc_device( mconfig, ISA8_HDC_EC1841, "EC1841 HDC", tag, owner, clock, "hdc_ec1841", __FILE__),
m_hdc(*this,"hdc")
{
@@ -1023,7 +1023,7 @@ void isa8_hdc_device::device_reset()
*************************************************************************/
READ8_MEMBER( isa8_hdc_device::pc_hdc_r )
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
switch( offset )
{
@@ -1054,7 +1054,7 @@ WRITE8_MEMBER( isa8_hdc_device::pc_hdc_w )
}
-UINT8 isa8_hdc_device::dack_r(int line)
+uint8_t isa8_hdc_device::dack_r(int line)
{
if (m_hdc->get_command() == CMD_READSBUFF)
return m_hdc->dack_rs();
@@ -1062,7 +1062,7 @@ UINT8 isa8_hdc_device::dack_r(int line)
return m_hdc->dack_r();
}
-void isa8_hdc_device::dack_w(int line,UINT8 data)
+void isa8_hdc_device::dack_w(int line,uint8_t data)
{
if (m_hdc->get_command() == CMD_WRITESBUFF)
m_hdc->dack_ws(data);
@@ -1085,7 +1085,7 @@ void isa8_hdc_device::dack_w(int line,UINT8 data)
*/
-UINT8 isa8_hdc_device::pc_hdc_dipswitch_r()
+uint8_t isa8_hdc_device::pc_hdc_dipswitch_r()
{
m_hdc->set_ready();
if (LOG_HDC_STATUS)
diff --git a/src/devices/bus/isa/hdc.h b/src/devices/bus/isa/hdc.h
index 9c43fb50d4a..94b84606a6f 100644
--- a/src/devices/bus/isa/hdc.h
+++ b/src/devices/bus/isa/hdc.h
@@ -31,8 +31,8 @@ class xt_hdc_device :
{
public:
// construction/destruction
- xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- xt_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ xt_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<xt_hdc_device &>(device).m_irq_handler.set_callback(object); }
template<class _Object> static devcb_base &set_drq_handler(device_t &device, _Object object) { return downcast<xt_hdc_device &>(device).m_drq_handler.set_callback(object); }
@@ -47,10 +47,10 @@ public:
void reset_w(int data);
void select_w(int data);
void control_w(int data);
- UINT8 data_r();
- UINT8 status_r();
+ uint8_t data_r();
+ uint8_t status_r();
void set_ready();
- UINT8 get_command() { return buffer[0]; }
+ uint8_t get_command() { return buffer[0]; }
bool install_rom() { return (m_type != EC1841); }
protected:
@@ -70,8 +70,8 @@ protected:
void get_chsn();
int test_ready();
- std::vector<UINT8> buffer; /* data buffer */
- UINT8 *buffer_ptr; /* data pointer */
+ std::vector<uint8_t> buffer; /* data buffer */
+ uint8_t *buffer_ptr; /* data pointer */
int csb; /* command status byte */
int status; /* drive status */
int error; /* error code */
@@ -82,7 +82,7 @@ protected:
ST11M
};
int m_type;
- UINT8 m_current_cmd;
+ uint8_t m_current_cmd;
devcb_write_line m_irq_handler;
devcb_write_line m_drq_handler;
@@ -104,11 +104,11 @@ private:
emu_timer *timer;
int data_cnt; /* data count */
- UINT8 hdc_control;
+ uint8_t hdc_control;
- UINT8 hdcdma_data[512];
- UINT8 *hdcdma_src;
- UINT8 *hdcdma_dst;
+ uint8_t hdcdma_data[512];
+ uint8_t *hdcdma_src;
+ uint8_t *hdcdma_dst;
int hdcdma_read;
int hdcdma_write;
int hdcdma_size;
@@ -117,7 +117,7 @@ private:
class ec1841_device : public xt_hdc_device
{
public:
- ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
devcb_write_line m_irq_handler;
devcb_write_line m_drq_handler;
@@ -126,7 +126,7 @@ protected:
class st11m_device : public xt_hdc_device
{
public:
- st11m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ st11m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
devcb_write_line m_irq_handler;
@@ -145,8 +145,8 @@ class isa8_hdc_device :
{
public:
// construction/destruction
- isa8_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ isa8_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ isa8_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
DECLARE_READ8_MEMBER(pc_hdc_r);
DECLARE_WRITE8_MEMBER(pc_hdc_w);
@@ -163,9 +163,9 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
public:
- virtual UINT8 dack_r(int line) override;
- virtual void dack_w(int line,UINT8 data) override;
- UINT8 pc_hdc_dipswitch_r();
+ virtual uint8_t dack_r(int line) override;
+ virtual void dack_w(int line,uint8_t data) override;
+ uint8_t pc_hdc_dipswitch_r();
int dip; /* dip switches */
};
@@ -174,7 +174,7 @@ public:
class isa8_hdc_ec1841_device : public isa8_hdc_device
{
public:
- isa8_hdc_ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_hdc_ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp
index 1163023a219..223af4ed0dd 100644
--- a/src/devices/bus/isa/ibm_mfc.cpp
+++ b/src/devices/bus/isa/ibm_mfc.cpp
@@ -313,7 +313,7 @@ MACHINE_CONFIG_END
READ8_MEMBER( isa8_ibm_mfc_device::ibm_mfc_r )
{
- UINT8 val;
+ uint8_t val;
switch (offset)
{
@@ -447,7 +447,7 @@ const tiny_rom_entry *isa8_ibm_mfc_device::device_rom_region() const
// isa8_ibm_mfc_device - constructor
//-------------------------------------------------
-isa8_ibm_mfc_device::isa8_ibm_mfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_ibm_mfc_device::isa8_ibm_mfc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8_IBM_MFC, "IBM PC Music Feature Card", tag, owner, clock, "ibm_mfc", __FILE__),
device_isa8_card_interface(mconfig, *this), m_tcr(0), m_pc_ppi_c(0), m_z80_ppi_c(0), m_pc_irq_state(0), m_z80_irq_state(0),
m_cpu(*this, "ibm_mfc"),
diff --git a/src/devices/bus/isa/ibm_mfc.h b/src/devices/bus/isa/ibm_mfc.h
index d3942365db1..192d14d5f3a 100644
--- a/src/devices/bus/isa/ibm_mfc.h
+++ b/src/devices/bus/isa/ibm_mfc.h
@@ -30,7 +30,7 @@ class isa8_ibm_mfc_device : public device_t,
{
public:
// Construction/destruction
- isa8_ibm_mfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_ibm_mfc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER( ppi0_i_a );
DECLARE_WRITE8_MEMBER( ppi0_o_b );
@@ -68,12 +68,12 @@ private:
void update_pc_interrupts(void);
void update_z80_interrupts(void);
- UINT8 m_tcr;
- UINT8 m_pc_ppi_c;
- UINT8 m_z80_ppi_c;
+ uint8_t m_tcr;
+ uint8_t m_pc_ppi_c;
+ uint8_t m_z80_ppi_c;
- UINT8 m_pc_irq_state;
- UINT8 m_z80_irq_state;
+ uint8_t m_pc_irq_state;
+ uint8_t m_z80_irq_state;
required_device<cpu_device> m_cpu;
required_device<ym2151_device> m_ym2151;
diff --git a/src/devices/bus/isa/ide.cpp b/src/devices/bus/isa/ide.cpp
index 6508aaa94cd..9d32d017496 100644
--- a/src/devices/bus/isa/ide.cpp
+++ b/src/devices/bus/isa/ide.cpp
@@ -99,7 +99,7 @@ ioport_constructor isa16_ide_device::device_input_ports() const
// isa16_ide_device - constructor
//-------------------------------------------------
-isa16_ide_device::isa16_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+isa16_ide_device::isa16_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ISA16_IDE, "IDE Fixed Drive Adapter", tag, owner, clock, "isa_ide", __FILE__),
device_isa16_card_interface( mconfig, *this ),
m_is_primary(true),
diff --git a/src/devices/bus/isa/ide.h b/src/devices/bus/isa/ide.h
index 7a59e15da20..84088fd2783 100644
--- a/src/devices/bus/isa/ide.h
+++ b/src/devices/bus/isa/ide.h
@@ -20,7 +20,7 @@ class isa16_ide_device : public device_t,
{
public:
// construction/destruction
- isa16_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/isa.cpp b/src/devices/bus/isa/isa.cpp
index 94f6b7bf9b9..86c6a4f9687 100644
--- a/src/devices/bus/isa/isa.cpp
+++ b/src/devices/bus/isa/isa.cpp
@@ -23,7 +23,7 @@ const device_type ISA8_SLOT = &device_creator<isa8_slot_device>;
//-------------------------------------------------
// isa8_slot_device - constructor
//-------------------------------------------------
-isa8_slot_device::isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_slot_device::isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8_SLOT, "ISA8_SLOT", tag, owner, clock, "isa8_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_owner(nullptr),
@@ -31,7 +31,7 @@ isa8_slot_device::isa8_slot_device(const machine_config &mconfig, const char *ta
{
}
-isa8_slot_device::isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+isa8_slot_device::isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this), m_owner(nullptr), m_isa_tag(nullptr)
{
@@ -73,7 +73,7 @@ const device_type ISA16_SLOT = &device_creator<isa16_slot_device>;
//-------------------------------------------------
// isa16_slot_device - constructor
//-------------------------------------------------
-isa16_slot_device::isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_slot_device::isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
isa8_slot_device(mconfig, ISA16_SLOT, "ISA16_SLOT", tag, owner, clock, "isa16_slot", __FILE__)
{
}
@@ -134,7 +134,7 @@ void isa8_device::device_config_complete()
// isa8_device - constructor
//-------------------------------------------------
-isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8, "ISA8", tag, owner, clock, "isa8", __FILE__),
device_memory_interface(mconfig, *this),
m_program_config("ISA 8-bit program", ENDIANNESS_LITTLE, 8, 24, 0, nullptr),
@@ -162,7 +162,7 @@ isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_
m_allocspaces = false;
}
-isa8_device::isa8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+isa8_device::isa8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_memory_interface(mconfig, *this),
m_program_config("ISA 8-bit program", ENDIANNESS_LITTLE, 8, 24, 0, nullptr),
@@ -210,7 +210,7 @@ WRITE8_MEMBER(isa8_device::io_w)
m_iospace->write_byte(offset, data);
}
-void isa8_device::set_dma_channel(UINT8 channel, device_isa8_card_interface *dev, bool do_eop)
+void isa8_device::set_dma_channel(uint8_t channel, device_isa8_card_interface *dev, bool do_eop)
{
m_dma_device[channel] = dev;
m_dma_eop[channel] = do_eop;
@@ -319,7 +319,7 @@ void isa8_device::install_device(offs_t start, offs_t end, read8_delegate rhandl
}
-void isa8_device::install_bank(offs_t start, offs_t end, const char *tag, UINT8 *data)
+void isa8_device::install_bank(offs_t start, offs_t end, const char *tag, uint8_t *data)
{
m_prgspace->install_readwrite_bank(start, end, 0, tag );
machine().root_device().membank(m_prgspace->device().siblingtag(tag).c_str())->set_base(data);
@@ -333,8 +333,8 @@ void isa8_device::unmap_bank(offs_t start, offs_t end)
void isa8_device::install_rom(device_t *dev, offs_t start, offs_t end, const char *tag, const char *region)
{
if (machine().root_device().memregion("isa")) {
- UINT8 *src = dev->memregion(region)->base();
- UINT8 *dest = machine().root_device().memregion("isa")->base() + start - 0xc0000;
+ uint8_t *src = dev->memregion(region)->base();
+ uint8_t *dest = machine().root_device().memregion("isa")->base() + start - 0xc0000;
memcpy(dest,src, end - start + 1);
} else {
m_prgspace->install_read_bank(start, end, 0, tag);
@@ -369,14 +369,14 @@ WRITE_LINE_MEMBER( isa8_device::drq1_w ) { m_out_drq1_cb(state); }
WRITE_LINE_MEMBER( isa8_device::drq2_w ) { m_out_drq2_cb(state); }
WRITE_LINE_MEMBER( isa8_device::drq3_w ) { m_out_drq3_cb(state); }
-UINT8 isa8_device::dack_r(int line)
+uint8_t isa8_device::dack_r(int line)
{
if (m_dma_device[line])
return m_dma_device[line]->dack_r(line);
return 0xff;
}
-void isa8_device::dack_w(int line,UINT8 data)
+void isa8_device::dack_w(int line,uint8_t data)
{
if (m_dma_device[line])
return m_dma_device[line]->dack_w(line,data);
@@ -432,11 +432,11 @@ device_isa8_card_interface::~device_isa8_card_interface()
{
}
-UINT8 device_isa8_card_interface::dack_r(int line)
+uint8_t device_isa8_card_interface::dack_r(int line)
{
return 0;
}
-void device_isa8_card_interface::dack_w(int line,UINT8 data)
+void device_isa8_card_interface::dack_w(int line,uint8_t data)
{
}
void device_isa8_card_interface::eop_w(int state)
@@ -461,7 +461,7 @@ const device_type ISA16 = &device_creator<isa16_device>;
// isa16_device - constructor
//-------------------------------------------------
-isa16_device::isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_device::isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
isa8_device(mconfig, ISA16, "ISA16", tag, owner, clock, "isa16", __FILE__),
m_out_irq10_cb(*this),
m_out_irq11_cb(*this),
@@ -556,7 +556,7 @@ WRITE16_MEMBER(isa16_device::io16_w)
READ16_MEMBER(isa16_device::prog16_swap_r)
{
- UINT16 rv;
+ uint16_t rv;
mem_mask = (mem_mask<<8) | (mem_mask>>8);
rv = m_prgspace->read_word(offset<<1, mem_mask);
@@ -573,7 +573,7 @@ WRITE16_MEMBER(isa16_device::prog16_swap_w)
READ16_MEMBER(isa16_device::io16_swap_r)
{
- UINT16 rv;
+ uint16_t rv;
mem_mask = (mem_mask<<8) | (mem_mask>>8);
rv = m_iospace->read_word(offset<<1, mem_mask);
@@ -601,14 +601,14 @@ WRITE_LINE_MEMBER( isa16_device::drq5_w ) { m_out_drq5_cb(state); }
WRITE_LINE_MEMBER( isa16_device::drq6_w ) { m_out_drq6_cb(state); }
WRITE_LINE_MEMBER( isa16_device::drq7_w ) { m_out_drq7_cb(state); }
-UINT16 isa16_device::dack16_r(int line)
+uint16_t isa16_device::dack16_r(int line)
{
if (m_dma_device[line])
return dynamic_cast<device_isa16_card_interface *>(m_dma_device[line])->dack16_r(line);
return 0xffff;
}
-void isa16_device::dack16_w(int line,UINT16 data)
+void isa16_device::dack16_w(int line,uint16_t data)
{
if (m_dma_device[line])
return dynamic_cast<device_isa16_card_interface *>(m_dma_device[line])->dack16_w(line,data);
@@ -637,11 +637,11 @@ void device_isa16_card_interface::set_isa_device()
m_isa = dynamic_cast<isa16_device *>(m_isa_dev);
}
-UINT16 device_isa16_card_interface::dack16_r(int line)
+uint16_t device_isa16_card_interface::dack16_r(int line)
{
return 0;
}
-void device_isa16_card_interface::dack16_w(int line,UINT16 data)
+void device_isa16_card_interface::dack16_w(int line,uint16_t data)
{
}
diff --git a/src/devices/bus/isa/isa.h b/src/devices/bus/isa/isa.h
index 3552b72dab0..cd389f4b365 100644
--- a/src/devices/bus/isa/isa.h
+++ b/src/devices/bus/isa/isa.h
@@ -162,8 +162,8 @@ class isa8_slot_device : public device_t,
{
public:
// construction/destruction
- isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -186,8 +186,8 @@ class isa8_device : public device_t,
{
public:
// construction/destruction
- isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ isa8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
static void static_set_custom_spaces(device_t &device);
@@ -216,11 +216,11 @@ public:
}
void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler);
- template<typename T> void install_device(offs_t addrstart, offs_t addrend, T &device, void (T::*map)(class address_map &map, device_t &device), int bits = 8, UINT64 unitmask = U64(0xffffffffffffffff))
+ template<typename T> void install_device(offs_t addrstart, offs_t addrend, T &device, void (T::*map)(class address_map &map, device_t &device), int bits = 8, uint64_t unitmask = U64(0xffffffffffffffff))
{
m_iospace->install_device(addrstart, addrend, device, map, bits, unitmask);
}
- void install_bank(offs_t start, offs_t end, const char *tag, UINT8 *data);
+ void install_bank(offs_t start, offs_t end, const char *tag, uint8_t *data);
void install_rom(device_t *dev, offs_t start, offs_t end, const char *tag, const char *region);
void install_memory(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler);
@@ -245,14 +245,14 @@ public:
DECLARE_READ8_MEMBER(io_r);
DECLARE_WRITE8_MEMBER(io_w);
- UINT8 dack_r(int line);
- void dack_w(int line,UINT8 data);
+ uint8_t dack_r(int line);
+ void dack_w(int line,uint8_t data);
void eop_w(int channels, int state);
void nmi();
void set_nmi_state(bool enabled) { m_nmi_enabled = enabled; }
- virtual void set_dma_channel(UINT8 channel, device_isa8_card_interface *dev, bool do_eop);
+ virtual void set_dma_channel(uint8_t channel, device_isa8_card_interface *dev, bool do_eop);
const address_space_config m_program_config, m_io_config, m_program16_config, m_io16_config;
@@ -310,8 +310,8 @@ public:
void set_isa_device();
// configuration access
- virtual UINT8 dack_r(int line);
- virtual void dack_w(int line,UINT8 data);
+ virtual uint8_t dack_r(int line);
+ virtual void dack_w(int line,uint8_t data);
virtual void eop_w(int state);
// inline configuration
@@ -328,7 +328,7 @@ class isa16_slot_device : public isa8_slot_device
{
public:
// construction/destruction
- isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -345,7 +345,7 @@ class isa16_device : public isa8_device
{
public:
// construction/destruction
- isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_out_irq10_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_irq10_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_irq11_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_irq11_cb.set_callback(object); }
@@ -383,8 +383,8 @@ public:
DECLARE_WRITE_LINE_MEMBER( drq6_w );
DECLARE_WRITE_LINE_MEMBER( drq7_w );
- UINT16 dack16_r(int line);
- void dack16_w(int line,UINT16 data);
+ uint16_t dack16_r(int line);
+ void dack16_w(int line,uint16_t data);
// 16 bit accessors for ISA-defined address spaces
DECLARE_READ16_MEMBER(prog16_r);
@@ -429,8 +429,8 @@ public:
// construction/destruction
device_isa16_card_interface(const machine_config &mconfig, device_t &device);
virtual ~device_isa16_card_interface();
- virtual UINT16 dack16_r(int line);
- virtual void dack16_w(int line,UINT16 data);
+ virtual uint16_t dack16_r(int line);
+ virtual void dack16_w(int line,uint16_t data);
void set_isa_device();
isa16_device *m_isa;
diff --git a/src/devices/bus/isa/lpt.cpp b/src/devices/bus/isa/lpt.cpp
index e6d2cea232e..6d43df86307 100644
--- a/src/devices/bus/isa/lpt.cpp
+++ b/src/devices/bus/isa/lpt.cpp
@@ -12,7 +12,7 @@
const device_type ISA8_LPT = &device_creator<isa8_lpt_device>;
-isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8_LPT, "Printer Adapter", tag, owner, clock, "isa_lpt", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_is_primary(false)
diff --git a/src/devices/bus/isa/lpt.h b/src/devices/bus/isa/lpt.h
index 6626198b430..c559c4df162 100644
--- a/src/devices/bus/isa/lpt.h
+++ b/src/devices/bus/isa/lpt.h
@@ -23,7 +23,7 @@ class isa8_lpt_device : public device_t,
{
public:
// construction/destruction
- isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/mach32.cpp b/src/devices/bus/isa/mach32.cpp
index f041455a9ad..0ebcaac07ef 100644
--- a/src/devices/bus/isa/mach32.cpp
+++ b/src/devices/bus/isa/mach32.cpp
@@ -22,14 +22,14 @@ const device_type ATIMACH64_8514A = &device_creator<mach64_8514a_device>;
*/
// 8514/A device
-mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: mach8_device(mconfig, ATIMACH32_8514A, "ATi mach32 (2D acceleration module)", tag, owner, clock, "mach32_8514a", __FILE__),
m_chip_ID(0),
m_membounds(0)
{
}
-mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: mach8_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_chip_ID(0),
m_membounds(0)
@@ -38,13 +38,13 @@ mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, device_t
// SVGA device
-mach32_device::mach32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mach32_device::mach32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ati_vga_device(mconfig, ATIMACH32, "ATi mach32", tag, owner, clock, "mach32", __FILE__),
m_8514a(*this,"8514a")
{
}
-mach32_device::mach32_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mach32_device::mach32_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: ati_vga_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_8514a(*this,"8514a")
{
@@ -95,25 +95,25 @@ void mach32_device::device_reset()
*/
// 8514/A device
-mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: mach32_8514a_device(mconfig, ATIMACH64_8514A, "ATi mach64 (2D acceleration module)", tag, owner, clock, "mach64_8514a", __FILE__)
{
}
-mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: mach32_8514a_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
// SVGA device
-mach64_device::mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mach64_device::mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: mach32_device(mconfig, ATIMACH64, "ATi mach64", tag, owner, clock, "mach64", __FILE__),
m_8514a(*this,"8514a")
{
}
-mach64_device::mach64_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+mach64_device::mach64_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: mach32_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_8514a(*this,"8514a")
{
diff --git a/src/devices/bus/isa/mach32.h b/src/devices/bus/isa/mach32.h
index 4f57f55faf9..cc3e2ebdf3a 100644
--- a/src/devices/bus/isa/mach32.h
+++ b/src/devices/bus/isa/mach32.h
@@ -18,8 +18,8 @@ class mach32_8514a_device : public mach8_device
{
public:
// construction/destruction
- mach32_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- mach32_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mach32_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mach32_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
DECLARE_READ16_MEMBER(mach32_chipid_r) { return m_chip_ID; }
DECLARE_WRITE16_MEMBER(mach32_clksel_w) { mach8.clksel = data; } // read only on the mach8
@@ -31,8 +31,8 @@ protected:
virtual void device_reset() override;
virtual void device_config_complete() override;
- UINT16 m_chip_ID;
- UINT16 m_membounds;
+ uint16_t m_chip_ID;
+ uint16_t m_membounds;
};
// main SVGA device
@@ -40,8 +40,8 @@ class mach32_device : public ati_vga_device
{
public:
// construction/destruction
- mach32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- mach32_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mach32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mach32_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
required_device<mach32_8514a_device> m_8514a; // provides accelerated 2D drawing, derived from the Mach8 device
@@ -137,8 +137,8 @@ class mach64_8514a_device : public mach32_8514a_device
{
public:
// construction/destruction
- mach64_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- mach64_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mach64_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mach64_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
virtual void device_start() override;
@@ -151,8 +151,8 @@ class mach64_device : public mach32_device
{
public:
// construction/destruction
- mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- mach64_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mach64_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
required_device<mach64_8514a_device> m_8514a; // provides accelerated 2D drawing, derived from the Mach8 device
diff --git a/src/devices/bus/isa/mc1502_fdc.cpp b/src/devices/bus/isa/mc1502_fdc.cpp
index 73f8d5bd568..38217bb9978 100644
--- a/src/devices/bus/isa/mc1502_fdc.cpp
+++ b/src/devices/bus/isa/mc1502_fdc.cpp
@@ -85,16 +85,16 @@ TIMER_CALLBACK_MEMBER(mc1502_fdc_device::motor_callback)
motor_on = 0;
}
-UINT8 mc1502_fdc_device::mc1502_wd17xx_aux_r()
+uint8_t mc1502_fdc_device::mc1502_wd17xx_aux_r()
{
- UINT8 data;
+ uint8_t data;
data = 0;
return data;
}
-void mc1502_fdc_device::mc1502_wd17xx_aux_w(UINT8 data)
+void mc1502_fdc_device::mc1502_wd17xx_aux_w(uint8_t data)
{
floppy_image_device *floppy0 = m_fdc->subdevice<floppy_connector>("0")->get_device();
floppy_image_device *floppy1 = m_fdc->subdevice<floppy_connector>("1")->get_device();
@@ -123,7 +123,7 @@ void mc1502_fdc_device::mc1502_wd17xx_aux_w(UINT8 data)
/*
* Accesses to this port block (halt the CPU until DRQ, INTRQ or MOTOR ON)
*/
-UINT8 mc1502_fdc_device::mc1502_wd17xx_drq_r()
+uint8_t mc1502_fdc_device::mc1502_wd17xx_drq_r()
{
cpu_device *maincpu = machine().device<cpu_device>("maincpu");
@@ -136,7 +136,7 @@ UINT8 mc1502_fdc_device::mc1502_wd17xx_drq_r()
return m_fdc->drq_r();
}
-UINT8 mc1502_fdc_device::mc1502_wd17xx_motor_r()
+uint8_t mc1502_fdc_device::mc1502_wd17xx_motor_r()
{
return motor_on;
}
@@ -151,7 +151,7 @@ WRITE_LINE_MEMBER( mc1502_fdc_device::mc1502_fdc_irq_drq )
READ8_MEMBER( mc1502_fdc_device::mc1502_fdc_r )
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
switch( offset )
{
@@ -165,7 +165,7 @@ READ8_MEMBER( mc1502_fdc_device::mc1502_fdc_r )
READ8_MEMBER( mc1502_fdc_device::mc1502_fdcv2_r )
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
switch( offset )
{
@@ -189,7 +189,7 @@ WRITE8_MEMBER( mc1502_fdc_device::mc1502_fdc_w )
// mc1502_fdc_device - constructor
//-------------------------------------------------
-mc1502_fdc_device::mc1502_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mc1502_fdc_device::mc1502_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, MC1502_FDC, "MC-1502 floppy", tag, owner, clock, "mc1502_fdc", __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_fdc(*this, "fdc"), motor_on(0), motor_timer(nullptr)
diff --git a/src/devices/bus/isa/mc1502_fdc.h b/src/devices/bus/isa/mc1502_fdc.h
index c01316ec1ef..af53b9c8984 100644
--- a/src/devices/bus/isa/mc1502_fdc.h
+++ b/src/devices/bus/isa/mc1502_fdc.h
@@ -26,7 +26,7 @@ class mc1502_fdc_device : public device_t,
{
public:
// construction/destruction
- mc1502_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc1502_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -50,10 +50,10 @@ private:
emu_timer *motor_timer;
public:
- void mc1502_wd17xx_aux_w(UINT8 data);
- UINT8 mc1502_wd17xx_aux_r();
- UINT8 mc1502_wd17xx_drq_r();
- UINT8 mc1502_wd17xx_motor_r();
+ void mc1502_wd17xx_aux_w(uint8_t data);
+ uint8_t mc1502_wd17xx_aux_r();
+ uint8_t mc1502_wd17xx_drq_r();
+ uint8_t mc1502_wd17xx_motor_r();
};
diff --git a/src/devices/bus/isa/mc1502_rom.cpp b/src/devices/bus/isa/mc1502_rom.cpp
index e61e2410a7e..877fa1bb389 100644
--- a/src/devices/bus/isa/mc1502_rom.cpp
+++ b/src/devices/bus/isa/mc1502_rom.cpp
@@ -44,7 +44,7 @@ const tiny_rom_entry *mc1502_rom_device::device_rom_region() const
// mc1502_rom_device - constructor
//-------------------------------------------------
-mc1502_rom_device::mc1502_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mc1502_rom_device::mc1502_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, MC1502_ROM, "MC-1502 ROM cart", tag, owner, clock, "mc1502_rom", __FILE__),
device_isa8_card_interface( mconfig, *this )
{
diff --git a/src/devices/bus/isa/mc1502_rom.h b/src/devices/bus/isa/mc1502_rom.h
index f55911d485f..e4b4a89c2f8 100644
--- a/src/devices/bus/isa/mc1502_rom.h
+++ b/src/devices/bus/isa/mc1502_rom.h
@@ -23,7 +23,7 @@ class mc1502_rom_device : public device_t,
{
public:
// construction/destruction
- mc1502_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mc1502_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/isa/mcd.cpp b/src/devices/bus/isa/mcd.cpp
index d2cb19356e8..e525039e3fd 100644
--- a/src/devices/bus/isa/mcd.cpp
+++ b/src/devices/bus/isa/mcd.cpp
@@ -35,7 +35,7 @@ ioport_constructor mcd_isa_device::device_input_ports() const
// mcd_isa_device - constructor
//-------------------------------------------------
-mcd_isa_device::mcd_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mcd_isa_device::mcd_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
cdrom_image_device(mconfig, ISA16_MCD, "Mitsumi ISA CDROM Adapter", tag, owner, clock, "mcd_isa", __FILE__),
device_isa16_card_interface( mconfig, *this )
{
@@ -84,7 +84,7 @@ bool mcd_isa_device::read_sector(bool first)
m_data = false;
return false;
}
- UINT32 lba = msf_to_lba(m_readmsf);
+ uint32_t lba = msf_to_lba(m_readmsf);
cdrom_read_data(m_cdrom_handle, lba - 150, m_buf, m_mode & 0x40 ? CD_TRACK_MODE1_RAW : CD_TRACK_MODE1);
if(m_mode & 0x40)
{
@@ -106,7 +106,7 @@ bool mcd_isa_device::read_sector(bool first)
READ8_MEMBER(mcd_isa_device::flag_r)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
m_isa->irq5_w(CLEAR_LINE);
if(!m_buf_count || !m_data || m_dma) // if dma enabled the cpu will never not see that flag as it will be halted
ret |= FLAG_NODATA;
@@ -124,7 +124,7 @@ READ8_MEMBER(mcd_isa_device::data_r)
}
else if(m_buf_count)
{
- UINT8 ret = m_buf_idx < 2352 ? m_buf[m_buf_idx++] : 0;
+ uint8_t ret = m_buf_idx < 2352 ? m_buf[m_buf_idx++] : 0;
m_buf_count--;
if(!m_buf_count)
read_sector();
@@ -133,11 +133,11 @@ READ8_MEMBER(mcd_isa_device::data_r)
return m_stat;
}
-UINT16 mcd_isa_device::dack16_r(int line)
+uint16_t mcd_isa_device::dack16_r(int line)
{
if(m_buf_count & ~1)
{
- UINT16 ret = 0;
+ uint16_t ret = 0;
if(m_buf_idx < 2351)
{
ret = m_buf[m_buf_idx++];
@@ -246,7 +246,7 @@ WRITE8_MEMBER(mcd_isa_device::cmd_w)
case CMD_GET_INFO:
if(m_cdrom_handle)
{
- UINT32 first = lba_to_msf(150), last = lba_to_msf(cdrom_get_track_start(m_cdrom_handle, 0xaa));
+ uint32_t first = lba_to_msf(150), last = lba_to_msf(cdrom_get_track_start(m_cdrom_handle, 0xaa));
m_cmdbuf[1] = 1;
m_cmdbuf[2] = dec_2_bcd(cdrom_get_last_track(m_cdrom_handle));
m_cmdbuf[3] = dec_2_bcd((last >> 16) & 0xff);
@@ -269,8 +269,8 @@ WRITE8_MEMBER(mcd_isa_device::cmd_w)
if(m_cdrom_handle)
{
int tracks = cdrom_get_last_track(m_cdrom_handle);
- UINT32 start = lba_to_msf(cdrom_get_track_start(m_cdrom_handle, m_curtoctrk));
- UINT32 end = lba_to_msf(cdrom_get_track_start(m_cdrom_handle, m_curtoctrk < tracks ? m_curtoctrk + 1 : 0xaa));
+ uint32_t start = lba_to_msf(cdrom_get_track_start(m_cdrom_handle, m_curtoctrk));
+ uint32_t end = lba_to_msf(cdrom_get_track_start(m_cdrom_handle, m_curtoctrk < tracks ? m_curtoctrk + 1 : 0xaa));
m_cmdbuf[1] = (cdrom_get_adr_control(m_cdrom_handle, m_curtoctrk) << 4) & 0xf0;
m_cmdbuf[2] = 0; // track num except when reading toc
m_cmdbuf[3] = dec_2_bcd(m_curtoctrk); // index
diff --git a/src/devices/bus/isa/mcd.h b/src/devices/bus/isa/mcd.h
index 3d8d529ce35..127721b3065 100644
--- a/src/devices/bus/isa/mcd.h
+++ b/src/devices/bus/isa/mcd.h
@@ -20,7 +20,7 @@ class mcd_isa_device : public cdrom_image_device,
{
public:
// construction/destruction
- mcd_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mcd_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -31,7 +31,7 @@ public:
DECLARE_READ8_MEMBER(flag_r);
DECLARE_WRITE8_MEMBER(cmd_w);
DECLARE_WRITE8_MEMBER(reset_w);
- virtual UINT16 dack16_r(int line) override;
+ virtual uint16_t dack16_r(int line) override;
protected:
// device-level overrides
virtual void device_start() override;
@@ -42,22 +42,22 @@ private:
bool m_change;
bool m_newstat;
bool m_data;
- UINT8 m_stat;
- UINT8 m_buf[2352];
+ uint8_t m_stat;
+ uint8_t m_buf[2352];
int m_buf_count;
int m_buf_idx;
- UINT8 m_cmdbuf[16];
+ uint8_t m_cmdbuf[16];
int m_cmdbuf_count;
int m_cmdrd_count;
int m_cmdbuf_idx;
- UINT8 m_mode;
- UINT8 m_cmd;
- UINT8 m_conf;
- UINT8 m_irq;
- UINT8 m_dma;
- UINT16 m_dmalen;
- UINT32 m_readmsf;
- UINT32 m_readcount;
+ uint8_t m_mode;
+ uint8_t m_cmd;
+ uint8_t m_conf;
+ uint8_t m_irq;
+ uint8_t m_dma;
+ uint16_t m_dmalen;
+ uint32_t m_readmsf;
+ uint32_t m_readcount;
bool m_locked;
int m_drvmode;
int m_curtoctrk;
diff --git a/src/devices/bus/isa/mda.cpp b/src/devices/bus/isa/mda.cpp
index aece6b1f740..764cb361aeb 100644
--- a/src/devices/bus/isa/mda.cpp
+++ b/src/devices/bus/isa/mda.cpp
@@ -150,7 +150,7 @@ const tiny_rom_entry *isa8_mda_device::device_rom_region() const
// isa8_mda_device - constructor
//-------------------------------------------------
-isa8_mda_device::isa8_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_mda_device::isa8_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8_MDA, "IBM Monochrome Display and Printer Adapter", tag, owner, clock, "isa_ibm_mda", __FILE__),
device_isa8_card_interface(mconfig, *this), m_framecnt(0), m_mode_control(0),
m_update_row_type(-1), m_chr_gen(nullptr), m_vsync(0), m_hsync(0), m_pixel(0),
@@ -158,7 +158,7 @@ isa8_mda_device::isa8_mda_device(const machine_config &mconfig, const char *tag,
{
}
-isa8_mda_device::isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+isa8_mda_device::isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_isa8_card_interface(mconfig, *this), m_framecnt(0), m_mode_control(0),
m_update_row_type(-1), m_chr_gen(nullptr), m_vsync(0), m_hsync(0), m_pixel(0),
@@ -222,19 +222,19 @@ void isa8_mda_device::device_reset()
MC6845_UPDATE_ROW( isa8_mda_device::mda_text_inten_update_row )
{
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT32 *p = &bitmap.pix32(y);
- UINT16 chr_base = ( ra & 0x08 ) ? 0x800 | ( ra & 0x07 ) : ra;
+ uint32_t *p = &bitmap.pix32(y);
+ uint16_t chr_base = ( ra & 0x08 ) ? 0x800 | ( ra & 0x07 ) : ra;
int i;
if ( y == 0 ) MDA_LOG(1,"mda_text_inten_update_row",("\n"));
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ( ma + i ) << 1 ) & 0x0FFF;
- UINT8 chr = m_videoram[ offset ];
- UINT8 attr = m_videoram[ offset + 1 ];
- UINT8 data = m_chr_gen[ chr_base + chr * 8 ];
- UINT8 fg = ( attr & 0x08 ) ? 3 : 2;
- UINT8 bg = 0;
+ uint16_t offset = ( ( ma + i ) << 1 ) & 0x0FFF;
+ uint8_t chr = m_videoram[ offset ];
+ uint8_t attr = m_videoram[ offset + 1 ];
+ uint8_t data = m_chr_gen[ chr_base + chr * 8 ];
+ uint8_t fg = ( attr & 0x08 ) ? 3 : 2;
+ uint8_t bg = 0;
if ( ( attr & ~0x88 ) == 0 )
{
@@ -295,19 +295,19 @@ MC6845_UPDATE_ROW( isa8_mda_device::mda_text_inten_update_row )
MC6845_UPDATE_ROW( isa8_mda_device::mda_text_blink_update_row )
{
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT32 *p = &bitmap.pix32(y);
- UINT16 chr_base = ( ra & 0x08 ) ? 0x800 | ( ra & 0x07 ) : ra;
+ uint32_t *p = &bitmap.pix32(y);
+ uint16_t chr_base = ( ra & 0x08 ) ? 0x800 | ( ra & 0x07 ) : ra;
int i;
if ( y == 0 ) MDA_LOG(1,"mda_text_blink_update_row",("\n"));
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ( ma + i ) << 1 ) & 0x0FFF;
- UINT8 chr = m_videoram[ offset ];
- UINT8 attr = m_videoram[ offset + 1 ];
- UINT8 data = m_chr_gen[ chr_base + chr * 8 ];
- UINT8 fg = ( attr & 0x08 ) ? 3 : 2;
- UINT8 bg = 0;
+ uint16_t offset = ( ( ma + i ) << 1 ) & 0x0FFF;
+ uint8_t chr = m_videoram[ offset ];
+ uint8_t attr = m_videoram[ offset + 1 ];
+ uint8_t data = m_chr_gen[ chr_base + chr * 8 ];
+ uint8_t fg = ( attr & 0x08 ) ? 3 : 2;
+ uint8_t bg = 0;
if ( ( attr & ~0x88 ) == 0 )
{
@@ -587,7 +587,7 @@ const tiny_rom_entry *isa8_hercules_device::device_rom_region() const
// isa8_hercules_device - constructor
//-------------------------------------------------
-isa8_hercules_device::isa8_hercules_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_hercules_device::isa8_hercules_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
isa8_mda_device(mconfig, ISA8_HERCULES, "Hercules Graphics Card", tag, owner, clock, "isa_hercules", __FILE__), m_configuration_switch(0)
{
}
@@ -633,13 +633,13 @@ void isa8_hercules_device::device_reset()
MC6845_UPDATE_ROW( isa8_hercules_device::hercules_gfx_update_row )
{
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT32 *p = &bitmap.pix32(y);
- UINT16 gfx_base = ( ( m_mode_control & 0x80 ) ? 0x8000 : 0x0000 ) | ( ( ra & 0x03 ) << 13 );
+ uint32_t *p = &bitmap.pix32(y);
+ uint16_t gfx_base = ( ( m_mode_control & 0x80 ) ? 0x8000 : 0x0000 ) | ( ( ra & 0x03 ) << 13 );
int i;
if ( y == 0 ) MDA_LOG(1,"hercules_gfx_update_row",("\n"));
for ( i = 0; i < x_count; i++ )
{
- UINT8 data = m_videoram[ gfx_base + ( ( ma + i ) << 1 ) ];
+ uint8_t data = m_videoram[ gfx_base + ( ( ma + i ) << 1 ) ];
*p = palette[( data & 0x80 ) ? 2 : 0]; p++;
*p = palette[( data & 0x40 ) ? 2 : 0]; p++;
@@ -793,7 +793,7 @@ machine_config_constructor isa8_ec1840_0002_device::device_mconfig_additions() c
// isa8_ec1840_0002_device - constructor
//-------------------------------------------------
-isa8_ec1840_0002_device::isa8_ec1840_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_ec1840_0002_device::isa8_ec1840_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
isa8_mda_device( mconfig, ISA8_EC1840_0002, "EC 1840.0002 (MDA)", tag, owner, clock, "ec1840_0002", __FILE__), m_soft_chr_gen(nullptr)
{
}
@@ -806,7 +806,7 @@ void isa8_ec1840_0002_device::device_start()
{
isa8_mda_device::device_start();
- m_soft_chr_gen = std::make_unique<UINT8[]>(0x2000);
+ m_soft_chr_gen = std::make_unique<uint8_t[]>(0x2000);
m_isa->install_bank(0xdc000, 0xddfff, "bank_chargen", m_soft_chr_gen.get());
m_isa->install_bank(0xde000, 0xdffff, "bank_chargen", m_soft_chr_gen.get());
}
@@ -827,19 +827,19 @@ void isa8_ec1840_0002_device::device_reset()
MC6845_UPDATE_ROW( isa8_ec1840_0002_device::mda_lowres_text_inten_update_row )
{
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT32 *p = &bitmap.pix32(y);
- UINT16 chr_base = ra;
+ uint32_t *p = &bitmap.pix32(y);
+ uint16_t chr_base = ra;
int i;
if ( y == 0 ) MDA_LOG(1,"mda_lowres_text_inten_update_row",("\n"));
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ( ma + i ) << 1 ) & 0x0FFF;
- UINT8 chr = m_videoram[ offset ];
- UINT8 attr = m_videoram[ offset + 1 ];
- UINT8 data = m_chr_gen[ (chr_base + chr * 16) << 1 ];
- UINT8 fg = ( attr & 0x08 ) ? 3 : 2;
- UINT8 bg = 0;
+ uint16_t offset = ( ( ma + i ) << 1 ) & 0x0FFF;
+ uint8_t chr = m_videoram[ offset ];
+ uint8_t attr = m_videoram[ offset + 1 ];
+ uint8_t data = m_chr_gen[ (chr_base + chr * 16) << 1 ];
+ uint8_t fg = ( attr & 0x08 ) ? 3 : 2;
+ uint8_t bg = 0;
if ( ( attr & ~0x88 ) == 0 )
{
@@ -891,19 +891,19 @@ MC6845_UPDATE_ROW( isa8_ec1840_0002_device::mda_lowres_text_inten_update_row )
MC6845_UPDATE_ROW( isa8_ec1840_0002_device::mda_lowres_text_blink_update_row )
{
const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT32 *p = &bitmap.pix32(y);
- UINT16 chr_base = ra;
+ uint32_t *p = &bitmap.pix32(y);
+ uint16_t chr_base = ra;
int i;
if ( y == 0 ) MDA_LOG(1,"mda_lowres_text_blink_update_row",("\n"));
for ( i = 0; i < x_count; i++ )
{
- UINT16 offset = ( ( ma + i ) << 1 ) & 0x0FFF;
- UINT8 chr = m_videoram[ offset ];
- UINT8 attr = m_videoram[ offset + 1 ];
- UINT8 data = m_chr_gen[ (chr_base + chr * 16) << 1 ];
- UINT8 fg = ( attr & 0x08 ) ? 3 : 2;
- UINT8 bg = 0;
+ uint16_t offset = ( ( ma + i ) << 1 ) & 0x0FFF;
+ uint8_t chr = m_videoram[ offset ];
+ uint8_t attr = m_videoram[ offset + 1 ];
+ uint8_t data = m_chr_gen[ (chr_base + chr * 16) << 1 ];
+ uint8_t fg = ( attr & 0x08 ) ? 3 : 2;
+ uint8_t bg = 0;
if ( ( attr & ~0x88 ) == 0 )
{
diff --git a/src/devices/bus/isa/mda.h b/src/devices/bus/isa/mda.h
index fc761ead19b..0b214c8c496 100644
--- a/src/devices/bus/isa/mda.h
+++ b/src/devices/bus/isa/mda.h
@@ -22,8 +22,8 @@ public:
friend class isa8_hercules_device;
// construction/destruction
- isa8_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ isa8_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -49,14 +49,14 @@ protected:
public:
int m_framecnt;
- UINT8 m_mode_control;
+ uint8_t m_mode_control;
int m_update_row_type;
- UINT8 *m_chr_gen;
- UINT8 m_vsync;
- UINT8 m_hsync;
- std::vector<UINT8> m_videoram;
- UINT8 m_pixel;
+ uint8_t *m_chr_gen;
+ uint8_t m_vsync;
+ uint8_t m_hsync;
+ std::vector<uint8_t> m_videoram;
+ uint8_t m_pixel;
required_device<palette_device> m_palette;
};
@@ -71,7 +71,7 @@ class isa8_hercules_device :
{
public:
// construction/destruction
- isa8_hercules_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_hercules_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -90,7 +90,7 @@ protected:
virtual void device_reset() override;
public:
- UINT8 m_configuration_switch; //hercules
+ uint8_t m_configuration_switch; //hercules
};
@@ -104,7 +104,7 @@ class isa8_ec1840_0002_device :
{
public:
// construction/destruction
- isa8_ec1840_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_ec1840_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -120,7 +120,7 @@ protected:
virtual void device_reset() override;
public:
- std::unique_ptr<UINT8[]> m_soft_chr_gen;
+ std::unique_ptr<uint8_t[]> m_soft_chr_gen;
};
diff --git a/src/devices/bus/isa/mpu401.cpp b/src/devices/bus/isa/mpu401.cpp
index df78f73b5c2..bb80e14d7e1 100644
--- a/src/devices/bus/isa/mpu401.cpp
+++ b/src/devices/bus/isa/mpu401.cpp
@@ -66,7 +66,7 @@ machine_config_constructor isa8_mpu401_device::device_mconfig_additions() const
// isa8_adlib_device - constructor
//-------------------------------------------------
-isa8_mpu401_device::isa8_mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+isa8_mpu401_device::isa8_mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ISA8_MPU401, "Roland MPU-401 MIDI Interface", tag, owner, clock, "isa_mpu401", __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_mpu401(*this, MPU_CORE_TAG)
diff --git a/src/devices/bus/isa/mpu401.h b/src/devices/bus/isa/mpu401.h
index cdf70fe2acf..c5dca814718 100644
--- a/src/devices/bus/isa/mpu401.h
+++ b/src/devices/bus/isa/mpu401.h
@@ -21,7 +21,7 @@ class isa8_mpu401_device :
{
public:
// construction/destruction
- isa8_mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
required_device<mpu401_device> m_mpu401;
diff --git a/src/devices/bus/isa/mufdc.cpp b/src/devices/bus/isa/mufdc.cpp
index 49425585e62..e85ced13377 100644
--- a/src/devices/bus/isa/mufdc.cpp
+++ b/src/devices/bus/isa/mufdc.cpp
@@ -129,7 +129,7 @@ const tiny_rom_entry *fdcmag_device::device_rom_region() const
// mufdc_device - constructor
//-------------------------------------------------
-mufdc_device::mufdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname) :
+mufdc_device::mufdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const char *name, const char *shortname) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_fdc(*this, "fdc"),
@@ -137,12 +137,12 @@ mufdc_device::mufdc_device(const machine_config &mconfig, device_type type, cons
{
}
-fdc344_device::fdc344_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+fdc344_device::fdc344_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
mufdc_device(mconfig, ISA8_FDC344, tag, owner, clock, "Ably-Tech FDC-344", "fdc344")
{
}
-fdcmag_device::fdcmag_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+fdcmag_device::fdcmag_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
mufdc_device(mconfig, ISA8_FDCMAG, tag, owner, clock, "Magitronic Multi Floppy Controller Card", "fdcmag")
{
}
@@ -187,12 +187,12 @@ WRITE_LINE_MEMBER( mufdc_device::fdc_drq_w )
m_isa->drq2_w(state ? ASSERT_LINE : CLEAR_LINE);
}
-UINT8 mufdc_device::dack_r(int line)
+uint8_t mufdc_device::dack_r(int line)
{
return m_fdc->dma_r();
}
-void mufdc_device::dack_w(int line, UINT8 data)
+void mufdc_device::dack_w(int line, uint8_t data)
{
return m_fdc->dma_w(data);
}
diff --git a/src/devices/bus/isa/mufdc.h b/src/devices/bus/isa/mufdc.h
index abfd8965c94..bd5040a3841 100644
--- a/src/devices/bus/isa/mufdc.h
+++ b/src/devices/bus/isa/mufdc.h
@@ -36,7 +36,7 @@ class mufdc_device : public device_t,
{
public:
// construction/destruction
- mufdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname);
+ mufdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const char *name, const char *shortname);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -54,8 +54,8 @@ protected:
virtual void device_reset() override;
// device_isa8_card_interface
- virtual UINT8 dack_r(int line) override;
- virtual void dack_w(int line, UINT8 data) override;
+ virtual uint8_t dack_r(int line) override;
+ virtual void dack_w(int line, uint8_t data) override;
virtual void eop_w(int state) override;
private:
@@ -67,7 +67,7 @@ class fdc344_device : public mufdc_device
{
public:
// construction/destruction
- fdc344_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fdc344_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -79,7 +79,7 @@ class fdcmag_device : public mufdc_device
{
public:
// construction/destruction
- fdcmag_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fdcmag_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/isa/ne1000.cpp b/src/devices/bus/isa/ne1000.cpp
index 24b37985225..ed4b46df88e 100644
--- a/src/devices/bus/isa/ne1000.cpp
+++ b/src/devices/bus/isa/ne1000.cpp
@@ -16,7 +16,7 @@ machine_config_constructor ne1000_device::device_mconfig_additions() const {
return MACHINE_CONFIG_NAME(ne1000_config);
}
-ne1000_device::ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ne1000_device::ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, NE1000, "NE1000 Network Adapter", tag, owner, clock, "ne1000", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_dp8390(*this, "dp8390d"),
@@ -26,7 +26,7 @@ ne1000_device::ne1000_device(const machine_config &mconfig, const char *tag, dev
void ne1000_device::device_start() {
char mac[7];
- UINT32 num = rand();
+ uint32_t num = rand();
memset(m_prom, 0x57, 16);
sprintf(mac+2, "\x1b%c%c%c", (num >> 16) & 0xff, (num >> 8) & 0xff, num & 0xff);
mac[0] = 0; mac[1] = 0; // avoid gcc warning
diff --git a/src/devices/bus/isa/ne1000.h b/src/devices/bus/isa/ne1000.h
index 96f98673477..8a609cac4ac 100644
--- a/src/devices/bus/isa/ne1000.h
+++ b/src/devices/bus/isa/ne1000.h
@@ -13,7 +13,7 @@ class ne1000_device: public device_t,
public device_isa8_card_interface
{
public:
- ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual ioport_constructor device_input_ports() const override;
@@ -27,9 +27,9 @@ protected:
virtual void device_reset() override;
private:
required_device<dp8390d_device> m_dp8390;
- UINT8 m_irq;
- UINT8 m_board_ram[8*1024];
- UINT8 m_prom[16];
+ uint8_t m_irq;
+ uint8_t m_board_ram[8*1024];
+ uint8_t m_prom[16];
};
extern const device_type NE1000;
diff --git a/src/devices/bus/isa/ne2000.cpp b/src/devices/bus/isa/ne2000.cpp
index 347ab280d7d..8a6e44b8ced 100644
--- a/src/devices/bus/isa/ne2000.cpp
+++ b/src/devices/bus/isa/ne2000.cpp
@@ -17,7 +17,7 @@ machine_config_constructor ne2000_device::device_mconfig_additions() const {
return MACHINE_CONFIG_NAME(ne2000_config);
}
-ne2000_device::ne2000_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock)
+ne2000_device::ne2000_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
: device_t(mconfig, NE2000, "NE2000 Network Adapter", tag, owner, clock, "ne2000", __FILE__),
device_isa16_card_interface(mconfig, *this),
m_dp8390(*this, "dp8390d"),
@@ -27,7 +27,7 @@ ne2000_device::ne2000_device(const machine_config& mconfig, const char* tag, dev
void ne2000_device::device_start() {
char mac[7];
- UINT32 num = rand();
+ uint32_t num = rand();
memset(m_prom, 0x57, 16);
sprintf(mac+2, "\x1b%c%c%c", (num >> 16) & 0xff, (num >> 8) & 0xff, num & 0xff);
mac[0] = 0; mac[1] = 0; // avoid gcc warning
diff --git a/src/devices/bus/isa/ne2000.h b/src/devices/bus/isa/ne2000.h
index ac7d56772a7..f0fbe2057bf 100644
--- a/src/devices/bus/isa/ne2000.h
+++ b/src/devices/bus/isa/ne2000.h
@@ -11,7 +11,7 @@ class ne2000_device: public device_t,
public device_isa16_card_interface
{
public:
- ne2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ne2000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual ioport_constructor device_input_ports() const override;
@@ -25,9 +25,9 @@ protected:
virtual void device_reset() override;
private:
required_device<dp8390d_device> m_dp8390;
- UINT8 m_irq;
- UINT8 m_board_ram[16*1024];
- UINT8 m_prom[16];
+ uint8_t m_irq;
+ uint8_t m_board_ram[16*1024];
+ uint8_t m_prom[16];
};
extern const device_type NE2000;
diff --git a/src/devices/bus/isa/num9rev.cpp b/src/devices/bus/isa/num9rev.cpp
index b37db708490..69a4641206b 100644
--- a/src/devices/bus/isa/num9rev.cpp
+++ b/src/devices/bus/isa/num9rev.cpp
@@ -22,12 +22,12 @@ UPD7220_DISPLAY_PIXELS_MEMBER( isa8_number_9_rev_device::hgdc_display_pixels )
if(!m_1024)
{
rgb_t color(0);
- UINT16 overlay;
+ uint16_t overlay;
if(((address << 3) + 0xc0016) > (1024*1024))
return;
for(int i = 0; i < 16; i++)
{
- UINT32 addr = (address << 3) + i;
+ uint32_t addr = (address << 3) + i;
overlay = m_ram[addr + 0xc0000] << 1;
overlay = m_overlay[overlay + ((m_mode & 8) ? 512 : 0)] | (m_overlay[overlay + 1 + ((m_mode & 8) ? 512 : 0)] << 8);
color.set_r(pal->entry_color(m_ram[addr] | ((overlay & 0xf) << 8)).r());
@@ -77,7 +77,7 @@ machine_config_constructor isa8_number_9_rev_device::device_mconfig_additions()
// isa16_vga_device - constructor
//-------------------------------------------------
-isa8_number_9_rev_device::isa8_number_9_rev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_number_9_rev_device::isa8_number_9_rev_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8_NUM_9_REV, "Number Nine Revolution 512x32/1024x8", tag, owner, clock, "number_9_rev", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_upd7220(*this, "upd7220"),
@@ -121,7 +121,7 @@ READ8_MEMBER(isa8_number_9_rev_device::read8)
return m_ram[offset + ((m_mode & 0xc) << 14)];
else if((m_mode & 4) && !m_1024)
{
- UINT32 newoff = ((offset & 3) << 18) | (m_bank << 14) | ((offset >> 2) & 0x3fff);
+ uint32_t newoff = ((offset & 3) << 18) | (m_bank << 14) | ((offset >> 2) & 0x3fff);
return m_ram[newoff];
}
else
@@ -134,7 +134,7 @@ WRITE8_MEMBER(isa8_number_9_rev_device::write8)
m_ram[offset + (m_bank << 16)] = data;
else if((m_mode & 1) || ((m_mode & 6) == 2))
{
- UINT8 bank = m_bank;
+ uint8_t bank = m_bank;
if(m_mode & 1)
bank = (m_mode & 0xc) >> 2;
else
@@ -153,7 +153,7 @@ WRITE8_MEMBER(isa8_number_9_rev_device::write8)
}
else if(m_mode & 4)
{
- UINT32 newoff = ((offset & 3) << 18) | (m_bank << 14) | ((offset >> 2) & 0x3fff);
+ uint32_t newoff = ((offset & 3) << 18) | (m_bank << 14) | ((offset >> 2) & 0x3fff);
if((newoff >= 0xc0000) && ((m_mode & 6) == 6))
return;
m_ram[newoff] = data;
@@ -198,7 +198,7 @@ WRITE8_MEMBER(isa8_number_9_rev_device::pal8_w)
READ8_MEMBER(isa8_number_9_rev_device::pal12_r)
{
- UINT16 color = offset & 0xfff;
+ uint16_t color = offset & 0xfff;
palette_t *pal = m_palette->palette();
switch(offset & 0xf000)
{
@@ -214,7 +214,7 @@ READ8_MEMBER(isa8_number_9_rev_device::pal12_r)
WRITE8_MEMBER(isa8_number_9_rev_device::pal12_w)
{
- UINT16 color = offset & 0xfff;
+ uint16_t color = offset & 0xfff;
palette_t *pal = m_palette->palette();
rgb_t pen = pal->entry_color(color);
switch(offset & 0xf000)
@@ -310,7 +310,7 @@ WRITE8_MEMBER(isa8_number_9_rev_device::ctrl_w)
}
}
-UINT32 isa8_number_9_rev_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t isa8_number_9_rev_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
rectangle visarea = screen.visible_area();
// try to support the 1024x8 or at least don't crash as there's no way to detect it
diff --git a/src/devices/bus/isa/num9rev.h b/src/devices/bus/isa/num9rev.h
index 4fe64e19019..51f8efbd8f0 100644
--- a/src/devices/bus/isa/num9rev.h
+++ b/src/devices/bus/isa/num9rev.h
@@ -22,7 +22,7 @@ class isa8_number_9_rev_device :
{
public:
// construction/destruction
- isa8_number_9_rev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_number_9_rev_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,7 +41,7 @@ public:
DECLARE_READ8_MEMBER(read8);
DECLARE_WRITE8_MEMBER(write8);
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
protected:
// device-level overrides
virtual void device_start() override;
@@ -49,11 +49,11 @@ protected:
private:
required_device<upd7220_device> m_upd7220;
required_device<palette_device> m_palette;
- std::vector<UINT8> m_ram;
- std::vector<UINT8> m_overlay;
+ std::vector<uint8_t> m_ram;
+ std::vector<uint8_t> m_overlay;
- UINT8 m_bank;
- UINT8 m_mode;
+ uint8_t m_bank;
+ uint8_t m_mode;
bool m_1024;
};
diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp
index fdcfb956146..7b334a24f4c 100644
--- a/src/devices/bus/isa/omti8621.cpp
+++ b/src/devices/bus/isa/omti8621.cpp
@@ -51,7 +51,7 @@ class omti_disk_image_device : public device_t,
{
public:
// construction/destruction
- omti_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ omti_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// image-level overrides
virtual iodevice_t image_type() const override { return IO_HARDDISK; }
@@ -70,26 +70,26 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- void omti_disk_config(UINT16 disk_type);
+ void omti_disk_config(uint16_t disk_type);
private:
template <typename Format, typename... Params> void logerror(Format &&fmt, Params &&... args) const;
public:
- UINT16 m_type;
- UINT16 m_cylinders;
- UINT16 m_heads;
- UINT16 m_sectors;
- UINT32 m_sectorbytes;
- UINT32 m_sector_count;
+ uint16_t m_type;
+ uint16_t m_cylinders;
+ uint16_t m_heads;
+ uint16_t m_sectors;
+ uint32_t m_sectorbytes;
+ uint32_t m_sector_count;
device_image_interface *m_image;
// configuration data
- UINT8 m_config_data[10];
+ uint8_t m_config_data[10];
// ESDI defect list data
- UINT8 m_esdi_defect_list[256];
+ uint8_t m_esdi_defect_list[256];
};
/*
@@ -375,19 +375,19 @@ void omti8621_device::device_reset()
const device_type ISA16_OMTI8621 = &device_creator<omti8621_pc_device>;
-omti8621_pc_device::omti8621_pc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+omti8621_pc_device::omti8621_pc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: omti8621_device(mconfig, ISA16_OMTI8621, tag, owner, clock)
{
}
const device_type ISA16_OMTI8621_APOLLO = &device_creator<omti8621_apollo_device>;
-omti8621_apollo_device::omti8621_apollo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+omti8621_apollo_device::omti8621_apollo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: omti8621_device(mconfig, ISA16_OMTI8621_APOLLO, tag, owner, clock)
{
}
-omti8621_device::omti8621_device(const machine_config &mconfig, device_type type,const char *tag, device_t *owner, UINT32 clock)
+omti8621_device::omti8621_device(const machine_config &mconfig, device_type type,const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, type, "OMTI 8621 ESDI/floppy controller", tag, owner, clock, "omti8621", __FILE__),
device_isa16_card_interface(mconfig, *this),
m_fdc(*this, OMTI_FDC_TAG),
@@ -435,7 +435,7 @@ void omti8621_device::clear_sense_data() {
set_sense_data - set the sense data from code and command descriptor block
***************************************************************************/
-void omti8621_device::set_sense_data(UINT8 code, const UINT8 * cdb) {
+void omti8621_device::set_sense_data(uint8_t code, const uint8_t * cdb) {
LOG2(("set_sense_data code=%x", code));
sense_data[0]=code;
sense_data[1]=cdb[1];
@@ -447,7 +447,7 @@ void omti8621_device::set_sense_data(UINT8 code, const UINT8 * cdb) {
set_configuration_data - set the configuration data for drive lun
***************************************************************************/
-void omti8621_device::set_configuration_data(UINT8 lun) {
+void omti8621_device::set_configuration_data(uint8_t lun) {
LOG2(("set_configuration_data lun=%x", lun));
// initialize the configuration data
@@ -469,7 +469,7 @@ void omti8621_device::set_configuration_data(UINT8 lun) {
get_lun - get logical unit number from a command descriptor block (in bit 5)
***************************************************************************/
-UINT8 omti8621_device::get_lun(const UINT8 * cdb)
+uint8_t omti8621_device::get_lun(const uint8_t * cdb)
{
return (cdb[1] & 0x20) >> 5;
}
@@ -478,18 +478,18 @@ UINT8 omti8621_device::get_lun(const UINT8 * cdb)
check_disk_address - check disk address, set sense data and return true for no error
***************************************************************************/
-UINT8 omti8621_device::check_disk_address(const UINT8 *cdb)
+uint8_t omti8621_device::check_disk_address(const uint8_t *cdb)
{
- UINT8 sense_code = OMTI_SENSE_CODE_NO_ERROR;
- UINT8 lun = get_lun(cdb);
- UINT16 head = cdb[1] & 0x1f;
- UINT16 sector = cdb[2] & 0x3f;
- UINT32 cylinder = cdb[3] + ((cdb[2] & 0xc0) << 2) + ((cdb[1] & 0x80) << 3);
- UINT8 block_count = cdb[4];
+ uint8_t sense_code = OMTI_SENSE_CODE_NO_ERROR;
+ uint8_t lun = get_lun(cdb);
+ uint16_t head = cdb[1] & 0x1f;
+ uint16_t sector = cdb[2] & 0x3f;
+ uint32_t cylinder = cdb[3] + ((cdb[2] & 0xc0) << 2) + ((cdb[1] & 0x80) << 3);
+ uint8_t block_count = cdb[4];
omti_disk_image_device *disk = our_disks[lun];
- UINT32 disk_track = cylinder * disk->m_heads + head;
- UINT32 disk_addr = (disk_track * disk->m_sectors) + sector;
+ uint32_t disk_track = cylinder * disk->m_heads + head;
+ uint32_t disk_addr = (disk_track * disk->m_sectors) + sector;
if (block_count > OMTI_MAX_BLOCK_COUNT) {
LOG(("########### check_disk_address: unexpected block count %x", block_count));
@@ -527,10 +527,10 @@ UINT8 omti8621_device::check_disk_address(const UINT8 *cdb)
get_disk_track - get disk track from a command descriptor block
***************************************************************************/
-UINT32 omti8621_device::get_disk_track(const UINT8 * cdb) {
- UINT8 lun = get_lun(cdb);
- UINT16 head = cdb[1] & 0x1f;
- UINT32 cylinder = cdb[3] + ((cdb[2] & 0xc0) << 2) + ((cdb[1] & 0x80) << 3);
+uint32_t omti8621_device::get_disk_track(const uint8_t * cdb) {
+ uint8_t lun = get_lun(cdb);
+ uint16_t head = cdb[1] & 0x1f;
+ uint32_t cylinder = cdb[3] + ((cdb[2] & 0xc0) << 2) + ((cdb[1] & 0x80) << 3);
return cylinder * our_disks[lun]->m_heads + head;
}
@@ -538,9 +538,9 @@ UINT32 omti8621_device::get_disk_track(const UINT8 * cdb) {
get_disk_address - get disk address from a command descriptor block
***************************************************************************/
-UINT32 omti8621_device::get_disk_address(const UINT8 * cdb) {
- UINT8 lun = get_lun(cdb);
- UINT16 sector = cdb[2] & 0x3f;
+uint32_t omti8621_device::get_disk_address(const uint8_t * cdb) {
+ uint8_t lun = get_lun(cdb);
+ uint16_t sector = cdb[2] & 0x3f;
return get_disk_track(cdb) * our_disks[lun]->m_sectors + sector;
}
@@ -548,7 +548,7 @@ UINT32 omti8621_device::get_disk_address(const UINT8 * cdb) {
set_data_transfer - setup for data transfer from/to data
***************************************************************************/
-void omti8621_device::set_data_transfer(UINT8 *data, UINT16 length)
+void omti8621_device::set_data_transfer(uint8_t *data, uint16_t length)
{
// set controller for read data transfer
omti_state = OMTI_STATE_DATA;
@@ -564,9 +564,9 @@ void omti8621_device::set_data_transfer(UINT8 *data, UINT16 length)
read_sectors_from_disk - read sectors starting at diskaddr into sector_buffer
***************************************************************************/
-void omti8621_device::read_sectors_from_disk(INT32 diskaddr, UINT8 count, UINT8 lun)
+void omti8621_device::read_sectors_from_disk(int32_t diskaddr, uint8_t count, uint8_t lun)
{
- UINT8 *data_buffer = &sector_buffer[0];
+ uint8_t *data_buffer = &sector_buffer[0];
device_image_interface *image = our_disks[lun]->m_image;
while (count-- > 0) {
@@ -584,9 +584,9 @@ void omti8621_device::read_sectors_from_disk(INT32 diskaddr, UINT8 count, UINT8
write_sectors_to_disk - write sectors starting at diskaddr from sector_buffer
***************************************************************************/
-void omti8621_device::write_sectors_to_disk(INT32 diskaddr, UINT8 count, UINT8 lun)
+void omti8621_device::write_sectors_to_disk(int32_t diskaddr, uint8_t count, uint8_t lun)
{
- UINT8 *data_buffer = &sector_buffer[0];
+ uint8_t *data_buffer = &sector_buffer[0];
device_image_interface *image = our_disks[lun]->m_image;
while (count-- > 0) {
@@ -609,7 +609,7 @@ void omti8621_device::write_sectors_to_disk(INT32 diskaddr, UINT8 count, UINT8 l
copy_sectors - copy sectors
***************************************************************************/
-void omti8621_device::copy_sectors(INT32 dst_addr, INT32 src_addr, UINT8 count, UINT8 lun)
+void omti8621_device::copy_sectors(int32_t dst_addr, int32_t src_addr, uint8_t count, uint8_t lun)
{
device_image_interface *image = our_disks[lun]->m_image;
@@ -636,11 +636,11 @@ void omti8621_device::copy_sectors(INT32 dst_addr, INT32 src_addr, UINT8 count,
format track - format a track
***************************************************************************/
-void omti8621_device::format_track(const UINT8 * cdb)
+void omti8621_device::format_track(const uint8_t * cdb)
{
- UINT8 lun = get_lun(cdb);
- UINT32 disk_addr = get_disk_address(cdb);
- UINT32 disk_track = get_disk_track(cdb);
+ uint8_t lun = get_lun(cdb);
+ uint32_t disk_addr = get_disk_address(cdb);
+ uint32_t disk_track = get_disk_track(cdb);
if (diskaddr_ecc_error == disk_addr) {
// reset previous ECC error
@@ -675,7 +675,7 @@ void omti8621_device::format_track(const UINT8 * cdb)
set_esdi_defect_list - setup the (empty) ESDI defect list
***************************************************************************/
-void omti8621_device::set_esdi_defect_list(UINT8 lun, UINT8 head)
+void omti8621_device::set_esdi_defect_list(uint8_t lun, uint8_t head)
{
omti_disk_image_device *disk = our_disks[lun];
@@ -701,7 +701,7 @@ void omti8621_device::logerror(Format &&fmt, Params &&... args) const
log_command - log command from a command descriptor block
***************************************************************************/
-void omti8621_device::log_command(const UINT8 cdb[], const UINT16 cdb_length)
+void omti8621_device::log_command(const uint8_t cdb[], const uint16_t cdb_length)
{
if (verbose > 0) {
int i;
@@ -821,9 +821,9 @@ void omti8621_device::log_data()
do_command
***************************************************************************/
-void omti8621_device::do_command(const UINT8 cdb[], const UINT16 cdb_length)
+void omti8621_device::do_command(const uint8_t cdb[], const uint16_t cdb_length)
{
- UINT8 lun = get_lun(cdb);
+ uint8_t lun = get_lun(cdb);
omti_disk_image_device *disk = our_disks[lun];
int command_duration = 0; // ms
@@ -949,7 +949,7 @@ void omti8621_device::do_command(const UINT8 cdb[], const UINT16 cdb_length)
case OMTI_CMD_WRITE_LONG: // 0xE6
log_data();
if (check_disk_address(cdb)) {
- UINT32 diskaddr = get_disk_address(cdb);
+ uint32_t diskaddr = get_disk_address(cdb);
write_sectors_to_disk(diskaddr, cdb[4], lun);
// this will spoil the ECC code
diskaddr_ecc_error = diskaddr;
@@ -994,7 +994,7 @@ void omti8621_device::do_command(const UINT8 cdb[], const UINT16 cdb_length)
get_command_length
***************************************************************************/
-UINT8 omti8621_device::get_command_length(UINT8 command_byte)
+uint8_t omti8621_device::get_command_length(uint8_t command_byte)
{
return command_byte == OMTI_CMD_COPY ? 10 : 6;
}
@@ -1003,9 +1003,9 @@ UINT8 omti8621_device::get_command_length(UINT8 command_byte)
get_data
***************************************************************************/
-UINT16 omti8621_device::get_data()
+uint16_t omti8621_device::get_data()
{
- UINT16 data = 0xff;
+ uint16_t data = 0xff;
if (data_index < data_length) {
data = data_buffer[data_index++];
data |= data_buffer[data_index++] << 8;
@@ -1024,7 +1024,7 @@ UINT16 omti8621_device::get_data()
set_data
***************************************************************************/
-void omti8621_device::set_data(UINT16 data)
+void omti8621_device::set_data(uint16_t data)
{
if (data_index < data_length) {
data_buffer[data_index++] = data & 0xff;
@@ -1168,8 +1168,8 @@ READ16_MEMBER(omti8621_device::read)
READ8_MEMBER(omti8621_device::read8)
{
- UINT8 data = 0xff;
- static UINT8 last_data = 0xff;
+ uint8_t data = 0xff;
+ static uint8_t last_data = 0xff;
switch (offset) {
case OMTI_PORT_DATA_IN: // 0x00
@@ -1235,7 +1235,7 @@ void omti8621_device::set_verbose(int on_off)
get_sector - get sector diskaddr of logical unit lun into data_buffer
***************************************************************************/
-UINT32 omti8621_apollo_device::get_sector(INT32 diskaddr, UINT8 *data_buffer, UINT32 length, UINT8 lun)
+uint32_t omti8621_apollo_device::get_sector(int32_t diskaddr, uint8_t *data_buffer, uint32_t length, uint8_t lun)
{
omti_disk_image_device *disk = our_disks[lun];
@@ -1261,7 +1261,7 @@ UINT32 omti8621_apollo_device::get_sector(INT32 diskaddr, UINT8 *data_buffer, UI
omti_set_jumper - set OMTI jumpers
***************************************************************************/
-void omti8621_device::set_jumper(UINT16 disk_type)
+void omti8621_device::set_jumper(uint16_t disk_type)
{
LOG1(("set_jumper: disk type=%x", disk_type));
@@ -1289,12 +1289,12 @@ WRITE_LINE_MEMBER( omti8621_device::fdc_drq_w )
m_isa->drq2_w(state ? ASSERT_LINE : CLEAR_LINE);
}
-UINT8 omti8621_device::dack_r(int line)
+uint8_t omti8621_device::dack_r(int line)
{
return m_fdc->dma_r();
}
-void omti8621_device::dack_w(int line, UINT8 data)
+void omti8621_device::dack_w(int line, uint8_t data)
{
return m_fdc->dma_w(data);
}
@@ -1309,7 +1309,7 @@ void omti8621_device::eop_w(int state)
// device type definition
const device_type OMTI_DISK = &device_creator<omti_disk_image_device>;
-omti_disk_image_device::omti_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+omti_disk_image_device::omti_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, OMTI_DISK, "OMTI8621 ESDI disk", tag, owner, clock, "omti_disk_image", __FILE__),
device_image_interface(mconfig, *this), m_type(0), m_cylinders(0), m_heads(0), m_sectors(0), m_sectorbytes(0), m_sector_count(0), m_image(nullptr)
{
@@ -1325,7 +1325,7 @@ void omti_disk_image_device::device_config_complete()
omti_disk_config - configure disk parameters
***************************************************************************/
-void omti_disk_image_device::omti_disk_config(UINT16 disk_type)
+void omti_disk_image_device::omti_disk_config(uint16_t disk_type)
{
LOG1(("omti_disk_config: configuring disk with type %x", disk_type));
@@ -1391,8 +1391,8 @@ void omti_disk_image_device::device_reset()
if (exists() && fseek(0, SEEK_END) == 0)
{
- UINT32 disk_size = (UINT32)(ftell() / OMTI_DISK_SECTOR_SIZE);
- UINT16 disk_type = disk_size >= 300000 ? OMTI_DISK_TYPE_348_MB : OMTI_DISK_TYPE_155_MB;
+ uint32_t disk_size = (uint32_t)(ftell() / OMTI_DISK_SECTOR_SIZE);
+ uint16_t disk_type = disk_size >= 300000 ? OMTI_DISK_TYPE_348_MB : OMTI_DISK_TYPE_155_MB;
if (disk_type != m_type) {
LOG1(("device_reset_omti_disk: disk size=%d blocks, disk type=%x", disk_size, disk_type ));
omti_disk_config(disk_type);
diff --git a/src/devices/bus/isa/omti8621.h b/src/devices/bus/isa/omti8621.h
index 7a81751bbe7..10f3bb6588b 100644
--- a/src/devices/bus/isa/omti8621.h
+++ b/src/devices/bus/isa/omti8621.h
@@ -33,7 +33,7 @@ class omti_disk_image_device;
class omti8621_device : public device_t, public device_isa16_card_interface
{
public:
- omti8621_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock);
+ omti8621_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
~omti8621_device() {}
DECLARE_READ16_MEMBER(read);
@@ -59,8 +59,8 @@ protected:
virtual machine_config_constructor device_mconfig_additions() const override;
virtual ioport_constructor device_input_ports() const override;
- virtual UINT8 dack_r(int line) override;
- virtual void dack_w(int line, UINT8 data) override;
+ virtual uint8_t dack_r(int line) override;
+ virtual void dack_w(int line, uint8_t data) override;
virtual void eop_w(int state) override;
void set_interrupt(enum line_state line_state);
@@ -68,62 +68,62 @@ protected:
omti_disk_image_device *our_disks[OMTI_MAX_LUN+1];
private:
- UINT16 jumper;
+ uint16_t jumper;
- UINT8 omti_state;
+ uint8_t omti_state;
- UINT8 status_port;
- UINT8 config_port;
- UINT8 mask_port;
+ uint8_t status_port;
+ uint8_t config_port;
+ uint8_t mask_port;
// command descriptor block
- UINT8 command_buffer[CDB_SIZE];
+ uint8_t command_buffer[CDB_SIZE];
int command_length;
int command_index;
int command_status;
// data buffer
- std::vector<UINT8> sector_buffer;
- UINT8 *data_buffer;
+ std::vector<uint8_t> sector_buffer;
+ uint8_t *data_buffer;
int data_length;
int data_index;
// sense data
- UINT8 sense_data[4];
+ uint8_t sense_data[4];
// these are used only to satisfy dex
- UINT32 diskaddr_ecc_error;
- UINT32 diskaddr_format_bad_track;
- UINT8 alternate_track_buffer[4];
- UINT32 alternate_track_address[2];
+ uint32_t diskaddr_ecc_error;
+ uint32_t diskaddr_format_bad_track;
+ uint8_t alternate_track_buffer[4];
+ uint32_t alternate_track_address[2];
emu_timer *m_timer;
bool m_installed;
void clear_sense_data();
- void set_sense_data(UINT8 code, const UINT8 * cdb);
- void set_configuration_data(UINT8 lun);
- UINT8 get_lun(const UINT8 * cdb);
- UINT8 check_disk_address(const UINT8 *cdb);
- UINT32 get_disk_track(const UINT8 * cdb);
- UINT32 get_disk_address(const UINT8 * cdb);
- void set_data_transfer(UINT8 *data, UINT16 length);
- void read_sectors_from_disk(INT32 diskaddr, UINT8 count, UINT8 lun);
- void write_sectors_to_disk(INT32 diskaddr, UINT8 count, UINT8 lun);
- void copy_sectors(INT32 dst_addr, INT32 src_addr, UINT8 count, UINT8 lun);
- void format_track(const UINT8 * cdb);
- void set_esdi_defect_list(UINT8 lun, UINT8 head);
+ void set_sense_data(uint8_t code, const uint8_t * cdb);
+ void set_configuration_data(uint8_t lun);
+ uint8_t get_lun(const uint8_t * cdb);
+ uint8_t check_disk_address(const uint8_t *cdb);
+ uint32_t get_disk_track(const uint8_t * cdb);
+ uint32_t get_disk_address(const uint8_t * cdb);
+ void set_data_transfer(uint8_t *data, uint16_t length);
+ void read_sectors_from_disk(int32_t diskaddr, uint8_t count, uint8_t lun);
+ void write_sectors_to_disk(int32_t diskaddr, uint8_t count, uint8_t lun);
+ void copy_sectors(int32_t dst_addr, int32_t src_addr, uint8_t count, uint8_t lun);
+ void format_track(const uint8_t * cdb);
+ void set_esdi_defect_list(uint8_t lun, uint8_t head);
template <typename Format, typename... Params> void logerror(Format &&fmt, Params &&... args) const;
- void log_command(const UINT8 cdb[], const UINT16 cdb_length);
+ void log_command(const uint8_t cdb[], const uint16_t cdb_length);
void log_data();
- void do_command(const UINT8 cdb[], const UINT16 cdb_length);
- UINT8 get_command_length(UINT8 command_byte);
- UINT16 get_data();
- void set_data(UINT16 data);
- void set_jumper(UINT16 disk_type);
+ void do_command(const uint8_t cdb[], const uint16_t cdb_length);
+ uint8_t get_command_length(uint8_t command_byte);
+ uint16_t get_data();
+ void set_data(uint16_t data);
+ void set_jumper(uint16_t disk_type);
DECLARE_READ8_MEMBER(read8);
DECLARE_WRITE8_MEMBER(write8);
};
@@ -133,7 +133,7 @@ private:
class omti8621_pc_device : public omti8621_device
{
public:
- omti8621_pc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ omti8621_pc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
extern const device_type ISA16_OMTI8621;
@@ -143,10 +143,10 @@ extern const device_type ISA16_OMTI8621;
class omti8621_apollo_device : public omti8621_device
{
public:
- omti8621_apollo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ omti8621_apollo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// get sector diskaddr of logical unit lun into data_buffer
- UINT32 get_sector(INT32 diskaddr, UINT8 *data_buffer, UINT32 length, UINT8 lun);
+ uint32_t get_sector(int32_t diskaddr, uint8_t *data_buffer, uint32_t length, uint8_t lun);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
};
diff --git a/src/devices/bus/isa/p1_fdc.cpp b/src/devices/bus/isa/p1_fdc.cpp
index 6f6ed6b3cc0..36961e7bf98 100644
--- a/src/devices/bus/isa/p1_fdc.cpp
+++ b/src/devices/bus/isa/p1_fdc.cpp
@@ -88,14 +88,14 @@ const tiny_rom_entry *p1_fdc_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-UINT8 p1_fdc_device::p1_wd17xx_motor_r()
+uint8_t p1_fdc_device::p1_wd17xx_motor_r()
{
DBG_LOG(1,"p1_fdc_motor_r",("R = $%02x\n", 0));
// XXX always on for now
return 0;
}
-UINT8 p1_fdc_device::p1_wd17xx_aux_r()
+uint8_t p1_fdc_device::p1_wd17xx_aux_r()
{
cpu_device *maincpu = machine().device<cpu_device>("maincpu");
@@ -148,7 +148,7 @@ WRITE_LINE_MEMBER( p1_fdc_device::p1_fdc_irq_drq )
READ8_MEMBER( p1_fdc_device::p1_fdc_r )
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
switch( offset )
{
@@ -171,7 +171,7 @@ WRITE8_MEMBER( p1_fdc_device::p1_fdc_w )
// p1_fdc_device - constructor
//-------------------------------------------------
-p1_fdc_device::p1_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+p1_fdc_device::p1_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, P1_FDC, "Poisk-1 floppy B504", tag, owner, clock, "p1_fdc", __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_fdc(*this, "fdc")
diff --git a/src/devices/bus/isa/p1_fdc.h b/src/devices/bus/isa/p1_fdc.h
index 495f9f559d7..19fd04e3163 100644
--- a/src/devices/bus/isa/p1_fdc.h
+++ b/src/devices/bus/isa/p1_fdc.h
@@ -26,7 +26,7 @@ class p1_fdc_device : public device_t,
{
public:
// construction/destruction
- p1_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ p1_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -46,8 +46,8 @@ private:
public:
void p1_wd17xx_aux_w(int data);
- UINT8 p1_wd17xx_aux_r();
- UINT8 p1_wd17xx_motor_r();
+ uint8_t p1_wd17xx_aux_r();
+ uint8_t p1_wd17xx_motor_r();
};
diff --git a/src/devices/bus/isa/p1_hdc.cpp b/src/devices/bus/isa/p1_hdc.cpp
index a8bd565479a..b0377ef37fa 100644
--- a/src/devices/bus/isa/p1_hdc.cpp
+++ b/src/devices/bus/isa/p1_hdc.cpp
@@ -93,7 +93,7 @@ const tiny_rom_entry *p1_hdc_device::device_rom_region() const
READ8_MEMBER(p1_hdc_device::p1_HDC_r)
{
- UINT8 data = 0x00;
+ uint8_t data = 0x00;
switch (offset >> 8) {
case 8: data = m_hdc->read(space, offset & 255);
@@ -115,7 +115,7 @@ WRITE8_MEMBER(p1_hdc_device::p1_HDC_w)
// p1_hdc_device - constructor
//-------------------------------------------------
-p1_hdc_device::p1_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+p1_hdc_device::p1_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, P1_HDC, "Poisk-1 MFM disk B942", tag, owner, clock, "p1_hdc", __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_hdc(*this, KM1809VG7_TAG)
diff --git a/src/devices/bus/isa/p1_hdc.h b/src/devices/bus/isa/p1_hdc.h
index a009fdcebaf..ec8842e8062 100644
--- a/src/devices/bus/isa/p1_hdc.h
+++ b/src/devices/bus/isa/p1_hdc.h
@@ -26,7 +26,7 @@ class p1_hdc_device : public device_t,
{
public:
// construction/destruction
- p1_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ p1_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -40,7 +40,7 @@ protected:
private:
required_device<wd2010_device> m_hdc;
- //UINT8 m_ram[0x800];
+ //uint8_t m_ram[0x800];
public:
DECLARE_READ8_MEMBER(p1_HDC_r);
diff --git a/src/devices/bus/isa/p1_rom.cpp b/src/devices/bus/isa/p1_rom.cpp
index 4ace5c48e41..8225b3586d2 100644
--- a/src/devices/bus/isa/p1_rom.cpp
+++ b/src/devices/bus/isa/p1_rom.cpp
@@ -49,7 +49,7 @@ const tiny_rom_entry *p1_rom_device::device_rom_region() const
// p1_rom_device - constructor
//-------------------------------------------------
-p1_rom_device::p1_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+p1_rom_device::p1_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, P1_ROM, "Poisk-1 ROM cart", tag, owner, clock, "p1_rom", __FILE__),
device_isa8_card_interface( mconfig, *this )
{
diff --git a/src/devices/bus/isa/p1_rom.h b/src/devices/bus/isa/p1_rom.h
index 6ee2a63e755..3320628c1b7 100644
--- a/src/devices/bus/isa/p1_rom.h
+++ b/src/devices/bus/isa/p1_rom.h
@@ -23,7 +23,7 @@ class p1_rom_device : public device_t,
{
public:
// construction/destruction
- p1_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ p1_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/isa/p1_sound.cpp b/src/devices/bus/isa/p1_sound.cpp
index e77312a3fd9..fe7492d31e0 100644
--- a/src/devices/bus/isa/p1_sound.cpp
+++ b/src/devices/bus/isa/p1_sound.cpp
@@ -88,7 +88,7 @@ machine_config_constructor p1_sound_device::device_mconfig_additions() const
// p1_sound_device - constructor
//-------------------------------------------------
-p1_sound_device::p1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+p1_sound_device::p1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, P1_SOUND, "Poisk-1 sound card (B623)", tag, owner, clock, "p1_sound", __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_dac(*this, "dac"),
diff --git a/src/devices/bus/isa/p1_sound.h b/src/devices/bus/isa/p1_sound.h
index 2dfae20f67c..ae2965e203b 100644
--- a/src/devices/bus/isa/p1_sound.h
+++ b/src/devices/bus/isa/p1_sound.h
@@ -32,7 +32,7 @@ class p1_sound_device : public device_t,
{
public:
// construction/destruction
- p1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ p1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// Optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -54,7 +54,7 @@ protected:
virtual void device_reset() override;
private:
- UINT8 m_dac_data[16];
+ uint8_t m_dac_data[16];
int m_dac_ptr;
required_device<dac_byte_interface> m_dac;
diff --git a/src/devices/bus/isa/pc1640_iga.cpp b/src/devices/bus/isa/pc1640_iga.cpp
index e38ed4d09d0..3b423ed3a74 100644
--- a/src/devices/bus/isa/pc1640_iga.cpp
+++ b/src/devices/bus/isa/pc1640_iga.cpp
@@ -67,7 +67,7 @@ const tiny_rom_entry *isa8_pc1640_iga_device::device_rom_region() const
// isa8_pc1640_iga_device - constructor
//-------------------------------------------------
-isa8_pc1640_iga_device::isa8_pc1640_iga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+isa8_pc1640_iga_device::isa8_pc1640_iga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: isa8_ega_device(mconfig, ISA8_PC1640_IGA, "Amstrad PC1640 IGA", tag, owner, clock, "pc1640_iga", __FILE__)
{
}
@@ -86,9 +86,9 @@ void isa8_pc1640_iga_device::device_start()
for (int i = 0; i < 64; i++ )
{
- UINT8 r = ( ( i & 0x04 ) ? 0xAA : 0x00 ) + ( ( i & 0x20 ) ? 0x55 : 0x00 );
- UINT8 g = ( ( i & 0x02 ) ? 0xAA : 0x00 ) + ( ( i & 0x10 ) ? 0x55 : 0x00 );
- UINT8 b = ( ( i & 0x01 ) ? 0xAA : 0x00 ) + ( ( i & 0x08 ) ? 0x55 : 0x00 );
+ uint8_t r = ( ( i & 0x04 ) ? 0xAA : 0x00 ) + ( ( i & 0x20 ) ? 0x55 : 0x00 );
+ uint8_t g = ( ( i & 0x02 ) ? 0xAA : 0x00 ) + ( ( i & 0x10 ) ? 0x55 : 0x00 );
+ uint8_t b = ( ( i & 0x01 ) ? 0xAA : 0x00 ) + ( ( i & 0x08 ) ? 0x55 : 0x00 );
m_palette->set_pen_color( i, r, g, b );
}
@@ -98,13 +98,13 @@ void isa8_pc1640_iga_device::device_start()
m_videoram = m_vram->base();
m_plane[0] = m_videoram + 0x00000;
- memset(m_plane[0], 0, sizeof(UINT8) * 0x10000);
+ memset(m_plane[0], 0, sizeof(uint8_t) * 0x10000);
m_plane[1] = m_videoram + 0x10000;
- memset(m_plane[1], 0, sizeof(UINT8) * 0x10000);
+ memset(m_plane[1], 0, sizeof(uint8_t) * 0x10000);
m_plane[2] = m_videoram + 0x20000;
- memset(m_plane[2], 0, sizeof(UINT8) * 0x10000);
+ memset(m_plane[2], 0, sizeof(uint8_t) * 0x10000);
m_plane[3] = m_videoram + 0x30000;
- memset(m_plane[3], 0, sizeof(UINT8) * 0x10000);
+ memset(m_plane[3], 0, sizeof(uint8_t) * 0x10000);
m_crtc_ega = subdevice<crtc_ega_device>(EGA_CRTC_NAME);
diff --git a/src/devices/bus/isa/pc1640_iga.h b/src/devices/bus/isa/pc1640_iga.h
index 225b31cfdae..50db6388004 100644
--- a/src/devices/bus/isa/pc1640_iga.h
+++ b/src/devices/bus/isa/pc1640_iga.h
@@ -27,7 +27,7 @@ class isa8_pc1640_iga_device : public isa8_ega_device
{
public:
// construction/destruction
- isa8_pc1640_iga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_pc1640_iga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/isa/pds.cpp b/src/devices/bus/isa/pds.cpp
index f832de418de..39c9165f8c9 100644
--- a/src/devices/bus/isa/pds.cpp
+++ b/src/devices/bus/isa/pds.cpp
@@ -20,7 +20,7 @@
const device_type ISA8_PDS = &device_creator<isa8_pds_device>;
-isa8_pds_device::isa8_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+isa8_pds_device::isa8_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ISA8_PDS, "Programmers Development System", tag, owner, clock, "isa_pds", __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_ppi(*this,"pds_ppi")
diff --git a/src/devices/bus/isa/pds.h b/src/devices/bus/isa/pds.h
index eb98c3abb83..9a1f0314eae 100644
--- a/src/devices/bus/isa/pds.h
+++ b/src/devices/bus/isa/pds.h
@@ -18,7 +18,7 @@ class isa8_pds_device :
public device_isa8_card_interface
{
public:
- isa8_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER(ppi_r);
DECLARE_WRITE8_MEMBER(ppi_w);
diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp
index b211765ba95..6238e218592 100644
--- a/src/devices/bus/isa/pgc.cpp
+++ b/src/devices/bus/isa/pgc.cpp
@@ -203,7 +203,7 @@ ioport_constructor isa8_pgc_device::device_input_ports() const
// isa8_pgc_device - constructor
//-------------------------------------------------
-isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8_PGC, "IBM Professional Graphics Controller", tag, owner, clock, "isa_ibm_pgc", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_cpu(*this, "maincpu"),
@@ -212,7 +212,7 @@ isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, const char *tag,
{
}
-isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_isa8_card_interface(mconfig, *this),
m_cpu(*this, "maincpu"),
@@ -240,11 +240,11 @@ void isa8_pgc_device::device_start()
m_bitmap = std::make_unique<bitmap_ind16>(width, height);
m_bitmap->fill(0);
- m_vram = std::make_unique<UINT8[]>(0x78000);
+ m_vram = std::make_unique<uint8_t[]>(0x78000);
space.install_readwrite_bank(0x80000, 0xf7fff, "vram");
membank("vram")->set_base(m_vram.get());
- m_eram = std::make_unique<UINT8[]>(0x8000);
+ m_eram = std::make_unique<uint8_t[]>(0x8000);
machine().add_notifier(MACHINE_NOTIFY_RESET, machine_notify_delegate(FUNC(isa8_pgc_device::reset_common), this));
}
@@ -287,7 +287,7 @@ IRQ_CALLBACK_MEMBER(isa8_pgc_device::irq_callback)
// memory handlers
READ8_MEMBER( isa8_pgc_device::stateparam_r ) {
- UINT8 ret;
+ uint8_t ret;
ret = m_stateparam[offset >> 1];
if ((machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
@@ -306,7 +306,7 @@ WRITE8_MEMBER( isa8_pgc_device::stateparam_w ) {
}
WRITE8_MEMBER( isa8_pgc_device::lut_w ) {
- UINT8 o = (offset >> 1) * 3;
+ uint8_t o = (offset >> 1) * 3;
if (offset & 1) {
m_lut[o + 2] = (data & 15) << 4;
@@ -336,9 +336,9 @@ READ8_MEMBER( isa8_pgc_device::init_r ) {
TIMER_DEVICE_CALLBACK_MEMBER(isa8_pgc_device::scanline_callback)
{
- UINT16 x, y = m_screen->vpos();
- UINT16 *p;
- UINT8 *v;
+ uint16_t x, y = m_screen->vpos();
+ uint16_t *p;
+ uint8_t *v;
// XXX hpos shifts every frame -- fix
if (y == 0) DBG_LOG(2,"scanline_cb",
@@ -358,7 +358,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(isa8_pgc_device::scanline_callback)
}
}
-UINT32 isa8_pgc_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t isa8_pgc_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
copybitmap(bitmap, *m_bitmap, 0, 0, PGC_HORZ_START, PGC_VERT_START, cliprect);
return 0;
diff --git a/src/devices/bus/isa/pgc.h b/src/devices/bus/isa/pgc.h
index b06e87478f8..e59348a5bb6 100644
--- a/src/devices/bus/isa/pgc.h
+++ b/src/devices/bus/isa/pgc.h
@@ -23,15 +23,15 @@ class isa8_pgc_device :
{
public:
// construction/destruction
- isa8_pgc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- isa8_pgc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ isa8_pgc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ isa8_pgc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
virtual ioport_constructor device_input_ports() const override;
- UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER( scanline_callback );
INTERRUPT_GEN_MEMBER(vblank_irq);
@@ -54,11 +54,11 @@ private:
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
- UINT8 *m_commarea;
- std::unique_ptr<UINT8[]> m_vram;
- std::unique_ptr<UINT8[]> m_eram;
- UINT8 m_stateparam[16];
- UINT8 m_lut[256*3];
+ uint8_t *m_commarea;
+ std::unique_ptr<uint8_t[]> m_vram;
+ std::unique_ptr<uint8_t[]> m_eram;
+ uint8_t m_stateparam[16];
+ uint8_t m_lut[256*3];
std::unique_ptr<bitmap_ind16> m_bitmap;
};
diff --git a/src/devices/bus/isa/s3virge.cpp b/src/devices/bus/isa/s3virge.cpp
index 1e2ccc27458..cf05045005e 100644
--- a/src/devices/bus/isa/s3virge.cpp
+++ b/src/devices/bus/isa/s3virge.cpp
@@ -20,27 +20,27 @@ const device_type S3VIRGE = &device_creator<s3virge_vga_device>;
const device_type S3VIRGEDX = &device_creator<s3virgedx_vga_device>;
const device_type S3VIRGEDX1 = &device_creator<s3virgedx_rev1_vga_device>;
-s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: s3_vga_device(mconfig, S3VIRGE, "S3 86C325", tag, owner, clock, "virge_vga", __FILE__)
{
}
-s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: s3_vga_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: s3virge_vga_device(mconfig, S3VIRGEDX, "S3 86C375", tag, owner, clock, "virgedx_vga", __FILE__)
{
}
-s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: s3virge_vga_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-s3virgedx_rev1_vga_device::s3virgedx_rev1_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s3virgedx_rev1_vga_device::s3virgedx_rev1_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: s3virgedx_vga_device(mconfig, S3VIRGEDX1, "S3 86C375 (rev 1)", tag, owner, clock, "virgedx_r1", __FILE__)
{
}
@@ -132,9 +132,9 @@ void s3virgedx_rev1_vga_device::device_reset()
s3.strapping = 0x0aff0912;
}
-UINT8 s3virge_vga_device::s3_crtc_reg_read(UINT8 index)
+uint8_t s3virge_vga_device::s3_crtc_reg_read(uint8_t index)
{
- UINT8 res;
+ uint8_t res;
if(index <= 0x18)
res = crtc_reg_read(index);
@@ -295,7 +295,7 @@ void s3virge_vga_device::s3_define_video_mode()
recompute_params_clock(divisor, xtal);
}
-void s3virge_vga_device::s3_crtc_reg_write(UINT8 index, UINT8 data)
+void s3virge_vga_device::s3_crtc_reg_write(uint8_t index, uint8_t data)
{
if(index <= 0x18)
{
@@ -608,7 +608,7 @@ bit 0 Vertical Total bit 10. Bit 10 of the Vertical Total register (3d4h
READ8_MEMBER(s3virge_vga_device::port_03b0_r)
{
- UINT8 res = 0xff;
+ uint8_t res = 0xff;
if (CRTC_PORT_ADDR == 0x3b0)
{
@@ -645,7 +645,7 @@ WRITE8_MEMBER(s3virge_vga_device::port_03b0_w)
READ8_MEMBER(s3virge_vga_device::port_03c0_r)
{
- UINT8 res;
+ uint8_t res;
switch(offset)
{
@@ -669,7 +669,7 @@ WRITE8_MEMBER(s3virge_vga_device::port_03c0_w)
READ8_MEMBER(s3virge_vga_device::port_03d0_r)
{
- UINT8 res = 0xff;
+ uint8_t res = 0xff;
if (CRTC_PORT_ADDR == 0x3d0)
{
@@ -708,7 +708,7 @@ READ8_MEMBER(s3virge_vga_device::mem_r)
{
if (svga.rgb8_en || svga.rgb15_en || svga.rgb16_en || svga.rgb32_en)
{
- UINT8 data;
+ uint8_t data;
if(offset & 0x10000)
return 0;
data = 0xff;
diff --git a/src/devices/bus/isa/s3virge.h b/src/devices/bus/isa/s3virge.h
index 1b7f6796e95..5c33393f8c3 100644
--- a/src/devices/bus/isa/s3virge.h
+++ b/src/devices/bus/isa/s3virge.h
@@ -19,8 +19,8 @@ class s3virge_vga_device : public s3_vga_device
{
public:
// construction/destruction
- s3virge_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- s3virge_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ s3virge_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ s3virge_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual READ8_MEMBER(port_03b0_r) override;
virtual WRITE8_MEMBER(port_03b0_w) override;
@@ -38,9 +38,9 @@ protected:
virtual void device_reset() override;
private:
- virtual UINT8 s3_crtc_reg_read(UINT8 index);
+ virtual uint8_t s3_crtc_reg_read(uint8_t index);
virtual void s3_define_video_mode(void);
- virtual void s3_crtc_reg_write(UINT8 index, UINT8 data);
+ virtual void s3_crtc_reg_write(uint8_t index, uint8_t data);
// has no 8514/A device
};
@@ -51,8 +51,8 @@ class s3virgedx_vga_device : public s3virge_vga_device
{
public:
// construction/destruction
- s3virgedx_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- s3virgedx_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ s3virgedx_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ s3virgedx_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -66,7 +66,7 @@ class s3virgedx_rev1_vga_device : public s3virgedx_vga_device
{
public:
// construction/destruction
- s3virgedx_rev1_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s3virgedx_rev1_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp
index 3b65ef23894..abf4ea3a513 100644
--- a/src/devices/bus/isa/sb16.cpp
+++ b/src/devices/bus/isa/sb16.cpp
@@ -61,7 +61,7 @@ WRITE8_MEMBER( sb16_lle_device::dac_data_w )
READ8_MEMBER( sb16_lle_device::p1_r )
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
ret |= m_data_out << 0;
ret |= m_data_in << 1;
return ret;
@@ -141,7 +141,7 @@ READ8_MEMBER( sb16_lle_device::dma_stat_r )
* bit6 -
* bit7 -
*/
- UINT8 ret = (m_dma16_done << 1) | m_dma8_done;
+ uint8_t ret = (m_dma16_done << 1) | m_dma8_done;
return ret;
}
@@ -440,9 +440,9 @@ WRITE8_MEMBER( sb16_lle_device::host_cmd_w )
m_in_byte = data;
}
-UINT8 sb16_lle_device::dack_r(int line)
+uint8_t sb16_lle_device::dack_r(int line)
{
- UINT8 ret = m_adc_fifo[m_adc_fifo_tail].b[m_adc_h + (m_adc_r * 2)];
+ uint8_t ret = m_adc_fifo[m_adc_fifo_tail].b[m_adc_h + (m_adc_r * 2)];
if(m_ctrl8 & 2)
return 0;
@@ -483,7 +483,7 @@ UINT8 sb16_lle_device::dack_r(int line)
return ret;
}
-void sb16_lle_device::dack_w(int line, UINT8 data)
+void sb16_lle_device::dack_w(int line, uint8_t data)
{
if(m_ctrl8 & 2)
return;
@@ -525,9 +525,9 @@ void sb16_lle_device::dack_w(int line, UINT8 data)
m_isa->drq1_w(0);
}
-UINT16 sb16_lle_device::dack16_r(int line)
+uint16_t sb16_lle_device::dack16_r(int line)
{
- UINT16 ret = m_adc_fifo[m_adc_fifo_tail].h[m_adc_r];
+ uint16_t ret = m_adc_fifo[m_adc_fifo_tail].h[m_adc_r];
if(m_ctrl16 & 2)
return 0;
@@ -560,7 +560,7 @@ UINT16 sb16_lle_device::dack16_r(int line)
return ret;
}
-void sb16_lle_device::dack16_w(int line, UINT16 data)
+void sb16_lle_device::dack16_w(int line, uint16_t data)
{
if(m_ctrl16 & 2)
return;
@@ -637,7 +637,7 @@ READ8_MEMBER( sb16_lle_device::invalid_r )
// just using the old dummy mpu401 for now
READ8_MEMBER( sb16_lle_device::mpu401_r )
{
- UINT8 res;
+ uint8_t res;
m_irq_midi = false;
m_isa->irq5_w((m_irq8 || m_irq16 || m_irq_midi) ? ASSERT_LINE : CLEAR_LINE);
@@ -676,7 +676,7 @@ WRITE8_MEMBER( sb16_lle_device::mpu401_w )
}
-sb16_lle_device::sb16_lle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sb16_lle_device::sb16_lle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA16_SB16, "SoundBlaster 16 Audio Adapter LLE", tag, owner, clock, "sb16", __FILE__),
device_isa16_card_interface(mconfig, *this),
m_ldac(*this, "ldac"),
@@ -691,8 +691,8 @@ sb16_lle_device::sb16_lle_device(const machine_config &mconfig, const char *tag,
void sb16_lle_device::device_start()
{
//address_space &space = m_cpu->space(AS_PROGRAM);
- UINT8 *rom = memregion("sb16_cpu")->base();
- UINT8 *xor_table = memregion("xor_table")->base();
+ uint8_t *rom = memregion("sb16_cpu")->base();
+ uint8_t *xor_table = memregion("xor_table")->base();
for(int i = 0; i < 0x2000; i++)
rom[i] = rom[i] ^ xor_table[i & 0x3f];
@@ -739,7 +739,7 @@ void sb16_lle_device::device_reset()
void sb16_lle_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr)
{
- UINT16 dacl = 0, dacr = 0, adcl = 0, adcr = 0;
+ uint16_t dacl = 0, dacr = 0, adcl = 0, adcr = 0;
if(m_mode & 2)
{
// it might be possible to run the adc though dma simultaneously but the rom doesn't appear to permit it
diff --git a/src/devices/bus/isa/sb16.h b/src/devices/bus/isa/sb16.h
index 44ac336e673..e1c51625bcb 100644
--- a/src/devices/bus/isa/sb16.h
+++ b/src/devices/bus/isa/sb16.h
@@ -22,7 +22,7 @@ class sb16_lle_device : public device_t,
{
public:
// construction/destruction
- sb16_lle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sb16_lle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -85,25 +85,25 @@ protected:
virtual void device_reset() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
- UINT8 dack_r(int line) override;
- void dack_w(int line, UINT8 data) override;
- UINT16 dack16_r(int line) override;
- void dack16_w(int line, UINT16 data) override;
+ uint8_t dack_r(int line) override;
+ void dack_w(int line, uint8_t data) override;
+ uint16_t dack16_r(int line) override;
+ void dack16_w(int line, uint16_t data) override;
private:
void control_timer(bool start);
// internal state
bool m_data_in;
- UINT8 m_in_byte;
+ uint8_t m_in_byte;
bool m_data_out;
- UINT8 m_out_byte;
+ uint8_t m_out_byte;
- UINT8 m_freq, m_mode, m_dac_fifo_ctrl, m_adc_fifo_ctrl, m_ctrl8, m_ctrl16, m_mpu_byte;
- UINT16 m_dma8_len, m_dma16_len, m_dma8_cnt, m_dma16_cnt;
+ uint8_t m_freq, m_mode, m_dac_fifo_ctrl, m_adc_fifo_ctrl, m_ctrl8, m_ctrl16, m_mpu_byte;
+ uint16_t m_dma8_len, m_dma16_len, m_dma8_cnt, m_dma16_cnt;
typedef union {
- UINT32 w;
- UINT16 h[2];
- UINT8 b[4];
+ uint32_t w;
+ uint16_t h[2];
+ uint8_t b[4];
} samples;
samples m_adc_fifo[16], m_dac_fifo[16];
int m_adc_fifo_head, m_adc_fifo_tail, m_dac_fifo_head, m_dac_fifo_tail;
diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp
index 9f1c8382af9..a26bb27502d 100644
--- a/src/devices/bus/isa/sblaster.cpp
+++ b/src/devices/bus/isa/sblaster.cpp
@@ -129,7 +129,7 @@ MACHINE_CONFIG_END
READ8_MEMBER( sb8_device::ym3812_16_r )
{
- UINT8 retVal = 0xff;
+ uint8_t retVal = 0xff;
switch(offset)
{
case 0 : retVal = m_ym3812->status_port_r( space, offset ); break;
@@ -169,7 +169,7 @@ WRITE8_MEMBER( isa8_sblaster1_0_device::saa1099_2_16_w )
}
}
-void sb_device::queue(UINT8 data)
+void sb_device::queue(uint8_t data)
{
if (m_dsp.fifo_ptr < 15)
{
@@ -184,7 +184,7 @@ void sb_device::queue(UINT8 data)
}
}
-void sb_device::queue_r(UINT8 data)
+void sb_device::queue_r(uint8_t data)
{
m_dsp.rbuf_status |= 0x80;
@@ -201,9 +201,9 @@ void sb_device::queue_r(UINT8 data)
}
}
-UINT8 sb_device::dequeue_r()
+uint8_t sb_device::dequeue_r()
{
- UINT8 data = m_dsp.fifo_r[0];
+ uint8_t data = m_dsp.fifo_r[0];
if (m_dsp.fifo_r_ptr > 0)
{
@@ -285,7 +285,7 @@ READ8_MEMBER( sb_device::dsp_data_r )
if (m_uart_midi)
{
- UINT8 rv = m_recvring[m_recv_read++];
+ uint8_t rv = m_recvring[m_recv_read++];
if (m_recv_read >= MIDI_RING_SIZE)
{
m_recv_read = 0;
@@ -370,7 +370,7 @@ WRITE8_MEMBER(sb_device::dsp_rbuf_status_w)
logerror("Soundblaster DSP Read Buffer status undocumented write\n");
}
-void sb_device::process_fifo(UINT8 cmd)
+void sb_device::process_fifo(uint8_t cmd)
{
if (m_cmd_fifo_length[cmd] == -1)
{
@@ -523,7 +523,7 @@ void sb_device::process_fifo(UINT8 cmd)
m_dsp.adc_length = 1;
m_dsp.wbuf_status = 0x80;
m_dsp.dma_no_irq = true;
- m_dack_out = (UINT8)(m_dsp.prot_value & 0xff);
+ m_dack_out = (uint8_t)(m_dsp.prot_value & 0xff);
drq_w(1);
break;
@@ -712,29 +712,29 @@ WRITE8_MEMBER(sb_device::dsp_cmd_w)
process_fifo(m_dsp.fifo[0]);
}
-void sb_device::adpcm_decode(UINT8 sample, int size)
+void sb_device::adpcm_decode(uint8_t sample, int size)
{
- const UINT8 adpcm_2_table[] = {0, 1, 1, 3, 2, 6, 4, 12, 8, 24, 16, 48};
- const UINT8 step_2_table[] = {0, 2, 0, 4, 2, 6, 4, 8, 6, 10, 8, 10};
+ const uint8_t adpcm_2_table[] = {0, 1, 1, 3, 2, 6, 4, 12, 8, 24, 16, 48};
+ const uint8_t step_2_table[] = {0, 2, 0, 4, 2, 6, 4, 8, 6, 10, 8, 10};
- const UINT8 adpcm_3_table[] = {0, 1, 2, 3, 1, 3, 5, 7,
+ const uint8_t adpcm_3_table[] = {0, 1, 2, 3, 1, 3, 5, 7,
2, 6, 10, 14, 4, 12, 20, 28,
8, 24, 40, 56};
- const UINT8 step_3_table[] = {0, 0, 0, 4, 0, 4, 4, 8,
+ const uint8_t step_3_table[] = {0, 0, 0, 4, 0, 4, 4, 8,
4, 8, 8, 12, 8, 12, 12, 16,
12, 16, 16, 16};
- const UINT8 adpcm_4_table[] = {0, 1, 2, 3, 4, 5, 6, 7,
+ const uint8_t adpcm_4_table[] = {0, 1, 2, 3, 4, 5, 6, 7,
1, 3, 5, 7, 9, 11, 13, 15,
2, 6, 10, 14, 18, 22, 26, 30,
4, 12, 20, 28, 36, 44, 52, 60};
- const UINT8 step_4_table[] = {0, 0, 0, 0, 0, 8, 8, 8,
+ const uint8_t step_4_table[] = {0, 0, 0, 0, 0, 8, 8, 8,
0, 8, 8, 8, 8, 16, 16, 16,
8, 16, 16, 16, 16, 24, 24, 24,
16, 24, 24, 24, 24, 24, 24, 24};
- INT16 dec_sample = m_dsp.adpcm_ref;
- UINT8 index;
+ int16_t dec_sample = m_dsp.adpcm_ref;
+ uint8_t index;
switch(size)
{
case 2:
@@ -765,7 +765,7 @@ void sb_device::adpcm_decode(UINT8 sample, int size)
READ8_MEMBER( sb16_device::mpu401_r )
{
- UINT8 res;
+ uint8_t res;
irq_w(0, IRQ_MPU);
if(offset == 0) // data
@@ -1217,7 +1217,7 @@ machine_config_constructor isa16_sblaster16_device::device_mconfig_additions() c
// LIVE DEVICE
//**************************************************************************
-sb_device::sb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) :
+sb_device::sb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const char *name, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_serial_interface(mconfig, *this),
m_ldac(*this, "ldac"),
@@ -1228,14 +1228,14 @@ sb_device::sb_device(const machine_config &mconfig, device_type type, const char
{
}
-sb8_device::sb8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) :
+sb8_device::sb8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const char *name, const char *shortname, const char *source) :
sb_device(mconfig, type, tag, owner, clock, name, shortname, source),
device_isa8_card_interface(mconfig, *this),
m_ym3812(*this, "ym3812")
{
}
-sb16_device::sb16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source) :
+sb16_device::sb16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const char *name, const char *shortname, const char *source) :
sb_device(mconfig, type, tag, owner, clock, name, shortname, source),
device_isa16_card_interface(mconfig, *this)
{
@@ -1245,19 +1245,19 @@ sb16_device::sb16_device(const machine_config &mconfig, device_type type, const
// isa8_sblaster_device - constructor
//-------------------------------------------------
-isa8_sblaster1_0_device::isa8_sblaster1_0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_sblaster1_0_device::isa8_sblaster1_0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
sb8_device(mconfig, ISA8_SOUND_BLASTER_1_0, tag, owner, clock, "Sound Blaster 1.0", "isa_sblaster1_0", __FILE__),
m_saa1099_1(*this, "saa1099.1"),
m_saa1099_2(*this, "saa1099.2")
{
}
-isa8_sblaster1_5_device::isa8_sblaster1_5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_sblaster1_5_device::isa8_sblaster1_5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
sb8_device(mconfig, ISA8_SOUND_BLASTER_1_5, tag, owner, clock, "Sound Blaster 1.5", "isa_sblaster1_5", __FILE__)
{
}
-isa16_sblaster16_device::isa16_sblaster16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_sblaster16_device::isa16_sblaster16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
sb16_device(mconfig, ISA16_SOUND_BLASTER_16, tag, owner, clock, "Sound Blaster 16", "isa_sblaster_16", __FILE__)
{
}
@@ -1401,7 +1401,7 @@ void sb_device::device_reset()
set_rate(31250);
}
-UINT8 sb_device::dack_r(int line)
+uint8_t sb_device::dack_r(int line)
{
m_dsp.adc_transferred++;
if(m_dsp.adc_transferred >= m_dsp.adc_length)
@@ -1425,7 +1425,7 @@ UINT8 sb_device::dack_r(int line)
return m_dack_out;
}
-UINT16 sb16_device::dack16_r(int line)
+uint16_t sb16_device::dack16_r(int line)
{
m_dsp.adc_transferred += 2;
if (m_dsp.adc_transferred >= m_dsp.adc_length)
@@ -1444,7 +1444,7 @@ UINT16 sb16_device::dack16_r(int line)
return m_dack_out;
}
-void sb16_device::dack16_w(int line, UINT16 data)
+void sb16_device::dack16_w(int line, uint16_t data)
{
// set the transfer timer on the 1st byte
if (!m_dsp.dma_timer_started)
@@ -1487,7 +1487,7 @@ void sb16_device::dack16_w(int line, UINT16 data)
}
/* TODO: this mustn't be instant! */
-void sb_device::dack_w(int line, UINT8 data)
+void sb_device::dack_w(int line, uint8_t data)
{
// printf("dack_w: line %x data %02x\n", line, data);
// if(data != 0x80)
@@ -1541,7 +1541,7 @@ void sb_device::device_timer(emu_timer &timer, device_timer_id tid, int param, v
return;
}
- UINT16 lsample, rsample;
+ uint16_t lsample, rsample;
switch (m_dsp.flags) {
case 0: // 8-bit unsigned mono
m_ldac->write(m_dsp.data[m_dsp.d_rptr] << 8);
@@ -1698,7 +1698,7 @@ void sb_device::device_timer(emu_timer &timer, device_timer_id tid, int param, v
void sb_device::rcv_complete() // Rx completed receiving byte
{
receive_register_extract();
- UINT8 data = get_received_char();
+ uint8_t data = get_received_char();
// in UART MIDI mode, we set the DMA8 IRQ on receiving a character
if (m_uart_midi)
@@ -1723,7 +1723,7 @@ void sb_device::rcv_complete() // Rx completed receiving byte
void sb16_device::rcv_complete() // Rx completed receiving byte
{
receive_register_extract();
- UINT8 data = get_received_char();
+ uint8_t data = get_received_char();
// for UART or MPU, add character to the receive queue
if (m_uart_midi || m_mpu_midi)
@@ -1776,7 +1776,7 @@ void sb_device::tra_callback() // Tx send bit
m_mdout->write_txd(bit);
}
-void sb_device::xmit_char(UINT8 data)
+void sb_device::xmit_char(uint8_t data)
{
// printf("SB: xmit %02x\n", data);
diff --git a/src/devices/bus/isa/sblaster.h b/src/devices/bus/isa/sblaster.h
index 47868b51579..63604b618ba 100644
--- a/src/devices/bus/isa/sblaster.h
+++ b/src/devices/bus/isa/sblaster.h
@@ -30,64 +30,64 @@
struct sb8_dsp_state
{
- UINT8 reset_latch;
- UINT8 rbuf_status;
- UINT8 wbuf_status;
- UINT8 fifo[16],fifo_ptr;
- UINT8 fifo_r[52],fifo_r_ptr;
- UINT16 version;
- UINT8 test_reg;
- UINT8 speaker_on;
+ uint8_t reset_latch;
+ uint8_t rbuf_status;
+ uint8_t wbuf_status;
+ uint8_t fifo[16],fifo_ptr;
+ uint8_t fifo_r[52],fifo_r_ptr;
+ uint16_t version;
+ uint8_t test_reg;
+ uint8_t speaker_on;
bool dma_no_irq;
- UINT32 prot_count;
- INT32 prot_value;
- UINT32 frequency;
- UINT32 adc_freq;
- UINT32 dma_length, dma_transferred;
- UINT32 adc_length, adc_transferred;
- UINT8 dma_autoinit;
- UINT8 data[128], d_wptr, d_rptr;
+ uint32_t prot_count;
+ int32_t prot_value;
+ uint32_t frequency;
+ uint32_t adc_freq;
+ uint32_t dma_length, dma_transferred;
+ uint32_t adc_length, adc_transferred;
+ uint8_t dma_autoinit;
+ uint8_t data[128], d_wptr, d_rptr;
bool dma_timer_started;
bool dma_throttled;
- UINT8 flags;
- UINT8 irq_active;
+ uint8_t flags;
+ uint8_t irq_active;
bool adpcm_new_ref;
- UINT8 adpcm_ref;
- UINT8 adpcm_step;
- UINT8 adpcm_count;
+ uint8_t adpcm_ref;
+ uint8_t adpcm_step;
+ uint8_t adpcm_count;
};
struct sb8_mixer
{
- UINT8 status;
- UINT8 main_vol;
- UINT8 dac_vol;
- UINT8 fm_vol;
- UINT8 mic_vol;
- UINT8 in_filter;
- UINT8 stereo_sel;
- UINT8 cd_vol;
- UINT8 line_vol;
+ uint8_t status;
+ uint8_t main_vol;
+ uint8_t dac_vol;
+ uint8_t fm_vol;
+ uint8_t mic_vol;
+ uint8_t in_filter;
+ uint8_t stereo_sel;
+ uint8_t cd_vol;
+ uint8_t line_vol;
};
struct sb16_mixer
{
- UINT8 data;
- UINT8 status;
- UINT8 main_vol[2];
- UINT8 dac_vol[2];
- UINT8 fm_vol[2];
- UINT8 cd_vol[2];
- UINT8 line_vol[2];
- UINT8 mic_vol;
- UINT8 pc_speaker_vol;
- UINT8 output_ctl;
- UINT8 input_ctl[2];
- UINT8 input_gain[2];
- UINT8 output_gain[2];
- UINT8 agc;
- UINT8 treble[2];
- UINT8 bass[2];
+ uint8_t data;
+ uint8_t status;
+ uint8_t main_vol[2];
+ uint8_t dac_vol[2];
+ uint8_t fm_vol[2];
+ uint8_t cd_vol[2];
+ uint8_t line_vol[2];
+ uint8_t mic_vol;
+ uint8_t pc_speaker_vol;
+ uint8_t output_ctl;
+ uint8_t input_ctl[2];
+ uint8_t input_gain[2];
+ uint8_t output_gain[2];
+ uint8_t agc;
+ uint8_t treble[2];
+ uint8_t bass[2];
};
// ======================> sb_device (parent)
@@ -97,7 +97,7 @@ class sb_device :
{
public:
// construction/destruction
- sb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source);
+ sb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const char *name, const char *shortname, const char *source);
required_device<dac_16bit_r2r_device> m_ldac;
required_device<dac_16bit_r2r_device> m_rdac;
@@ -105,10 +105,10 @@ public:
required_device<midi_port_device> m_mdout;
required_ioport m_config;
- void process_fifo(UINT8 cmd);
- void queue(UINT8 data);
- void queue_r(UINT8 data);
- UINT8 dequeue_r();
+ void process_fifo(uint8_t cmd);
+ void queue(uint8_t data);
+ void queue_r(uint8_t data);
+ uint8_t dequeue_r();
DECLARE_READ8_MEMBER(dsp_reset_r);
DECLARE_WRITE8_MEMBER(dsp_reset_w);
@@ -119,19 +119,19 @@ public:
DECLARE_WRITE8_MEMBER(dsp_rbuf_status_w);
DECLARE_WRITE8_MEMBER(dsp_cmd_w);
- DECLARE_WRITE_LINE_MEMBER( midi_rx_w ) { device_serial_interface::rx_w((UINT8)state); }
+ DECLARE_WRITE_LINE_MEMBER( midi_rx_w ) { device_serial_interface::rx_w((uint8_t)state); }
protected:
// device-level overrides
virtual void device_reset() override;
- UINT8 dack_r(int line);
- void dack_w(int line, UINT8 data);
+ uint8_t dack_r(int line);
+ void dack_w(int line, uint8_t data);
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual void drq16_w(int state) { }
virtual void drq_w(int state) { }
virtual void irq_w(int state, int source) { }
virtual void mixer_reset() {}
- void adpcm_decode(UINT8 sample, int size);
+ void adpcm_decode(uint8_t sample, int size);
// serial overrides
virtual void rcv_complete() override; // Rx completed receiving byte
@@ -141,12 +141,12 @@ protected:
static const int MIDI_RING_SIZE = 2048;
struct sb8_dsp_state m_dsp;
- UINT8 m_dack_out;
- void xmit_char(UINT8 data);
+ uint8_t m_dack_out;
+ void xmit_char(uint8_t data);
bool m_onebyte_midi, m_uart_midi, m_uart_irq, m_mpu_midi;
int m_rx_waiting, m_tx_waiting;
- UINT8 m_recvring[MIDI_RING_SIZE];
- UINT8 m_xmitring[MIDI_RING_SIZE];
+ uint8_t m_recvring[MIDI_RING_SIZE];
+ uint8_t m_xmitring[MIDI_RING_SIZE];
int m_xmit_read, m_xmit_write;
int m_recv_read, m_recv_write;
bool m_tx_busy;
@@ -159,7 +159,7 @@ class sb8_device : public sb_device,
{
public:
// construction/destruction
- sb8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source);
+ sb8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const char *name, const char *shortname, const char *source);
DECLARE_READ8_MEMBER(ym3812_16_r);
DECLARE_WRITE8_MEMBER(ym3812_16_w);
@@ -168,8 +168,8 @@ protected:
virtual void device_start() override;
virtual void drq_w(int state) override;
virtual void irq_w(int state, int source) override;
- virtual UINT8 dack_r(int line) override { return sb_device::dack_r(line); }
- virtual void dack_w(int line, UINT8 data) override { sb_device::dack_w(line, data); }
+ virtual uint8_t dack_r(int line) override { return sb_device::dack_r(line); }
+ virtual void dack_w(int line, uint8_t data) override { sb_device::dack_w(line, data); }
private:
required_device<ym3812_device> m_ym3812;
};
@@ -178,7 +178,7 @@ class isa8_sblaster1_0_device : public sb8_device
{
public:
// construction/destruction
- isa8_sblaster1_0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_sblaster1_0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -200,7 +200,7 @@ class isa8_sblaster1_5_device : public sb8_device
{
public:
// construction/destruction
- isa8_sblaster1_5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_sblaster1_5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -214,7 +214,7 @@ class sb16_device : public sb_device,
{
public:
// construction/destruction
- sb16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source);
+ sb16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const char *name, const char *shortname, const char *source);
DECLARE_READ8_MEMBER(mpu401_r);
DECLARE_WRITE8_MEMBER(mpu401_w);
DECLARE_READ8_MEMBER(mixer_r);
@@ -222,10 +222,10 @@ public:
virtual ioport_constructor device_input_ports() const override;
protected:
virtual void device_start() override;
- virtual UINT16 dack16_r(int line) override;
- virtual UINT8 dack_r(int line) override { return sb_device::dack_r(line); }
- virtual void dack_w(int line, UINT8 data) override { sb_device::dack_w(line, data); }
- virtual void dack16_w(int line, UINT16 data) override;
+ virtual uint16_t dack16_r(int line) override;
+ virtual uint8_t dack_r(int line) override { return sb_device::dack_r(line); }
+ virtual void dack_w(int line, uint8_t data) override { sb_device::dack_w(line, data); }
+ virtual void dack16_w(int line, uint16_t data) override;
virtual void drq16_w(int state) override;
virtual void drq_w(int state) override;
virtual void irq_w(int state, int source) override;
@@ -240,7 +240,7 @@ class isa16_sblaster16_device : public sb16_device
{
public:
// construction/destruction
- isa16_sblaster16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_sblaster16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/sc499.cpp b/src/devices/bus/isa/sc499.cpp
index aaf0d719d67..3d1e60f873d 100644
--- a/src/devices/bus/isa/sc499.cpp
+++ b/src/devices/bus/isa/sc499.cpp
@@ -314,7 +314,7 @@ const device_type SC499 = &device_creator<sc499_device>;
// sc499_device - constructor
//-------------------------------------------------
-sc499_device::sc499_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sc499_device::sc499_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SC499, "Archive SC-499", tag, owner, clock, "sc499", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_iobase(*this, "IO_BASE"),
@@ -441,7 +441,7 @@ void sc499_device::logerror(Format &&fmt, Params &&... args) const
tape_status_clear - clear bits in tape status
-------------------------------------------------*/
-void sc499_device::tape_status_clear(UINT16 value)
+void sc499_device::tape_status_clear(uint16_t value)
{
m_tape_status &= ~value;
tape_status_set(0);
@@ -451,7 +451,7 @@ void sc499_device::tape_status_clear(UINT16 value)
tape_status_set - set bits in tape status
-------------------------------------------------*/
-void sc499_device::tape_status_set(UINT16 value)
+void sc499_device::tape_status_set(uint16_t value)
{
m_tape_status |= value;
m_tape_status &= ~(SC499_ST0 | SC499_ST1);
@@ -487,7 +487,7 @@ void sc499_device::check_tape()
{
// tape has changed, get new size
m_image_length = m_image->tapelen();
- m_ctape_block_count = (UINT32)((m_image_length + SC499_CTAPE_BLOCK_SIZE - 1) / SC499_CTAPE_BLOCK_SIZE);
+ m_ctape_block_count = (uint32_t)((m_image_length + SC499_CTAPE_BLOCK_SIZE - 1) / SC499_CTAPE_BLOCK_SIZE);
}
LOG1(("check_tape: tape image is %s with %d blocks", m_image->filename(), m_ctape_block_count));
@@ -695,7 +695,7 @@ void sc499_device::set_dma_drq(enum line_state state)
// -------------------------------------
-void sc499_device::log_command(UINT8 data)
+void sc499_device::log_command(uint8_t data)
{
switch (data)
{
@@ -738,7 +738,7 @@ void sc499_device::log_command(UINT8 data)
}
}
-void sc499_device::do_command(UINT8 data)
+void sc499_device::do_command(uint8_t data)
{
m_status |= SC499_STAT_RDY;
m_status &= ~SC499_STAT_DON;
@@ -866,15 +866,15 @@ void sc499_device::do_reset()
// -------------------------------------
-void sc499_device::write_command_port(UINT8 data)
+void sc499_device::write_command_port(uint8_t data)
{
m_command = data;
log_command(data);
}
-UINT8 sc499_device::read_data_port()
+uint8_t sc499_device::read_data_port()
{
- static UINT8 m_last_data = 0xff;
+ static uint8_t m_last_data = 0xff;
// omit excessive logging
if (m_last_data != m_data)
@@ -892,7 +892,7 @@ UINT8 sc499_device::read_data_port()
return m_data;
}
-void sc499_device::write_control_port( UINT8 data)
+void sc499_device::write_control_port( uint8_t data)
{
LOG2(("write_control_port: %02x", data));
@@ -959,9 +959,9 @@ void sc499_device::write_control_port( UINT8 data)
m_control = data;
}
-UINT8 sc499_device::read_status_port()
+uint8_t sc499_device::read_status_port()
{
- static UINT8 m_last_status = 0xff;
+ static uint8_t m_last_status = 0xff;
// omit excessive logging
if (m_last_status != m_status)
@@ -979,7 +979,7 @@ UINT8 sc499_device::read_status_port()
// Start DMA (DMAGO). Any write to this register will cause DMAGO to be active.
-void sc499_device::write_dma_go( UINT8 data)
+void sc499_device::write_dma_go( uint8_t data)
{
LOG2(("write_dma_go: %02x", data));
@@ -1024,7 +1024,7 @@ void sc499_device::write_dma_go( UINT8 data)
// Reset DMA (RSTDMA). Any write to this register will cause RSTDMA to be active.
-void sc499_device::write_dma_reset( UINT8 data)
+void sc499_device::write_dma_reset( uint8_t data)
{
LOG2(("write_dma_reset: %02x", data));
@@ -1056,7 +1056,7 @@ WRITE8_MEMBER(sc499_device::write)
READ8_MEMBER(sc499_device::read)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
switch (offset)
{
@@ -1101,9 +1101,9 @@ void sc499_device::eop_w(int state)
}
}
-UINT8 sc499_device::dack_r(int line)
+uint8_t sc499_device::dack_r(int line)
{
- UINT8 data;
+ uint8_t data;
// set_dma_drq(CLEAR_LINE);
@@ -1135,7 +1135,7 @@ UINT8 sc499_device::dack_r(int line)
return data;
}
-void sc499_device::dack_w(int line, UINT8 data)
+void sc499_device::dack_w(int line, uint8_t data)
{
LOG3(("dack_write: data=%x", data));
@@ -1185,7 +1185,7 @@ void sc499_device::log_block(const char *text)
void sc499_device::read_block()
{
- UINT8 *tape;
+ uint8_t *tape;
if (m_tape_pos == 0)
{
@@ -1272,7 +1272,7 @@ void sc499_device::write_block()
int sc499_device::block_is_filemark()
{
- static const UINT8 fm_pattern[] = {0xDE, 0xAF, 0xFA, 0xED};
+ static const uint8_t fm_pattern[] = {0xDE, 0xAF, 0xFA, 0xED};
int is_filemark = memcmp(&m_ctape_block_buffer[0], fm_pattern, 4) == 0 &&
memcmp(&m_ctape_block_buffer[0], &m_ctape_block_buffer[4], SC499_CTAPE_BLOCK_SIZE-4) == 0;
@@ -1287,7 +1287,7 @@ int sc499_device::block_is_filemark()
void sc499_device::block_set_filemark()
{
- static const UINT8 fm_pattern[] = {0xDE, 0xAF, 0xFA, 0xED};
+ static const uint8_t fm_pattern[] = {0xDE, 0xAF, 0xFA, 0xED};
for (int i = 0; i < SC499_CTAPE_BLOCK_SIZE; i += 4)
{
memcpy(&m_ctape_block_buffer[i], fm_pattern, 4);
@@ -1298,7 +1298,7 @@ void sc499_device::block_set_filemark()
const device_type SC499_CTAPE = &device_creator<sc499_ctape_image_device>;
-sc499_ctape_image_device::sc499_ctape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sc499_ctape_image_device::sc499_ctape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SC499_CTAPE, "Cartridge Tape", tag, owner, clock, "sc499_ctape", __FILE__),
device_image_interface(mconfig, *this)
{
@@ -1310,7 +1310,7 @@ void sc499_ctape_image_device::device_config_complete()
}
-UINT8 *sc499_ctape_image_device::read_block(int block_num)
+uint8_t *sc499_ctape_image_device::read_block(int block_num)
{
// access beyond end of tape cart
if (m_ctape_data.size() <= (block_num + 1) * SC499_CTAPE_BLOCK_SIZE)
@@ -1319,7 +1319,7 @@ UINT8 *sc499_ctape_image_device::read_block(int block_num)
return &m_ctape_data[block_num * SC499_CTAPE_BLOCK_SIZE];
}
-void sc499_ctape_image_device::write_block(int block_num, UINT8 *ptr)
+void sc499_ctape_image_device::write_block(int block_num, uint8_t *ptr)
{
if (!(m_ctape_data.size() <= (block_num + 1) * SC499_CTAPE_BLOCK_SIZE))
memcpy(&m_ctape_data[block_num * SC499_CTAPE_BLOCK_SIZE], ptr, SC499_CTAPE_BLOCK_SIZE);
@@ -1327,7 +1327,7 @@ void sc499_ctape_image_device::write_block(int block_num, UINT8 *ptr)
image_init_result sc499_ctape_image_device::call_load()
{
- UINT32 size;
+ uint32_t size;
io_generic io;
io.file = (device_image_interface *)this;
io.procs = &image_ioprocs;
diff --git a/src/devices/bus/isa/sc499.h b/src/devices/bus/isa/sc499.h
index 7a832b53be2..a681c3b00bb 100644
--- a/src/devices/bus/isa/sc499.h
+++ b/src/devices/bus/isa/sc499.h
@@ -28,7 +28,7 @@ class sc499_ctape_image_device : public device_t, public device_image_interface
{
public:
// construction/destruction
- sc499_ctape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sc499_ctape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// image-level overrides
virtual image_init_result call_load() override;
@@ -44,16 +44,16 @@ public:
virtual const char *image_interface() const override { return "sc499_cass"; }
virtual const char *file_extensions() const override { return "act,ct"; }
- UINT8 *read_block(int block_num);
- void write_block(int block_num, UINT8 *ptr);
- UINT64 tapelen() { return m_ctape_data.size(); }
+ uint8_t *read_block(int block_num);
+ void write_block(int block_num, uint8_t *ptr);
+ uint64_t tapelen() { return m_ctape_data.size(); }
protected:
// device-level overrides
virtual void device_config_complete() override;
virtual void device_start() override { };
- std::vector<UINT8> m_ctape_data;
+ std::vector<uint8_t> m_ctape_data;
};
// ======================> sc499_device
@@ -62,7 +62,7 @@ class sc499_device: public device_t, public device_isa8_card_interface
{
public:
// construction/destruction
- sc499_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sc499_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
required_ioport m_iobase;
required_ioport m_irqdrq;
@@ -76,15 +76,15 @@ private:
virtual ioport_constructor device_input_ports() const override;
// ISA overrides
- virtual UINT8 dack_r(int line) override;
- virtual void dack_w(int line,UINT8 data) override;
+ virtual uint8_t dack_r(int line) override;
+ virtual void dack_w(int line,uint8_t data) override;
virtual void eop_w(int state) override;
const char *cpu_context();
template <typename Format, typename... Params> void logerror(Format &&fmt, Params &&... args) const;
- void tape_status_clear(UINT16 value);
- void tape_status_set(UINT16 value);
+ void tape_status_clear(uint16_t value);
+ void tape_status_set(uint16_t value);
// device register I/O
DECLARE_READ8_MEMBER(read);
@@ -94,18 +94,18 @@ private:
void set_interrupt(enum line_state state);
- void log_command(UINT8 data);
- void do_command(UINT8 data);
+ void log_command(uint8_t data);
+ void do_command(uint8_t data);
void do_reset();
void set_dma_drq(enum line_state state);
- void write_command_port( UINT8 data);
- UINT8 read_data_port();
- void write_control_port( UINT8 data);
- UINT8 read_status_port();
- void write_dma_go( UINT8 data);
- void write_dma_reset( UINT8 data);
+ void write_command_port( uint8_t data);
+ uint8_t read_data_port();
+ void write_control_port( uint8_t data);
+ uint8_t read_status_port();
+ void write_dma_go( uint8_t data);
+ void write_dma_reset( uint8_t data);
void log_block(const char * text);
void read_block();
@@ -113,32 +113,32 @@ private:
int block_is_filemark();
void block_set_filemark();
- UINT8 m_data;
- UINT8 m_command;
- UINT8 m_status;
- UINT8 m_control;
+ uint8_t m_data;
+ uint8_t m_command;
+ uint8_t m_status;
+ uint8_t m_control;
- UINT8 m_has_cartridge;
- UINT8 m_is_writable;
+ uint8_t m_has_cartridge;
+ uint8_t m_is_writable;
- UINT8 m_current_command;
+ uint8_t m_current_command;
- UINT8 m_first_block_hack;
- UINT8 m_nasty_readahead;
- UINT8 m_read_block_pending;
+ uint8_t m_first_block_hack;
+ uint8_t m_nasty_readahead;
+ uint8_t m_read_block_pending;
- UINT16 m_data_index;
+ uint16_t m_data_index;
- UINT16 m_tape_status; /* Drive exception flags */
- UINT16 m_data_error_counter; /* data error count: nr of blocks rewritten/soft read errors */
- UINT16 m_underrun_counter; /* underrun count: nr of times streaming was interrupted */
+ uint16_t m_tape_status; /* Drive exception flags */
+ uint16_t m_data_error_counter; /* data error count: nr of blocks rewritten/soft read errors */
+ uint16_t m_underrun_counter; /* underrun count: nr of times streaming was interrupted */
- UINT32 m_tape_pos;
- UINT32 m_ctape_block_count;
- UINT32 m_ctape_block_index;
- UINT64 m_image_length;
+ uint32_t m_tape_pos;
+ uint32_t m_ctape_block_count;
+ uint32_t m_ctape_block_index;
+ uint64_t m_image_length;
- std::vector<UINT8> m_ctape_block_buffer;
+ std::vector<uint8_t> m_ctape_block_buffer;
required_device<sc499_ctape_image_device> m_image;
enum line_state irq_state;
diff --git a/src/devices/bus/isa/side116.cpp b/src/devices/bus/isa/side116.cpp
index 2212ac3844d..5c120fe878b 100644
--- a/src/devices/bus/isa/side116.cpp
+++ b/src/devices/bus/isa/side116.cpp
@@ -86,7 +86,7 @@ const tiny_rom_entry *side116_device::device_rom_region() const
// side116_device - constructor
//-------------------------------------------------
-side116_device::side116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+side116_device::side116_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8_SIDE116, "Acculogic sIDE-1/16 IDE Disk Controller", tag, owner, clock, "side116", __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_ata(*this, "ata"),
@@ -134,11 +134,11 @@ void side116_device::device_reset()
READ8_MEMBER( side116_device::read )
{
- UINT8 data;
+ uint8_t data;
if (offset == 0)
{
- UINT16 ide_data = m_ata->read_cs0(space, 0, 0xffff);
+ uint16_t ide_data = m_ata->read_cs0(space, 0, 0xffff);
data = ide_data & 0xff;
m_latch = ide_data >> 8;
}
@@ -162,7 +162,7 @@ WRITE8_MEMBER( side116_device::write )
{
if (offset == 0)
{
- UINT16 ide_data = (m_latch << 8) | data;
+ uint16_t ide_data = (m_latch << 8) | data;
m_ata->write_cs0(space, 0, ide_data, 0xffff);
}
else if (offset < 8)
@@ -181,7 +181,7 @@ WRITE8_MEMBER( side116_device::write )
WRITE_LINE_MEMBER( side116_device::ide_interrupt )
{
- UINT8 level = m_config->read() & 0x18;
+ uint8_t level = m_config->read() & 0x18;
if (level == 0x08)
m_isa->irq2_w(state);
diff --git a/src/devices/bus/isa/side116.h b/src/devices/bus/isa/side116.h
index 2d7d2e19a1a..a3b775abc09 100644
--- a/src/devices/bus/isa/side116.h
+++ b/src/devices/bus/isa/side116.h
@@ -29,7 +29,7 @@ class side116_device : public device_t,
{
public:
// construction/destruction
- side116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ side116_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -49,7 +49,7 @@ protected:
private:
required_device<ata_interface_device> m_ata;
required_ioport m_config;
- UINT8 m_latch;
+ uint8_t m_latch;
};
diff --git a/src/devices/bus/isa/ssi2001.cpp b/src/devices/bus/isa/ssi2001.cpp
index dec6751f887..5643464b8a0 100644
--- a/src/devices/bus/isa/ssi2001.cpp
+++ b/src/devices/bus/isa/ssi2001.cpp
@@ -18,7 +18,7 @@ machine_config_constructor ssi2001_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( ssi2001 );
}
-ssi2001_device::ssi2001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ssi2001_device::ssi2001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8_SSI2001, "Innovation SSI-2001 Audio Adapter", tag, owner, clock, "ssi2001", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_joy(*this, "pc_joy"),
diff --git a/src/devices/bus/isa/ssi2001.h b/src/devices/bus/isa/ssi2001.h
index 8a58cbb8bf8..afdfc1f5175 100644
--- a/src/devices/bus/isa/ssi2001.h
+++ b/src/devices/bus/isa/ssi2001.h
@@ -19,7 +19,7 @@ class ssi2001_device : public device_t,
{
public:
// construction/destruction
- ssi2001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ssi2001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp
index b3877e423a0..1119f09e2eb 100644
--- a/src/devices/bus/isa/stereo_fx.cpp
+++ b/src/devices/bus/isa/stereo_fx.cpp
@@ -30,7 +30,7 @@ READ8_MEMBER( stereo_fx_device::p1_r )
READ8_MEMBER( stereo_fx_device::p3_r )
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
ret |= m_data_out << 2; // INT0
ret |= m_data_in << 3; // INT1
@@ -147,14 +147,14 @@ WRITE8_MEMBER( stereo_fx_device::dsp_cmd_w )
m_in_byte = data;
}
-UINT8 stereo_fx_device::dack_r(int line)
+uint8_t stereo_fx_device::dack_r(int line)
{
m_data_out = false;
m_isa->drq1_w(0);
return m_out_byte;
}
-void stereo_fx_device::dack_w(int line, UINT8 data)
+void stereo_fx_device::dack_w(int line, uint8_t data)
{
m_data_in = true;
m_isa->drq1_w(0);
@@ -189,7 +189,7 @@ READ8_MEMBER( stereo_fx_device::invalid_r )
return 0xff;
}
-stereo_fx_device::stereo_fx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+stereo_fx_device::stereo_fx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8_STEREO_FX, "ATI Stereo F/X Audio Adapter", tag, owner, clock, "stereo_fx", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_joy(*this, "pc_joy"),
diff --git a/src/devices/bus/isa/stereo_fx.h b/src/devices/bus/isa/stereo_fx.h
index 56ac6d1f74b..1be1fa0ddb0 100644
--- a/src/devices/bus/isa/stereo_fx.h
+++ b/src/devices/bus/isa/stereo_fx.h
@@ -20,7 +20,7 @@ class stereo_fx_device : public device_t,
{
public:
// construction/destruction
- stereo_fx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ stereo_fx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -55,20 +55,20 @@ protected:
virtual void device_reset() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
- UINT8 dack_r(int line) override;
- void dack_w(int line, UINT8 data) override;
+ uint8_t dack_r(int line) override;
+ void dack_w(int line, uint8_t data) override;
private:
// internal state
bool m_data_in;
- UINT8 m_in_byte;
+ uint8_t m_in_byte;
bool m_data_out;
- UINT8 m_out_byte;
+ uint8_t m_out_byte;
- UINT8 m_port20;
- UINT8 m_port00;
+ uint8_t m_port20;
+ uint8_t m_port00;
emu_timer *m_timer;
- UINT8 m_t0;
- UINT8 m_t1;
+ uint8_t m_t0;
+ uint8_t m_t1;
};
// device type definition
diff --git a/src/devices/bus/isa/svga_cirrus.cpp b/src/devices/bus/isa/svga_cirrus.cpp
index de3ecaa8bd9..1343d08e612 100644
--- a/src/devices/bus/isa/svga_cirrus.cpp
+++ b/src/devices/bus/isa/svga_cirrus.cpp
@@ -59,7 +59,7 @@ const tiny_rom_entry *isa16_svga_cirrus_device::device_rom_region() const
// isa16_vga_device - constructor
//-------------------------------------------------
-isa16_svga_cirrus_device::isa16_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_svga_cirrus_device::isa16_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA16_SVGA_CIRRUS, "Diamond Speedstar Pro SE ISA Graphics Card (BIOS v1.00)", tag, owner, clock, "dm_clgd5430", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr)
{
@@ -145,7 +145,7 @@ const tiny_rom_entry *isa16_svga_cirrus_gd542x_device::device_rom_region() const
// isa16_vga_device - constructor
//-------------------------------------------------
-isa16_svga_cirrus_gd542x_device::isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_svga_cirrus_gd542x_device::isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA16_SVGA_CIRRUS_GD542X, "Generic Cirrus Logic GD542x Graphics Card (BIOS v1.20)", tag, owner, clock, "clgd542x", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr)
{
diff --git a/src/devices/bus/isa/svga_cirrus.h b/src/devices/bus/isa/svga_cirrus.h
index c46d7630285..1f89bd1ed22 100644
--- a/src/devices/bus/isa/svga_cirrus.h
+++ b/src/devices/bus/isa/svga_cirrus.h
@@ -19,7 +19,7 @@ class isa16_svga_cirrus_device :
{
public:
// construction/destruction
- isa16_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -40,7 +40,7 @@ class isa16_svga_cirrus_gd542x_device :
{
public:
// construction/destruction
- isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/svga_s3.cpp b/src/devices/bus/isa/svga_s3.cpp
index 9e37a29f55c..cf539a0b8e3 100644
--- a/src/devices/bus/isa/svga_s3.cpp
+++ b/src/devices/bus/isa/svga_s3.cpp
@@ -70,7 +70,7 @@ const tiny_rom_entry *isa16_svga_s3_device::device_rom_region() const
// isa16_vga_device - constructor
//-------------------------------------------------
-isa16_svga_s3_device::isa16_svga_s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_svga_s3_device::isa16_svga_s3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA16_SVGA_S3, "Number Nine 9FX Vision 330 (S3 764) Graphics Card", tag, owner, clock, "s3_764", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr), m_8514(nullptr)
{
@@ -182,7 +182,7 @@ const tiny_rom_entry *isa16_s3virge_device::device_rom_region() const
// isa16_vga_device - constructor
//-------------------------------------------------
-isa16_s3virge_device::isa16_s3virge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_s3virge_device::isa16_s3virge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA16_S3VIRGE, "S3 ViRGE Graphics Card", tag, owner, clock, "s3virge", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr)
{
@@ -269,7 +269,7 @@ const tiny_rom_entry *isa16_s3virgedx_device::device_rom_region() const
// isa16_vga_device - constructor
//-------------------------------------------------
-isa16_s3virgedx_device::isa16_s3virgedx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_s3virgedx_device::isa16_s3virgedx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA16_S3VIRGEDX, "S3 ViRGE/DX Graphics Card", tag, owner, clock, "s3virgedx", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr)
{
@@ -357,7 +357,7 @@ const tiny_rom_entry *isa16_stealth3d2kpro_device::device_rom_region() const
// isa16_vga_device - constructor
//-------------------------------------------------
-isa16_stealth3d2kpro_device::isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_stealth3d2kpro_device::isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA16_DMS3D2KPRO, "Diamond Stealth 3D 2000 Pro", tag, owner, clock, "dms3d2kp", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr)
{
diff --git a/src/devices/bus/isa/svga_s3.h b/src/devices/bus/isa/svga_s3.h
index 92c824e0339..4b940dfb2d7 100644
--- a/src/devices/bus/isa/svga_s3.h
+++ b/src/devices/bus/isa/svga_s3.h
@@ -22,7 +22,7 @@ class isa16_svga_s3_device :
{
public:
// construction/destruction
- isa16_svga_s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_svga_s3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -44,7 +44,7 @@ class isa16_s3virge_device :
{
public:
// construction/destruction
- isa16_s3virge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_s3virge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -65,7 +65,7 @@ class isa16_s3virgedx_device :
{
public:
// construction/destruction
- isa16_s3virgedx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_s3virgedx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -86,7 +86,7 @@ class isa16_stealth3d2kpro_device :
{
public:
// construction/destruction
- isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/svga_trident.cpp b/src/devices/bus/isa/svga_trident.cpp
index e4dd7005d37..e12eb1153c8 100644
--- a/src/devices/bus/isa/svga_trident.cpp
+++ b/src/devices/bus/isa/svga_trident.cpp
@@ -61,7 +61,7 @@ const tiny_rom_entry *isa16_svga_tgui9680_device::device_rom_region() const
// isa8_vga_device - constructor
//-------------------------------------------------
-isa16_svga_tgui9680_device::isa16_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_svga_tgui9680_device::isa16_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA16_SVGA_TGUI9680, "Trident TGUI9680 Graphics Card (BIOS X5.5 (02) 02/13/96)", tag, owner, clock, "tgui9680", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr)
{
diff --git a/src/devices/bus/isa/svga_trident.h b/src/devices/bus/isa/svga_trident.h
index 3ee4a192d27..b50134af3a1 100644
--- a/src/devices/bus/isa/svga_trident.h
+++ b/src/devices/bus/isa/svga_trident.h
@@ -26,7 +26,7 @@ class isa16_svga_tgui9680_device :
{
public:
// construction/destruction
- isa16_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/svga_tseng.cpp b/src/devices/bus/isa/svga_tseng.cpp
index ad5acfe9243..c71a6f9a82c 100644
--- a/src/devices/bus/isa/svga_tseng.cpp
+++ b/src/devices/bus/isa/svga_tseng.cpp
@@ -59,7 +59,7 @@ const tiny_rom_entry *isa8_svga_et4k_device::device_rom_region() const
// isa8_vga_device - constructor
//-------------------------------------------------
-isa8_svga_et4k_device::isa8_svga_et4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_svga_et4k_device::isa8_svga_et4k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8_SVGA_ET4K, "SVGA Tseng ET4000 Graphics Card", tag, owner, clock, "et4000", __FILE__),
device_isa8_card_interface(mconfig, *this), m_vga(nullptr)
{
diff --git a/src/devices/bus/isa/svga_tseng.h b/src/devices/bus/isa/svga_tseng.h
index 32093785de6..7bba5348e71 100644
--- a/src/devices/bus/isa/svga_tseng.h
+++ b/src/devices/bus/isa/svga_tseng.h
@@ -21,7 +21,7 @@ class isa8_svga_et4k_device :
{
public:
// construction/destruction
- isa8_svga_et4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_svga_et4k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/trident.cpp b/src/devices/bus/isa/trident.cpp
index b97f35abc78..5f97774ceba 100644
--- a/src/devices/bus/isa/trident.cpp
+++ b/src/devices/bus/isa/trident.cpp
@@ -20,41 +20,41 @@ const device_type TVGA9000_VGA = &device_creator<tvga9000_device>;
#define LOG (1)
#define LOG_ACCEL (1)
-trident_vga_device::trident_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+trident_vga_device::trident_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: svga_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-tgui9860_device::tgui9860_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tgui9860_device::tgui9860_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: trident_vga_device(mconfig, TRIDENT_VGA, "Trident TGUI9680", tag, owner, clock, "trident_vga", __FILE__)
{
m_version = 0xd3; // 0xd3 identifies at TGUI9660XGi (set to 0xe3 to identify at TGUI9440AGi)
}
-tvga9000_device::tvga9000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tvga9000_device::tvga9000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: trident_vga_device(mconfig, TVGA9000_VGA, "Trident TVGA9000", tag, owner, clock, "tvga9000_vga", __FILE__)
{
m_version = 0x43;
}
-UINT8 trident_vga_device::READPIXEL8(INT16 x, INT16 y)
+uint8_t trident_vga_device::READPIXEL8(int16_t x, int16_t y)
{
return (vga.memory[((y & 0xfff)*offset() + (x & 0xfff)) % vga.svga_intf.vram_size]);
}
-UINT16 trident_vga_device::READPIXEL15(INT16 x, INT16 y)
+uint16_t trident_vga_device::READPIXEL15(int16_t x, int16_t y)
{
return (vga.memory[((y & 0xfff)*offset() + (x & 0xfff)*2) % vga.svga_intf.vram_size] |
(vga.memory[((y & 0xfff)*offset() + ((x & 0xfff)*2)+1) % vga.svga_intf.vram_size] << 8));
}
-UINT16 trident_vga_device::READPIXEL16(INT16 x, INT16 y)
+uint16_t trident_vga_device::READPIXEL16(int16_t x, int16_t y)
{
return (vga.memory[((y & 0xfff)*offset() + (x & 0xfff)*2) % vga.svga_intf.vram_size] |
(vga.memory[((y & 0xfff)*offset() + ((x & 0xfff)*2)+1) % vga.svga_intf.vram_size] << 8));
}
-UINT32 trident_vga_device::READPIXEL32(INT16 x, INT16 y)
+uint32_t trident_vga_device::READPIXEL32(int16_t x, int16_t y)
{
return (vga.memory[((y & 0xfff)*offset() + (x & 0xfff)*4) % vga.svga_intf.vram_size] |
(vga.memory[((y & 0xfff)*offset() + ((x & 0xfff)*4)+1) % vga.svga_intf.vram_size] << 8) |
@@ -62,7 +62,7 @@ UINT32 trident_vga_device::READPIXEL32(INT16 x, INT16 y)
(vga.memory[((y & 0xfff)*offset() + ((x & 0xfff)*4)+3) % vga.svga_intf.vram_size] << 24));
}
-void trident_vga_device::WRITEPIXEL8(INT16 x, INT16 y, UINT8 data)
+void trident_vga_device::WRITEPIXEL8(int16_t x, int16_t y, uint8_t data)
{
if((x & 0xfff)<tri.accel_dest_x_clip && (y & 0xfff)<tri.accel_dest_y_clip)
{
@@ -71,7 +71,7 @@ void trident_vga_device::WRITEPIXEL8(INT16 x, INT16 y, UINT8 data)
}
}
-void trident_vga_device::WRITEPIXEL15(INT16 x, INT16 y, UINT16 data)
+void trident_vga_device::WRITEPIXEL15(int16_t x, int16_t y, uint16_t data)
{
if((x & 0xfff)<tri.accel_dest_x_clip && (y & 0xfff)<tri.accel_dest_y_clip)
{
@@ -81,7 +81,7 @@ void trident_vga_device::WRITEPIXEL15(INT16 x, INT16 y, UINT16 data)
}
}
-void trident_vga_device::WRITEPIXEL16(INT16 x, INT16 y, UINT16 data)
+void trident_vga_device::WRITEPIXEL16(int16_t x, int16_t y, uint16_t data)
{
if((x & 0xfff)<tri.accel_dest_x_clip && (y & 0xfff)<tri.accel_dest_y_clip)
{
@@ -91,7 +91,7 @@ void trident_vga_device::WRITEPIXEL16(INT16 x, INT16 y, UINT16 data)
}
}
-void trident_vga_device::WRITEPIXEL32(INT16 x, INT16 y, UINT32 data)
+void trident_vga_device::WRITEPIXEL32(int16_t x, int16_t y, uint32_t data)
{
if((x & 0xfff)<tri.accel_dest_x_clip && (y & 0xfff)<tri.accel_dest_y_clip)
{
@@ -103,7 +103,7 @@ void trident_vga_device::WRITEPIXEL32(INT16 x, INT16 y, UINT32 data)
}
}
-UINT32 trident_vga_device::handle_rop(UINT32 src, UINT32 dst)
+uint32_t trident_vga_device::handle_rop(uint32_t src, uint32_t dst)
{
switch(tri.accel_fmix) // TODO: better understand this register
{
@@ -127,7 +127,7 @@ UINT32 trident_vga_device::handle_rop(UINT32 src, UINT32 dst)
return src;
}
-UINT32 trident_vga_device::READPIXEL(INT16 x,INT16 y)
+uint32_t trident_vga_device::READPIXEL(int16_t x,int16_t y)
{
if(svga.rgb8_en)
return READPIXEL8(x,y) & 0xff;
@@ -140,7 +140,7 @@ UINT32 trident_vga_device::READPIXEL(INT16 x,INT16 y)
return 0; // should never reach here
}
-void trident_vga_device::WRITEPIXEL(INT16 x,INT16 y, UINT32 data)
+void trident_vga_device::WRITEPIXEL(int16_t x,int16_t y, uint32_t data)
{
if(svga.rgb8_en)
WRITEPIXEL8(x,y,(((data >> 8) & 0xff) | (data & 0xff))); // XFree86 3.3 sets bits 0-7 to 0 when using mono patterns, does it OR each byte?
@@ -207,9 +207,9 @@ void trident_vga_device::device_reset()
tri.pixel_depth = 0x10; //disable 8bpp mode by default
}
-UINT32 trident_vga_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t trident_vga_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT8 cur_mode;
+ uint8_t cur_mode;
svga_device::screen_update(screen,bitmap,cliprect);
cur_mode = pc_vga_choosevideomode();
@@ -217,15 +217,15 @@ UINT32 trident_vga_device::screen_update(screen_device &screen, bitmap_rgb32 &bi
// draw hardware graphics cursor
if(tri.cursor_ctrl & 0x80) // if cursor is enabled
{
- UINT32 src;
- UINT32* dst;
- UINT8 val;
+ uint32_t src;
+ uint32_t* dst;
+ uint8_t val;
int x,y;
- UINT16 cx = tri.cursor_x & 0x0fff;
- UINT16 cy = tri.cursor_y & 0x0fff;
- UINT32 bg_col;
- UINT32 fg_col;
- UINT8 cursor_size = (tri.cursor_ctrl & 0x01) ? 64 : 32;
+ uint16_t cx = tri.cursor_x & 0x0fff;
+ uint16_t cy = tri.cursor_y & 0x0fff;
+ uint32_t bg_col;
+ uint32_t fg_col;
+ uint8_t cursor_size = (tri.cursor_ctrl & 0x01) ? 64 : 32;
if(cur_mode == SCREEN_OFF || cur_mode == TEXT_MODE || cur_mode == MONO_MODE || cur_mode == CGA_MODE || cur_mode == EGA_MODE)
return 0; // cursor only works in VGA or SVGA modes
@@ -245,15 +245,15 @@ UINT32 trident_vga_device::screen_update(screen_device &screen, bitmap_rgb32 &bi
for(y=0;y<cursor_size;y++)
{
- UINT8 bitcount = 31;
+ uint8_t bitcount = 31;
dst = &bitmap.pix32(cy + y, cx);
for(x=0;x<cursor_size;x++)
{
- UINT32 bitb = (vga.memory[(src+3) % vga.svga_intf.vram_size]
+ uint32_t bitb = (vga.memory[(src+3) % vga.svga_intf.vram_size]
| ((vga.memory[(src+2) % vga.svga_intf.vram_size]) << 8)
| ((vga.memory[(src+1) % vga.svga_intf.vram_size]) << 16)
| ((vga.memory[(src+0) % vga.svga_intf.vram_size]) << 24));
- UINT32 bita = (vga.memory[(src+7) % vga.svga_intf.vram_size]
+ uint32_t bita = (vga.memory[(src+7) % vga.svga_intf.vram_size]
| ((vga.memory[(src+6) % vga.svga_intf.vram_size]) << 8)
| ((vga.memory[(src+5) % vga.svga_intf.vram_size]) << 16)
| ((vga.memory[(src+4) % vga.svga_intf.vram_size]) << 24));
@@ -307,9 +307,9 @@ UINT32 trident_vga_device::screen_update(screen_device &screen, bitmap_rgb32 &bi
return 0;
}
-UINT16 trident_vga_device::offset()
+uint16_t trident_vga_device::offset()
{
- UINT16 off = svga_device::offset();
+ uint16_t off = svga_device::offset();
if (svga.rgb8_en || svga.rgb15_en || svga.rgb16_en || svga.rgb32_en)
return vga.crtc.offset << 3; // don't know if this is right, but Eggs Playing Chicken switches off doubleword mode, but expects the same offset length
@@ -324,7 +324,7 @@ int trident_vga_device::calculate_clock()
// Bit 12: K
// Later formula extends each variable by one extra bit (Providia 9685 and later)
double freq;
- UINT8 m,n,k;
+ uint8_t m,n,k;
m = tri.vid_clock & 0x007f;
n = (tri.vid_clock & 0x0f80) >> 7;
@@ -401,9 +401,9 @@ void trident_vga_device::trident_define_video_mode()
recompute_params_clock(divisor, xtal);
}
-UINT8 trident_vga_device::trident_seq_reg_read(UINT8 index)
+uint8_t trident_vga_device::trident_seq_reg_read(uint8_t index)
{
- UINT8 res;
+ uint8_t res;
res = 0xff;
@@ -450,7 +450,7 @@ UINT8 trident_vga_device::trident_seq_reg_read(UINT8 index)
return res;
}
-void trident_vga_device::trident_seq_reg_write(UINT8 index, UINT8 data)
+void trident_vga_device::trident_seq_reg_write(uint8_t index, uint8_t data)
{
vga.sequencer.data[vga.sequencer.index] = data;
if(index <= 0x04)
@@ -509,9 +509,9 @@ void trident_vga_device::trident_seq_reg_write(UINT8 index, UINT8 data)
if(LOG) logerror("Trident SR%02X: %s mode write %02x\n",index,tri.new_mode ? "new" : "old",data);
}
-UINT8 trident_vga_device::trident_crtc_reg_read(UINT8 index)
+uint8_t trident_vga_device::trident_crtc_reg_read(uint8_t index)
{
- UINT8 res = 0;
+ uint8_t res = 0;
if(index <= 0x18)
res = crtc_reg_read(index);
@@ -613,7 +613,7 @@ UINT8 trident_vga_device::trident_crtc_reg_read(UINT8 index)
if(LOG) logerror("Trident CR%02X: read %02x\n",index,res);
return res;
}
-void trident_vga_device::trident_crtc_reg_write(UINT8 index, UINT8 data)
+void trident_vga_device::trident_crtc_reg_write(uint8_t index, uint8_t data)
{
if(index <= 0x18)
{
@@ -723,9 +723,9 @@ void trident_vga_device::trident_crtc_reg_write(UINT8 index, UINT8 data)
if(LOG) logerror("Trident CR%02X: write %02x\n",index,data);
}
-UINT8 trident_vga_device::trident_gc_reg_read(UINT8 index)
+uint8_t trident_vga_device::trident_gc_reg_read(uint8_t index)
{
- UINT8 res;
+ uint8_t res;
if(index <= 0x0d)
res = gc_reg_read(index);
@@ -752,7 +752,7 @@ UINT8 trident_vga_device::trident_gc_reg_read(UINT8 index)
return res;
}
-void trident_vga_device::trident_gc_reg_write(UINT8 index, UINT8 data)
+void trident_vga_device::trident_gc_reg_write(uint8_t index, uint8_t data)
{
if(index <= 0x0d)
gc_reg_write(index,data);
@@ -786,7 +786,7 @@ void trident_vga_device::trident_gc_reg_write(UINT8 index, UINT8 data)
READ8_MEMBER(trident_vga_device::port_03c0_r)
{
- UINT8 res;
+ uint8_t res;
switch(offset)
{
@@ -857,7 +857,7 @@ WRITE8_MEMBER(trident_vga_device::port_03c0_w)
READ8_MEMBER(trident_vga_device::port_03d0_r)
{
- UINT8 res = 0xff;
+ uint8_t res = 0xff;
if (CRTC_PORT_ADDR == 0x3d0)
{
@@ -939,7 +939,7 @@ WRITE8_MEMBER(trident_vga_device::port_03d0_w)
READ8_MEMBER(trident_vga_device::port_43c6_r)
{
- UINT8 res = 0xff;
+ uint8_t res = 0xff;
switch(offset)
{
case 2:
@@ -997,7 +997,7 @@ WRITE8_MEMBER(trident_vga_device::port_43c6_w)
// Not much else is known. XFree86 uses register 4 for something related to DPMS
READ8_MEMBER(trident_vga_device::port_83c6_r)
{
- UINT8 res = 0xff;
+ uint8_t res = 0xff;
switch(offset)
{
case 2:
@@ -1110,13 +1110,13 @@ WRITE8_MEMBER(trident_vga_device::mem_w)
}
// Old style MMIO (maps to 0xbff00)
-void trident_vga_device::old_mmio_w(address_space& space, UINT32 offset, UINT8 data)
+void trident_vga_device::old_mmio_w(address_space& space, uint32_t offset, uint8_t data)
{
if(offset >= 0x20)
accel_w(space,offset-0x20,data);
}
-UINT8 trident_vga_device::old_mmio_r(address_space& space, UINT32 offset)
+uint8_t trident_vga_device::old_mmio_r(address_space& space, uint32_t offset)
{
if(offset == 0x20)
{
@@ -1194,7 +1194,7 @@ Graphics Engine for 9440/9660/9680
READ8_MEMBER(trident_vga_device::accel_r)
{
- UINT8 res = 0xff;
+ uint8_t res = 0xff;
if(offset >= 0x60)
return tri.accel_pattern[(offset-0x60) % 0x80];
@@ -1561,13 +1561,13 @@ void trident_vga_device::accel_bitblt()
void trident_vga_device::accel_line()
{
- UINT32 col = tri.accel_fgcolour;
+ uint32_t col = tri.accel_fgcolour;
// TGUI_SRC_XY(dmin-dmaj,dmin);
// TGUI_DEST_XY(x,y);
// TGUI_DIM_XY(dmin+e,len);
- INT16 dx = tri.accel_source_y - tri.accel_source_x;
- INT16 dy = tri.accel_source_y;
- INT16 err = tri.accel_dim_x + tri.accel_source_y;
+ int16_t dx = tri.accel_source_y - tri.accel_source_x;
+ int16_t dy = tri.accel_source_y;
+ int16_t err = tri.accel_dim_x + tri.accel_source_y;
int sx = (tri.accel_drawflags & 0x0200) ? -1 : 1;
int sy = (tri.accel_drawflags & 0x0100) ? -1 : 1;
int x,y,z;
@@ -1600,7 +1600,7 @@ void trident_vga_device::accel_line()
}
// feed data written to VRAM to an active BitBLT command
-void trident_vga_device::accel_data_write(UINT32 data)
+void trident_vga_device::accel_data_write(uint32_t data)
{
int xdir = 1,ydir = 1;
diff --git a/src/devices/bus/isa/trident.h b/src/devices/bus/isa/trident.h
index 47ba8d3f8e4..63ef51aa36a 100644
--- a/src/devices/bus/isa/trident.h
+++ b/src/devices/bus/isa/trident.h
@@ -16,7 +16,7 @@ class trident_vga_device : public svga_device
{
public:
// construction/destruction
- trident_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ trident_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual READ8_MEMBER(port_03c0_r) override;
virtual WRITE8_MEMBER(port_03c0_w) override;
@@ -30,12 +30,12 @@ public:
DECLARE_WRITE8_MEMBER(vram_w);
virtual READ8_MEMBER(mem_r) override;
virtual WRITE8_MEMBER(mem_w) override;
- virtual UINT16 offset() override;
+ virtual uint16_t offset() override;
DECLARE_READ8_MEMBER(accel_r);
DECLARE_WRITE8_MEMBER(accel_w);
- virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
+ virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
protected:
virtual void device_start() override;
@@ -43,120 +43,120 @@ protected:
struct
{
- UINT8 sr0c;
- UINT8 sr0d_old;
- UINT8 sr0d_new;
- UINT8 sr0e_old;
- UINT8 sr0e_new;
- UINT8 sr0f;
- UINT8 gc0e;
- UINT8 gc0f;
- UINT8 gc2f;
- UINT8 cr1e;
- UINT8 cr1f;
- UINT8 cr20;
- UINT8 cr21;
- UINT8 cr29;
- UINT8 cr2a;
- UINT8 cr39;
- UINT8 dac;
- UINT8 lutdac_reg[0x100];
- UINT8 lutdac_index;
+ uint8_t sr0c;
+ uint8_t sr0d_old;
+ uint8_t sr0d_new;
+ uint8_t sr0e_old;
+ uint8_t sr0e_new;
+ uint8_t sr0f;
+ uint8_t gc0e;
+ uint8_t gc0f;
+ uint8_t gc2f;
+ uint8_t cr1e;
+ uint8_t cr1f;
+ uint8_t cr20;
+ uint8_t cr21;
+ uint8_t cr29;
+ uint8_t cr2a;
+ uint8_t cr39;
+ uint8_t dac;
+ uint8_t lutdac_reg[0x100];
+ uint8_t lutdac_index;
bool new_mode;
bool port_3c3;
- UINT8 port_3db;
- UINT8 clock;
- UINT8 pixel_depth;
- UINT8 revision;
+ uint8_t port_3db;
+ uint8_t clock;
+ uint8_t pixel_depth;
+ uint8_t revision;
bool dac_active;
- UINT8 dac_count;
- UINT32 linear_address;
+ uint8_t dac_count;
+ uint32_t linear_address;
bool linear_active;
bool mmio_active;
- UINT16 mem_clock; // I/O 0x43c6
- UINT16 vid_clock; // I/O 0x43c8
- UINT16 cursor_x;
- UINT16 cursor_y;
- UINT16 cursor_loc;
- UINT8 cursor_x_off;
- UINT8 cursor_y_off;
- UINT32 cursor_fg; // colour
- UINT32 cursor_bg; // colour
- UINT8 cursor_ctrl;
+ uint16_t mem_clock; // I/O 0x43c6
+ uint16_t vid_clock; // I/O 0x43c8
+ uint16_t cursor_x;
+ uint16_t cursor_y;
+ uint16_t cursor_loc;
+ uint8_t cursor_x_off;
+ uint8_t cursor_y_off;
+ uint32_t cursor_fg; // colour
+ uint32_t cursor_bg; // colour
+ uint8_t cursor_ctrl;
// 2D acceleration
- UINT16 accel_opermode;
- UINT8 accel_command;
- UINT8 accel_fmix;
- UINT32 accel_drawflags;
- UINT32 accel_fgcolour;
- UINT32 accel_bgcolour;
- UINT16 accel_pattern_loc;
- INT16 accel_source_x;
- INT16 accel_source_y;
- INT16 accel_dest_x;
- INT16 accel_dest_y;
- INT16 accel_dim_x;
- INT16 accel_dim_y;
- UINT32 accel_style;
- UINT32 accel_ckey;
- INT16 accel_source_x_clip;
- INT16 accel_source_y_clip;
- INT16 accel_dest_x_clip;
- INT16 accel_dest_y_clip;
- UINT32 accel_fg_pattern_colour;
- UINT32 accel_bg_pattern_colour;
- UINT8 accel_pattern[0x80];
+ uint16_t accel_opermode;
+ uint8_t accel_command;
+ uint8_t accel_fmix;
+ uint32_t accel_drawflags;
+ uint32_t accel_fgcolour;
+ uint32_t accel_bgcolour;
+ uint16_t accel_pattern_loc;
+ int16_t accel_source_x;
+ int16_t accel_source_y;
+ int16_t accel_dest_x;
+ int16_t accel_dest_y;
+ int16_t accel_dim_x;
+ int16_t accel_dim_y;
+ uint32_t accel_style;
+ uint32_t accel_ckey;
+ int16_t accel_source_x_clip;
+ int16_t accel_source_y_clip;
+ int16_t accel_dest_x_clip;
+ int16_t accel_dest_y_clip;
+ uint32_t accel_fg_pattern_colour;
+ uint32_t accel_bg_pattern_colour;
+ uint8_t accel_pattern[0x80];
bool accel_busy;
bool accel_memwrite_active; // true when writing to VRAM will push data to an ongoing command (SRCMONO/PATMONO)
- INT16 accel_mem_x;
- INT16 accel_mem_y;
- UINT32 accel_transfer;
+ int16_t accel_mem_x;
+ int16_t accel_mem_y;
+ uint32_t accel_transfer;
} tri;
- UINT8 m_version;
+ uint8_t m_version;
private:
- UINT8 trident_seq_reg_read(UINT8 index);
- void trident_seq_reg_write(UINT8 index, UINT8 data);
+ uint8_t trident_seq_reg_read(uint8_t index);
+ void trident_seq_reg_write(uint8_t index, uint8_t data);
void trident_define_video_mode();
- UINT8 trident_crtc_reg_read(UINT8 index);
- void trident_crtc_reg_write(UINT8 index, UINT8 data);
- UINT8 trident_gc_reg_read(UINT8 index);
- void trident_gc_reg_write(UINT8 index, UINT8 data);
+ uint8_t trident_crtc_reg_read(uint8_t index);
+ void trident_crtc_reg_write(uint8_t index, uint8_t data);
+ uint8_t trident_gc_reg_read(uint8_t index);
+ void trident_gc_reg_write(uint8_t index, uint8_t data);
int calculate_clock();
// old style MMIO (0xBFF00)
- void old_mmio_w(address_space& space, UINT32 offset, UINT8 data);
- UINT8 old_mmio_r(address_space& space, UINT32 offset);
+ void old_mmio_w(address_space& space, uint32_t offset, uint8_t data);
+ uint8_t old_mmio_r(address_space& space, uint32_t offset);
// 2D acceleration
void accel_command();
void accel_bitblt();
void accel_line();
- void accel_data_write(UINT32 data);
- UINT8 READPIXEL8(INT16 x, INT16 y);
- UINT16 READPIXEL15(INT16 x, INT16 y);
- UINT16 READPIXEL16(INT16 x, INT16 y);
- UINT32 READPIXEL32(INT16 x, INT16 y);
- void WRITEPIXEL8(INT16 x, INT16 y, UINT8 data);
- void WRITEPIXEL15(INT16 x, INT16 y, UINT16 data);
- void WRITEPIXEL16(INT16 x, INT16 y, UINT16 data);
- void WRITEPIXEL32(INT16 x, INT16 y, UINT32 data);
- UINT32 READPIXEL(INT16 x,INT16 y);
- void WRITEPIXEL(INT16 x,INT16 y, UINT32 data);
- UINT32 handle_rop(UINT32 src, UINT32 dst);
+ void accel_data_write(uint32_t data);
+ uint8_t READPIXEL8(int16_t x, int16_t y);
+ uint16_t READPIXEL15(int16_t x, int16_t y);
+ uint16_t READPIXEL16(int16_t x, int16_t y);
+ uint32_t READPIXEL32(int16_t x, int16_t y);
+ void WRITEPIXEL8(int16_t x, int16_t y, uint8_t data);
+ void WRITEPIXEL15(int16_t x, int16_t y, uint16_t data);
+ void WRITEPIXEL16(int16_t x, int16_t y, uint16_t data);
+ void WRITEPIXEL32(int16_t x, int16_t y, uint32_t data);
+ uint32_t READPIXEL(int16_t x,int16_t y);
+ void WRITEPIXEL(int16_t x,int16_t y, uint32_t data);
+ uint32_t handle_rop(uint32_t src, uint32_t dst);
};
class tgui9860_device : public trident_vga_device
{
public:
- tgui9860_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tgui9860_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class tvga9000_device : public trident_vga_device
{
public:
- tvga9000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tvga9000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
// device type definition
diff --git a/src/devices/bus/isa/vga.cpp b/src/devices/bus/isa/vga.cpp
index c47b7c516fd..371ec5d899c 100644
--- a/src/devices/bus/isa/vga.cpp
+++ b/src/devices/bus/isa/vga.cpp
@@ -49,7 +49,7 @@ const tiny_rom_entry *isa8_vga_device::device_rom_region() const
// isa8_vga_device - constructor
//-------------------------------------------------
-isa8_vga_device::isa8_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa8_vga_device::isa8_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA8_VGA, "IBM VGA Graphics Card", tag, owner, clock, "ibm_vga", __FILE__),
device_isa8_card_interface(mconfig, *this), m_vga(nullptr)
{
diff --git a/src/devices/bus/isa/vga.h b/src/devices/bus/isa/vga.h
index e850e0e4929..6a9b785d5ec 100644
--- a/src/devices/bus/isa/vga.h
+++ b/src/devices/bus/isa/vga.h
@@ -21,7 +21,7 @@ class isa8_vga_device :
{
public:
// construction/destruction
- isa8_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/vga_ati.cpp b/src/devices/bus/isa/vga_ati.cpp
index 0a9867964c5..57be162e365 100644
--- a/src/devices/bus/isa/vga_ati.cpp
+++ b/src/devices/bus/isa/vga_ati.cpp
@@ -146,19 +146,19 @@ const tiny_rom_entry *isa16_vga_mach64_device::device_rom_region() const
// isa8_vga_device - constructor
//-------------------------------------------------
-isa16_vga_gfxultra_device::isa16_vga_gfxultra_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_vga_gfxultra_device::isa16_vga_gfxultra_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA16_VGA_GFXULTRA, "ATi Graphics Ultra Card", tag, owner, clock, "gfxultra", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr), m_8514(nullptr)
{
}
-isa16_vga_gfxultrapro_device::isa16_vga_gfxultrapro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_vga_gfxultrapro_device::isa16_vga_gfxultrapro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA16_SVGA_GFXULTRAPRO, "ATi Graphics Ultra Pro Card", tag, owner, clock, "gfxultrp", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr)
{
}
-isa16_vga_mach64_device::isa16_vga_mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isa16_vga_mach64_device::isa16_vga_mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISA16_SVGA_MACH64, "ATi mach64 Card", tag, owner, clock, "mach64", __FILE__),
device_isa16_card_interface(mconfig, *this), m_vga(nullptr)
{
diff --git a/src/devices/bus/isa/vga_ati.h b/src/devices/bus/isa/vga_ati.h
index 5a400e11c24..45b2696b75a 100644
--- a/src/devices/bus/isa/vga_ati.h
+++ b/src/devices/bus/isa/vga_ati.h
@@ -29,7 +29,7 @@ class isa16_vga_gfxultra_device :
{
public:
// construction/destruction
- isa16_vga_gfxultra_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_vga_gfxultra_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -51,7 +51,7 @@ class isa16_vga_gfxultrapro_device :
{
public:
// construction/destruction
- isa16_vga_gfxultrapro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_vga_gfxultrapro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -72,7 +72,7 @@ class isa16_vga_mach64_device :
{
public:
// construction/destruction
- isa16_vga_mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa16_vga_mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/isa/wd1002a_wx1.cpp b/src/devices/bus/isa/wd1002a_wx1.cpp
index 151418882db..53fc146898c 100644
--- a/src/devices/bus/isa/wd1002a_wx1.cpp
+++ b/src/devices/bus/isa/wd1002a_wx1.cpp
@@ -45,7 +45,7 @@ const tiny_rom_entry *isa8_wd1002a_wx1_device::device_rom_region() const
// isa8_wd1002a_wx1_device - constructor
//-------------------------------------------------
-isa8_wd1002a_wx1_device::isa8_wd1002a_wx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+isa8_wd1002a_wx1_device::isa8_wd1002a_wx1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ISA8_WD1002A_WX1, "WD1002A-WX1", tag, owner, clock, "wd1002a_wx1", __FILE__),
device_isa8_card_interface( mconfig, *this )
{
diff --git a/src/devices/bus/isa/wd1002a_wx1.h b/src/devices/bus/isa/wd1002a_wx1.h
index 3bb361849d3..e6ca7cbf438 100644
--- a/src/devices/bus/isa/wd1002a_wx1.h
+++ b/src/devices/bus/isa/wd1002a_wx1.h
@@ -27,7 +27,7 @@ class isa8_wd1002a_wx1_device : public device_t,
{
public:
// construction/destruction
- isa8_wd1002a_wx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isa8_wd1002a_wx1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/isa/wdxt_gen.cpp b/src/devices/bus/isa/wdxt_gen.cpp
index f7d0523a036..518e081f6ab 100644
--- a/src/devices/bus/isa/wdxt_gen.cpp
+++ b/src/devices/bus/isa/wdxt_gen.cpp
@@ -189,7 +189,7 @@ machine_config_constructor wdxt_gen_device::device_mconfig_additions() const
// wdxt_gen_device - constructor
//-------------------------------------------------
-wdxt_gen_device::wdxt_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+wdxt_gen_device::wdxt_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ISA8_WDXT_GEN, "Western Digital WDXT-GEN (Amstrad PC1512/1640)", tag, owner, clock, "wdxt_gen", __FILE__),
device_isa8_card_interface(mconfig, *this),
m_maincpu(*this, WD1015_TAG),
@@ -227,7 +227,7 @@ void wdxt_gen_device::device_reset()
// dack_r -
//-------------------------------------------------
-UINT8 wdxt_gen_device::dack_r(int line)
+uint8_t wdxt_gen_device::dack_r(int line)
{
return m_host->dack_r();
}
@@ -237,7 +237,7 @@ UINT8 wdxt_gen_device::dack_r(int line)
// dack_w -
//-------------------------------------------------
-void wdxt_gen_device::dack_w(int line, UINT8 data)
+void wdxt_gen_device::dack_w(int line, uint8_t data)
{
m_host->dack_w(data);
}
@@ -283,7 +283,7 @@ READ8_MEMBER( wdxt_gen_device::wd1015_p1_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
logerror("%s P1 read %02x\n", machine().describe_context(), data);
@@ -339,7 +339,7 @@ READ8_MEMBER( wdxt_gen_device::wd1015_p2_r )
*/
- UINT8 data = 0x40;
+ uint8_t data = 0x40;
data |= m_host->ecc_not_0_r() << 7;
diff --git a/src/devices/bus/isa/wdxt_gen.h b/src/devices/bus/isa/wdxt_gen.h
index e1beb34267a..9f3fcdeaa5d 100644
--- a/src/devices/bus/isa/wdxt_gen.h
+++ b/src/devices/bus/isa/wdxt_gen.h
@@ -39,7 +39,7 @@ class wdxt_gen_device : public device_t,
{
public:
// construction/destruction
- wdxt_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wdxt_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -65,17 +65,17 @@ protected:
virtual void device_reset() override;
// device_isa8_card_interface
- virtual UINT8 dack_r(int line) override;
- virtual void dack_w(int line, UINT8 data) override;
+ virtual uint8_t dack_r(int line) override;
+ virtual void dack_w(int line, uint8_t data) override;
private:
required_device<cpu_device> m_maincpu;
required_device<wd11c00_17_device> m_host;
required_device<wd2010_device> m_hdc;
- UINT8 m_ram[0x800];
+ uint8_t m_ram[0x800];
- //UINT8 m_hdc_addr;
+ //uint8_t m_hdc_addr;
};
diff --git a/src/devices/bus/isa/xtide.cpp b/src/devices/bus/isa/xtide.cpp
index 2861484d8a1..f28b23e24b0 100644
--- a/src/devices/bus/isa/xtide.cpp
+++ b/src/devices/bus/isa/xtide.cpp
@@ -58,11 +58,11 @@ Device Control (out) 14 7
READ8_MEMBER( xtide_device::read )
{
- UINT8 result;
+ uint8_t result;
if (offset == 0)
{
- UINT16 data16 = m_ata->read_cs0(space, offset & 7, 0xffff);
+ uint16_t data16 = m_ata->read_cs0(space, offset & 7, 0xffff);
result = data16 & 0xff;
m_d8_d15_latch = data16 >> 8;
}
@@ -91,7 +91,7 @@ WRITE8_MEMBER( xtide_device::write )
if (offset == 0)
{
// Data register transfer low byte and latched high
- UINT16 data16 = (m_d8_d15_latch << 8) | data;
+ uint16_t data16 = (m_d8_d15_latch << 8) | data;
m_ata->write_cs0(space, offset & 7, data16, 0xffff);
}
else if (offset < 8)
@@ -299,7 +299,7 @@ const tiny_rom_entry *xtide_device::device_rom_region() const
// xtide_device - constructor
//-------------------------------------------------
-xtide_device::xtide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+xtide_device::xtide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ISA8_XTIDE, "XT-IDE Fixed Drive Adapter", tag, owner, clock, "isa8_xtide", __FILE__),
device_isa8_card_interface( mconfig, *this ),
m_ata(*this, "ata"),
diff --git a/src/devices/bus/isa/xtide.h b/src/devices/bus/isa/xtide.h
index 9b5775a26c3..b8a05f25ae2 100644
--- a/src/devices/bus/isa/xtide.h
+++ b/src/devices/bus/isa/xtide.h
@@ -19,7 +19,7 @@ class xtide_device : public device_t,
{
public:
// construction/destruction
- xtide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ xtide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -40,8 +40,8 @@ private:
required_device<ata_interface_device> m_ata;
required_device<eeprom_parallel_28xx_device> m_eeprom;
- UINT8 m_irq_number;
- UINT8 m_d8_d15_latch;
+ uint8_t m_irq_number;
+ uint8_t m_d8_d15_latch;
};
diff --git a/src/devices/bus/isbx/compis_fdc.cpp b/src/devices/bus/isbx/compis_fdc.cpp
index 19a0f0bf231..2282734e2c3 100644
--- a/src/devices/bus/isbx/compis_fdc.cpp
+++ b/src/devices/bus/isbx/compis_fdc.cpp
@@ -81,7 +81,7 @@ machine_config_constructor compis_fdc_device::device_mconfig_additions() const
// compis_fdc_device - constructor
//-------------------------------------------------
-compis_fdc_device::compis_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+compis_fdc_device::compis_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, COMPIS_FDC, "Compis FDC", tag, owner, clock, "compis_fdc", __FILE__),
device_isbx_card_interface(mconfig, *this),
m_fdc(*this, I8272_TAG),
@@ -114,9 +114,9 @@ void compis_fdc_device::device_reset()
// mcs0_r - chip select 0 read
//-------------------------------------------------
-UINT8 compis_fdc_device::mcs0_r(address_space &space, offs_t offset)
+uint8_t compis_fdc_device::mcs0_r(address_space &space, offs_t offset)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
switch (BIT(offset, 0))
{
@@ -132,7 +132,7 @@ UINT8 compis_fdc_device::mcs0_r(address_space &space, offs_t offset)
// mcs0_w - chip select 0 write
//-------------------------------------------------
-void compis_fdc_device::mcs0_w(address_space &space, offs_t offset, UINT8 data)
+void compis_fdc_device::mcs0_w(address_space &space, offs_t offset, uint8_t data)
{
switch (BIT(offset, 0))
{
@@ -145,7 +145,7 @@ void compis_fdc_device::mcs0_w(address_space &space, offs_t offset, UINT8 data)
// mdack_r - DMA acknowledge read
//-------------------------------------------------
-UINT8 compis_fdc_device::mdack_r(address_space &space, offs_t offset)
+uint8_t compis_fdc_device::mdack_r(address_space &space, offs_t offset)
{
return m_fdc->dma_r();
}
@@ -155,7 +155,7 @@ UINT8 compis_fdc_device::mdack_r(address_space &space, offs_t offset)
// mdack_w - DMA acknowledge write
//-------------------------------------------------
-void compis_fdc_device::mdack_w(address_space &space, offs_t offset, UINT8 data)
+void compis_fdc_device::mdack_w(address_space &space, offs_t offset, uint8_t data)
{
m_fdc->dma_w(data);
}
diff --git a/src/devices/bus/isbx/compis_fdc.h b/src/devices/bus/isbx/compis_fdc.h
index d97bc4eb468..e36a342f864 100644
--- a/src/devices/bus/isbx/compis_fdc.h
+++ b/src/devices/bus/isbx/compis_fdc.h
@@ -29,7 +29,7 @@ class compis_fdc_device : public device_t,
{
public:
// construction/destruction
- compis_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ compis_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -44,10 +44,10 @@ protected:
virtual void device_reset() override;
// device_isbx_card_interface overrides
- virtual UINT8 mcs0_r(address_space &space, offs_t offset) override;
- virtual void mcs0_w(address_space &space, offs_t offset, UINT8 data) override;
- virtual UINT8 mdack_r(address_space &space, offs_t offset) override;
- virtual void mdack_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t mcs0_r(address_space &space, offs_t offset) override;
+ virtual void mcs0_w(address_space &space, offs_t offset, uint8_t data) override;
+ virtual uint8_t mdack_r(address_space &space, offs_t offset) override;
+ virtual void mdack_w(address_space &space, offs_t offset, uint8_t data) override;
virtual void opt0_w(int state) override;
virtual void opt1_w(int state) override;
diff --git a/src/devices/bus/isbx/isbc_218a.cpp b/src/devices/bus/isbx/isbc_218a.cpp
index bb1eea2b194..7af071f0217 100644
--- a/src/devices/bus/isbx/isbc_218a.cpp
+++ b/src/devices/bus/isbx/isbc_218a.cpp
@@ -79,7 +79,7 @@ machine_config_constructor isbc_218a_device::device_mconfig_additions() const
// isbc_218a_device - constructor
//-------------------------------------------------
-isbc_218a_device::isbc_218a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isbc_218a_device::isbc_218a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISBC_218A, "ISBX 218a for ISBC", tag, owner, clock, "isbc_218a", __FILE__),
device_isbx_card_interface(mconfig, *this),
m_fdc(*this, I8272_TAG),
@@ -112,9 +112,9 @@ void isbc_218a_device::device_reset()
// mcs0_r - chip select 0 read
//-------------------------------------------------
-UINT8 isbc_218a_device::mcs0_r(address_space &space, offs_t offset)
+uint8_t isbc_218a_device::mcs0_r(address_space &space, offs_t offset)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
switch (BIT(offset, 0))
{
@@ -130,7 +130,7 @@ UINT8 isbc_218a_device::mcs0_r(address_space &space, offs_t offset)
// mcs0_w - chip select 0 write
//-------------------------------------------------
-void isbc_218a_device::mcs0_w(address_space &space, offs_t offset, UINT8 data)
+void isbc_218a_device::mcs0_w(address_space &space, offs_t offset, uint8_t data)
{
switch (BIT(offset, 0))
{
@@ -143,9 +143,9 @@ void isbc_218a_device::mcs0_w(address_space &space, offs_t offset, UINT8 data)
// mcs1_r - chip select 1 read
//-------------------------------------------------
-UINT8 isbc_218a_device::mcs1_r(address_space &space, offs_t offset)
+uint8_t isbc_218a_device::mcs1_r(address_space &space, offs_t offset)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
switch (offset)
{
@@ -160,7 +160,7 @@ UINT8 isbc_218a_device::mcs1_r(address_space &space, offs_t offset)
// mcs1_w - chip select 1 write
//-------------------------------------------------
-void isbc_218a_device::mcs1_w(address_space &space, offs_t offset, UINT8 data)
+void isbc_218a_device::mcs1_w(address_space &space, offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -182,7 +182,7 @@ void isbc_218a_device::mcs1_w(address_space &space, offs_t offset, UINT8 data)
// mdack_r - DMA acknowledge read
//-------------------------------------------------
-UINT8 isbc_218a_device::mdack_r(address_space &space, offs_t offset)
+uint8_t isbc_218a_device::mdack_r(address_space &space, offs_t offset)
{
return m_fdc->dma_r();
}
@@ -192,7 +192,7 @@ UINT8 isbc_218a_device::mdack_r(address_space &space, offs_t offset)
// mdack_w - DMA acknowledge write
//-------------------------------------------------
-void isbc_218a_device::mdack_w(address_space &space, offs_t offset, UINT8 data)
+void isbc_218a_device::mdack_w(address_space &space, offs_t offset, uint8_t data)
{
m_fdc->dma_w(data);
}
diff --git a/src/devices/bus/isbx/isbc_218a.h b/src/devices/bus/isbx/isbc_218a.h
index 5fc354a725f..d83d61249dd 100644
--- a/src/devices/bus/isbx/isbc_218a.h
+++ b/src/devices/bus/isbx/isbc_218a.h
@@ -29,7 +29,7 @@ class isbc_218a_device : public device_t,
{
public:
// construction/destruction
- isbc_218a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isbc_218a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -44,12 +44,12 @@ protected:
virtual void device_reset() override;
// device_isbx_card_interface overrides
- virtual UINT8 mcs0_r(address_space &space, offs_t offset) override;
- virtual void mcs0_w(address_space &space, offs_t offset, UINT8 data) override;
- virtual UINT8 mcs1_r(address_space &space, offs_t offset) override;
- virtual void mcs1_w(address_space &space, offs_t offset, UINT8 data) override;
- virtual UINT8 mdack_r(address_space &space, offs_t offset) override;
- virtual void mdack_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t mcs0_r(address_space &space, offs_t offset) override;
+ virtual void mcs0_w(address_space &space, offs_t offset, uint8_t data) override;
+ virtual uint8_t mcs1_r(address_space &space, offs_t offset) override;
+ virtual void mcs1_w(address_space &space, offs_t offset, uint8_t data) override;
+ virtual uint8_t mdack_r(address_space &space, offs_t offset) override;
+ virtual void mdack_w(address_space &space, offs_t offset, uint8_t data) override;
virtual void opt0_w(int state) override;
private:
diff --git a/src/devices/bus/isbx/isbx.cpp b/src/devices/bus/isbx/isbx.cpp
index e71aa5e5454..b6031278fb2 100644
--- a/src/devices/bus/isbx/isbx.cpp
+++ b/src/devices/bus/isbx/isbx.cpp
@@ -37,7 +37,7 @@ device_isbx_card_interface::device_isbx_card_interface(const machine_config &mco
// isbx_slot_device - constructor
//-------------------------------------------------
-isbx_slot_device::isbx_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+isbx_slot_device::isbx_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ISBX_SLOT, "iSBX bus slot", tag, owner, clock, "isbx_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_write_mintr0(*this),
diff --git a/src/devices/bus/isbx/isbx.h b/src/devices/bus/isbx/isbx.h
index cb90fbd27b1..6522eeb6617 100644
--- a/src/devices/bus/isbx/isbx.h
+++ b/src/devices/bus/isbx/isbx.h
@@ -77,12 +77,12 @@ public:
// construction/destruction
device_isbx_card_interface(const machine_config &mconfig, device_t &device);
- virtual UINT8 mcs0_r(address_space &space, offs_t offset) { return 0xff; }
- virtual void mcs0_w(address_space &space, offs_t offset, UINT8 data) { }
- virtual UINT8 mcs1_r(address_space &space, offs_t offset) { return 0xff; }
- virtual void mcs1_w(address_space &space, offs_t offset, UINT8 data) { }
- virtual UINT8 mdack_r(address_space &space, offs_t offset) { return 0xff; }
- virtual void mdack_w(address_space &space, offs_t offset, UINT8 data) { }
+ virtual uint8_t mcs0_r(address_space &space, offs_t offset) { return 0xff; }
+ virtual void mcs0_w(address_space &space, offs_t offset, uint8_t data) { }
+ virtual uint8_t mcs1_r(address_space &space, offs_t offset) { return 0xff; }
+ virtual void mcs1_w(address_space &space, offs_t offset, uint8_t data) { }
+ virtual uint8_t mdack_r(address_space &space, offs_t offset) { return 0xff; }
+ virtual void mdack_w(address_space &space, offs_t offset, uint8_t data) { }
virtual int opt0_r() { return 1; }
virtual void opt0_w(int state) { }
virtual int opt1_r() { return 1; }
@@ -102,7 +102,7 @@ class isbx_slot_device : public device_t,
{
public:
// construction/destruction
- isbx_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ isbx_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _mintr0> void set_mintr0_callback(_mintr0 mintr0) { m_write_mintr0.set_callback(mintr0); }
template<class _mintr1> void set_mintr1_callback(_mintr1 mintr1) { m_write_mintr1.set_callback(mintr1); }
diff --git a/src/devices/bus/kc/d002.cpp b/src/devices/bus/kc/d002.cpp
index fdb36a8c34d..10d2290344f 100644
--- a/src/devices/bus/kc/d002.cpp
+++ b/src/devices/bus/kc/d002.cpp
@@ -108,7 +108,7 @@ const device_type KC_D002 = &device_creator<kc_d002_device>;
// kc_d002_device - constructor
//-------------------------------------------------
-kc_d002_device::kc_d002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_d002_device::kc_d002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, KC_D002, "D002 Bus Driver", tag, owner, clock, "kc_d002", __FILE__),
device_kcexp_interface( mconfig, *this ), m_slot(nullptr)
{
@@ -159,7 +159,7 @@ ioport_constructor kc_d002_device::device_input_ports() const
// read
//-------------------------------------------------
-void kc_d002_device::read(offs_t offset, UINT8 &data)
+void kc_d002_device::read(offs_t offset, uint8_t &data)
{
for (auto & elem : m_expansions)
elem->read(offset, data);
@@ -169,7 +169,7 @@ void kc_d002_device::read(offs_t offset, UINT8 &data)
// write
//-------------------------------------------------
-void kc_d002_device::write(offs_t offset, UINT8 data)
+void kc_d002_device::write(offs_t offset, uint8_t data)
{
for (auto & elem : m_expansions)
elem->write(offset, data);
@@ -179,11 +179,11 @@ void kc_d002_device::write(offs_t offset, UINT8 data)
// IO read
//-------------------------------------------------
-void kc_d002_device::io_read(offs_t offset, UINT8 &data)
+void kc_d002_device::io_read(offs_t offset, uint8_t &data)
{
if ((offset & 0xff) == 0x80)
{
- UINT8 slot_id = (offset>>8) & 0xff;
+ uint8_t slot_id = (offset>>8) & 0xff;
if ((slot_id & 0xf0) == ioport("ID")->read() && !(slot_id & 0x03))
data = m_expansions[(slot_id>>2) & 3]->module_id_r();
@@ -201,11 +201,11 @@ void kc_d002_device::io_read(offs_t offset, UINT8 &data)
// IO write
//-------------------------------------------------
-void kc_d002_device::io_write(offs_t offset, UINT8 data)
+void kc_d002_device::io_write(offs_t offset, uint8_t data)
{
if ((offset & 0xff) == 0x80)
{
- UINT8 slot_id = (offset>>8) & 0xff;
+ uint8_t slot_id = (offset>>8) & 0xff;
if ((slot_id & 0xf0) == ioport("ID")->read() && !(slot_id & 0x03))
m_expansions[(slot_id>>2) & 3]->control_w(data);
diff --git a/src/devices/bus/kc/d002.h b/src/devices/bus/kc/d002.h
index 00c85448643..22454791f36 100644
--- a/src/devices/bus/kc/d002.h
+++ b/src/devices/bus/kc/d002.h
@@ -23,7 +23,7 @@ class kc_d002_device :
{
public:
// construction/destruction
- kc_d002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_d002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -40,10 +40,10 @@ protected:
virtual void device_reset() override;
// kcexp_interface overrides
- virtual void read(offs_t offset, UINT8 &data) override;
- virtual void write(offs_t offset, UINT8 data) override;
- virtual void io_read(offs_t offset, UINT8 &data) override;
- virtual void io_write(offs_t offset, UINT8 data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
+ virtual void write(offs_t offset, uint8_t data) override;
+ virtual void io_read(offs_t offset, uint8_t &data) override;
+ virtual void io_write(offs_t offset, uint8_t data) override;
virtual DECLARE_WRITE_LINE_MEMBER( mei_w ) override;
private:
diff --git a/src/devices/bus/kc/d004.cpp b/src/devices/bus/kc/d004.cpp
index cab28b21297..d698ec9b970 100644
--- a/src/devices/bus/kc/d004.cpp
+++ b/src/devices/bus/kc/d004.cpp
@@ -128,7 +128,7 @@ const device_type KC_D004_GIDE = &device_creator<kc_d004_gide_device>;
// kc_d004_device - constructor
//-------------------------------------------------
-kc_d004_device::kc_d004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_d004_device::kc_d004_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, KC_D004, "D004 Floppy Disk Interface", tag, owner, clock, "kc_d004", __FILE__),
device_kcexp_interface( mconfig, *this ),
m_cpu(*this, Z80_TAG),
@@ -141,7 +141,7 @@ kc_d004_device::kc_d004_device(const machine_config &mconfig, const char *tag, d
{
}
-kc_d004_device::kc_d004_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+kc_d004_device::kc_d004_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_kcexp_interface( mconfig, *this ),
m_cpu(*this, Z80_TAG),
@@ -215,7 +215,7 @@ void kc_d004_device::device_timer(emu_timer &timer, device_timer_id id, int para
set module status
-------------------------------------------------*/
-void kc_d004_device::control_w(UINT8 data)
+void kc_d004_device::control_w(uint8_t data)
{
m_enabled = BIT(data, 0);
m_connected = BIT(data, 2);
@@ -226,7 +226,7 @@ void kc_d004_device::control_w(UINT8 data)
read
-------------------------------------------------*/
-void kc_d004_device::read(offs_t offset, UINT8 &data)
+void kc_d004_device::read(offs_t offset, uint8_t &data)
{
if (offset >= m_rom_base && offset < (m_rom_base + 0x2000) && m_enabled)
data = m_rom[offset & 0x1fff];
@@ -236,11 +236,11 @@ void kc_d004_device::read(offs_t offset, UINT8 &data)
// IO read
//-------------------------------------------------
-void kc_d004_device::io_read(offs_t offset, UINT8 &data)
+void kc_d004_device::io_read(offs_t offset, uint8_t &data)
{
if ((offset & 0xff) == 0x80)
{
- UINT8 slot_id = (offset>>8) & 0xff;
+ uint8_t slot_id = (offset>>8) & 0xff;
if (slot_id == 0xfc)
data = module_id_r();
@@ -266,11 +266,11 @@ void kc_d004_device::io_read(offs_t offset, UINT8 &data)
// IO write
//-------------------------------------------------
-void kc_d004_device::io_write(offs_t offset, UINT8 data)
+void kc_d004_device::io_write(offs_t offset, uint8_t data)
{
if ((offset & 0xff) == 0x80)
{
- UINT8 slot_id = (offset>>8) & 0xff;
+ uint8_t slot_id = (offset>>8) & 0xff;
if (slot_id == 0xfc)
control_w(data);
@@ -325,7 +325,7 @@ READ8_MEMBER(kc_d004_device::hw_input_gate_r)
bit 4: Index pulse from disc
*/
- UINT8 hw_input_gate = 0x0f;
+ uint8_t hw_input_gate = 0x0f;
if (m_floppy && !m_floppy->idx_r())
hw_input_gate |= 0x10;
@@ -382,7 +382,7 @@ WRITE_LINE_MEMBER(kc_d004_device::fdc_irq)
// kc_d004_gide_device - constructor
//-------------------------------------------------
-kc_d004_gide_device::kc_d004_gide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_d004_gide_device::kc_d004_gide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: kc_d004_device(mconfig, KC_D004, "D004 Floppy Disk + GIDE Interface", tag, owner, clock, "kc_d004gide", __FILE__),
m_ata(*this, ATA_TAG), m_ata_data(0), m_lh(0)
{
@@ -425,12 +425,12 @@ void kc_d004_gide_device::device_reset()
READ8_MEMBER(kc_d004_gide_device::gide_r)
{
- UINT8 data = 0xff;
- UINT8 io_addr = offset & 0x0f;
+ uint8_t data = 0xff;
+ uint8_t io_addr = offset & 0x0f;
if (io_addr == 0x05)
{
- UINT8 rtc_addr = (offset >> 8) & 0x0f;
+ uint8_t rtc_addr = (offset >> 8) & 0x0f;
// TODO RTC-72421
logerror("GIDE %s read RTC 0x%02x\n", tag(), rtc_addr);
@@ -474,11 +474,11 @@ READ8_MEMBER(kc_d004_gide_device::gide_r)
WRITE8_MEMBER(kc_d004_gide_device::gide_w)
{
- UINT8 io_addr = offset & 0x0f;
+ uint8_t io_addr = offset & 0x0f;
if (io_addr == 0x05)
{
- UINT8 rtc_addr = (offset >> 8) & 0x0f;
+ uint8_t rtc_addr = (offset >> 8) & 0x0f;
// TODO RTC-72421
logerror("GIDE %s wrire RTC 0x%02x 0x%02x\n", tag(), rtc_addr, data);
diff --git a/src/devices/bus/kc/d004.h b/src/devices/bus/kc/d004.h
index d8eb1d4fad0..cbdd5eb8426 100644
--- a/src/devices/bus/kc/d004.h
+++ b/src/devices/bus/kc/d004.h
@@ -26,8 +26,8 @@ class kc_d004_device :
{
public:
// construction/destruction
- kc_d004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- kc_d004_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ kc_d004_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ kc_d004_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -42,11 +42,11 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
// kcexp_interface overrides
- virtual UINT8 module_id_r() override { return 0xa7; }
- virtual void control_w(UINT8 data) override;
- virtual void read(offs_t offset, UINT8 &data) override;
- virtual void io_read(offs_t offset, UINT8 &data) override;
- virtual void io_write(offs_t offset, UINT8 data) override;
+ virtual uint8_t module_id_r() override { return 0xa7; }
+ virtual void control_w(uint8_t data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
+ virtual void io_read(offs_t offset, uint8_t &data) override;
+ virtual void io_write(offs_t offset, uint8_t data) override;
public:
DECLARE_READ8_MEMBER(hw_input_gate_r);
@@ -64,16 +64,16 @@ private:
required_device<floppy_connector> m_floppy1;
required_device<floppy_connector> m_floppy2;
required_device<floppy_connector> m_floppy3;
- required_shared_ptr<UINT8> m_koppel_ram;
+ required_shared_ptr<uint8_t> m_koppel_ram;
// internal state
emu_timer * m_reset_timer;
- UINT8 * m_rom;
- //UINT8 m_hw_input_gate;
- UINT16 m_rom_base;
- UINT8 m_enabled;
- UINT8 m_connected;
+ uint8_t * m_rom;
+ //uint8_t m_hw_input_gate;
+ uint16_t m_rom_base;
+ uint8_t m_enabled;
+ uint8_t m_connected;
floppy_image_device *m_floppy;
};
@@ -86,7 +86,7 @@ class kc_d004_gide_device :
{
public:
// construction/destruction
- kc_d004_gide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_d004_gide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -103,7 +103,7 @@ public:
private:
required_device<ata_interface_device> m_ata;
- UINT16 m_ata_data;
+ uint16_t m_ata_data;
int m_lh;
};
diff --git a/src/devices/bus/kc/kc.cpp b/src/devices/bus/kc/kc.cpp
index bd379fd064e..ea0f9d36e36 100644
--- a/src/devices/bus/kc/kc.cpp
+++ b/src/devices/bus/kc/kc.cpp
@@ -152,7 +152,7 @@ device_kcexp_interface::~device_kcexp_interface()
//-------------------------------------------------
// kcexp_slot_device - constructor
//-------------------------------------------------
-kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, KCEXP_SLOT, "KC85 Expansion Slot", tag, owner, clock, "kcexp_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_out_irq_cb(*this),
@@ -161,7 +161,7 @@ kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, const char *
{
}
-kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this),
m_out_irq_cb(*this),
@@ -205,9 +205,9 @@ void kcexp_slot_device::device_start()
module id read
-------------------------------------------------*/
-UINT8 kcexp_slot_device::module_id_r()
+uint8_t kcexp_slot_device::module_id_r()
{
- UINT8 result = 0xff;
+ uint8_t result = 0xff;
if (m_cart)
result = m_cart->module_id_r();
@@ -218,7 +218,7 @@ UINT8 kcexp_slot_device::module_id_r()
/*-------------------------------------------------
module control write
-------------------------------------------------*/
-void kcexp_slot_device::control_w(UINT8 data)
+void kcexp_slot_device::control_w(uint8_t data)
{
if (m_cart)
m_cart->control_w(data);
@@ -228,7 +228,7 @@ void kcexp_slot_device::control_w(UINT8 data)
read
-------------------------------------------------*/
-void kcexp_slot_device::read(offs_t offset, UINT8 &data)
+void kcexp_slot_device::read(offs_t offset, uint8_t &data)
{
if (m_cart)
m_cart->read(offset, data);
@@ -239,7 +239,7 @@ void kcexp_slot_device::read(offs_t offset, UINT8 &data)
write
-------------------------------------------------*/
-void kcexp_slot_device::write(offs_t offset, UINT8 data)
+void kcexp_slot_device::write(offs_t offset, uint8_t data)
{
if (m_cart)
m_cart->write(offset, data);
@@ -249,7 +249,7 @@ void kcexp_slot_device::write(offs_t offset, UINT8 data)
IO read
-------------------------------------------------*/
-void kcexp_slot_device::io_read(offs_t offset, UINT8 &data)
+void kcexp_slot_device::io_read(offs_t offset, uint8_t &data)
{
if (m_cart)
m_cart->io_read(offset, data);
@@ -260,7 +260,7 @@ void kcexp_slot_device::io_read(offs_t offset, UINT8 &data)
IO write
-------------------------------------------------*/
-void kcexp_slot_device::io_write(offs_t offset, UINT8 data)
+void kcexp_slot_device::io_write(offs_t offset, uint8_t data)
{
if (m_cart)
m_cart->io_write(offset, data);
@@ -298,7 +298,7 @@ WRITE_LINE_MEMBER( kcexp_slot_device::meo_w )
//-------------------------------------------------
// kccart_slot_device - constructor
//-------------------------------------------------
-kccart_slot_device::kccart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+kccart_slot_device::kccart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
kcexp_slot_device(mconfig, KCCART_SLOT, "KC85 Cartridge Slot", tag, owner, clock, "kccart_slot", __FILE__),
device_image_interface(mconfig, *this)
{
@@ -333,7 +333,7 @@ image_init_result kccart_slot_device::call_load()
if (m_cart)
{
offs_t read_length;
- UINT8 *cart_base = m_cart->get_cart_base();
+ uint8_t *cart_base = m_cart->get_cart_base();
if (cart_base != nullptr)
{
diff --git a/src/devices/bus/kc/kc.h b/src/devices/bus/kc/kc.h
index 6f5e30f4943..5084c2a13d2 100644
--- a/src/devices/bus/kc/kc.h
+++ b/src/devices/bus/kc/kc.h
@@ -27,13 +27,13 @@ public:
virtual ~device_kcexp_interface();
// reading and writing
- virtual UINT8 module_id_r() { return 0xff; }
- virtual void control_w(UINT8 data) { }
- virtual void read(offs_t offset, UINT8 &data) { }
- virtual void write(offs_t offset, UINT8 data) { }
- virtual void io_read(offs_t offset, UINT8 &data) { }
- virtual void io_write(offs_t offset, UINT8 data) { }
- virtual UINT8* get_cart_base() { return nullptr; }
+ virtual uint8_t module_id_r() { return 0xff; }
+ virtual void control_w(uint8_t data) { }
+ virtual void read(offs_t offset, uint8_t &data) { }
+ virtual void write(offs_t offset, uint8_t data) { }
+ virtual void io_read(offs_t offset, uint8_t &data) { }
+ virtual void io_write(offs_t offset, uint8_t data) { }
+ virtual uint8_t* get_cart_base() { return nullptr; }
virtual DECLARE_WRITE_LINE_MEMBER( mei_w ) { };
};
@@ -44,8 +44,8 @@ class kcexp_slot_device : public device_t,
{
public:
// construction/destruction
- kcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- kcexp_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ kcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ kcexp_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual ~kcexp_slot_device();
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<kcexp_slot_device &>(device).m_out_irq_cb.set_callback(object); }
@@ -59,12 +59,12 @@ public:
static void static_set_next_slot(device_t &device, const char *next_module_tag);
// reading and writing
- virtual UINT8 module_id_r();
- virtual void control_w(UINT8 data);
- virtual void read(offs_t offset, UINT8 &data);
- virtual void write(offs_t offset, UINT8 data);
- virtual void io_read(offs_t offset, UINT8 &data);
- virtual void io_write(offs_t offset, UINT8 data);
+ virtual uint8_t module_id_r();
+ virtual void control_w(uint8_t data);
+ virtual void read(offs_t offset, uint8_t &data);
+ virtual void write(offs_t offset, uint8_t data);
+ virtual void io_read(offs_t offset, uint8_t &data);
+ virtual void io_write(offs_t offset, uint8_t data);
virtual DECLARE_WRITE_LINE_MEMBER( mei_w );
virtual DECLARE_WRITE_LINE_MEMBER( meo_w );
@@ -85,7 +85,7 @@ class kccart_slot_device : public kcexp_slot_device,
{
public:
// construction/destruction
- kccart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kccart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~kccart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/kc/ram.cpp b/src/devices/bus/kc/ram.cpp
index c10b99d0d70..577d0c0a194 100644
--- a/src/devices/bus/kc/ram.cpp
+++ b/src/devices/bus/kc/ram.cpp
@@ -42,13 +42,13 @@ const device_type KC_M036 = &device_creator<kc_m036_device>;
// kc_m011_device - constructor
//-------------------------------------------------
-kc_m011_device::kc_m011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_m011_device::kc_m011_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, KC_M011, "M011 64KB RAM", tag, owner, clock, "kc_m011", __FILE__),
device_kcexp_interface( mconfig, *this ), m_slot(nullptr), m_mei(0), m_ram(nullptr), m_enabled(0), m_write_enabled(0), m_base(0), m_segment(0)
{
}
-kc_m011_device::kc_m011_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+kc_m011_device::kc_m011_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_kcexp_interface( mconfig, *this ), m_slot(nullptr), m_mei(0), m_ram(nullptr), m_enabled(0), m_write_enabled(0), m_base(0), m_segment(0)
{
@@ -82,7 +82,7 @@ void kc_m011_device::device_reset()
/*-------------------------------------------------
module control write
-------------------------------------------------*/
-void kc_m011_device::control_w(UINT8 data)
+void kc_m011_device::control_w(uint8_t data)
{
if (m_mei)
{
@@ -96,9 +96,9 @@ void kc_m011_device::control_w(UINT8 data)
read
-------------------------------------------------*/
-void kc_m011_device::read(offs_t offset, UINT8 &data)
+void kc_m011_device::read(offs_t offset, uint8_t &data)
{
- UINT32 addr = offset ^ m_base;
+ uint32_t addr = offset ^ m_base;
if (addr < 0x10000 && m_enabled && m_mei)
{
@@ -113,9 +113,9 @@ void kc_m011_device::read(offs_t offset, UINT8 &data)
write
-------------------------------------------------*/
-void kc_m011_device::write(offs_t offset, UINT8 data)
+void kc_m011_device::write(offs_t offset, uint8_t data)
{
- UINT32 addr = offset ^ m_base;
+ uint32_t addr = offset ^ m_base;
if (addr < 0x10000 && m_enabled && m_mei)
{
@@ -147,7 +147,7 @@ WRITE_LINE_MEMBER( kc_m011_device::mei_w )
// kc_m022_device - constructor
//-------------------------------------------------
-kc_m022_device::kc_m022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_m022_device::kc_m022_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: kc_m011_device(mconfig, KC_M022, "M022 16KB RAM", tag, owner, clock, "kc_m022", __FILE__)
{
}
@@ -156,7 +156,7 @@ kc_m022_device::kc_m022_device(const machine_config &mconfig, const char *tag, d
read
-------------------------------------------------*/
-void kc_m022_device::read(offs_t offset, UINT8 &data)
+void kc_m022_device::read(offs_t offset, uint8_t &data)
{
if (offset >= m_base && offset < (m_base + 0x4000) && m_enabled && m_mei)
{
@@ -171,7 +171,7 @@ void kc_m022_device::read(offs_t offset, UINT8 &data)
write
-------------------------------------------------*/
-void kc_m022_device::write(offs_t offset, UINT8 data)
+void kc_m022_device::write(offs_t offset, uint8_t data)
{
if (offset >= m_base && offset < (m_base + 0x4000) && m_enabled && m_mei)
{
@@ -192,7 +192,7 @@ void kc_m022_device::write(offs_t offset, UINT8 data)
// kc_m032_device - constructor
//-------------------------------------------------
-kc_m032_device::kc_m032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_m032_device::kc_m032_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: kc_m011_device(mconfig, KC_M032, "M032 256KB segmented RAM", tag, owner, clock, "kc_m032", __FILE__)
{
}
@@ -210,7 +210,7 @@ void kc_m032_device::device_reset()
/*-------------------------------------------------
module control write
-------------------------------------------------*/
-void kc_m032_device::control_w(UINT8 data)
+void kc_m032_device::control_w(uint8_t data)
{
if (m_mei)
{
@@ -225,7 +225,7 @@ void kc_m032_device::control_w(UINT8 data)
read
-------------------------------------------------*/
-void kc_m032_device::read(offs_t offset, UINT8 &data)
+void kc_m032_device::read(offs_t offset, uint8_t &data)
{
if (offset >= m_base && offset < (m_base + 0x4000) && m_enabled && m_mei)
{
@@ -240,7 +240,7 @@ void kc_m032_device::read(offs_t offset, UINT8 &data)
write
-------------------------------------------------*/
-void kc_m032_device::write(offs_t offset, UINT8 data)
+void kc_m032_device::write(offs_t offset, uint8_t data)
{
if (offset >= m_base && offset < (m_base + 0x4000) && m_enabled && m_mei)
{
@@ -261,7 +261,7 @@ void kc_m032_device::write(offs_t offset, UINT8 data)
// kc_m034_device - constructor
//-------------------------------------------------
-kc_m034_device::kc_m034_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_m034_device::kc_m034_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: kc_m011_device(mconfig, KC_M034, "M034 512KB segmented RAM", tag, owner, clock, "kc_m034", __FILE__)
{
}
@@ -279,7 +279,7 @@ void kc_m034_device::device_reset()
/*-------------------------------------------------
module control write
-------------------------------------------------*/
-void kc_m034_device::control_w(UINT8 data)
+void kc_m034_device::control_w(uint8_t data)
{
if (m_mei)
{
@@ -294,7 +294,7 @@ void kc_m034_device::control_w(UINT8 data)
read
-------------------------------------------------*/
-void kc_m034_device::read(offs_t offset, UINT8 &data)
+void kc_m034_device::read(offs_t offset, uint8_t &data)
{
if (offset >= m_base && offset < (m_base + 0x4000) && m_enabled && m_mei)
{
@@ -309,7 +309,7 @@ void kc_m034_device::read(offs_t offset, UINT8 &data)
write
-------------------------------------------------*/
-void kc_m034_device::write(offs_t offset, UINT8 data)
+void kc_m034_device::write(offs_t offset, uint8_t data)
{
if (offset >= m_base && offset < (m_base + 0x4000) && m_enabled && m_mei)
{
@@ -330,7 +330,7 @@ void kc_m034_device::write(offs_t offset, UINT8 data)
// kc_m035_device - constructor
//-------------------------------------------------
-kc_m035_device::kc_m035_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_m035_device::kc_m035_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: kc_m011_device(mconfig, KC_M035, "M035 1MB segmented RAM", tag, owner, clock, "kc_m035", __FILE__)
{
}
@@ -338,7 +338,7 @@ kc_m035_device::kc_m035_device(const machine_config &mconfig, const char *tag, d
/*-------------------------------------------------
module control write
-------------------------------------------------*/
-void kc_m035_device::control_w(UINT8 data)
+void kc_m035_device::control_w(uint8_t data)
{
if (m_mei)
{
@@ -352,7 +352,7 @@ void kc_m035_device::control_w(UINT8 data)
read
-------------------------------------------------*/
-void kc_m035_device::read(offs_t offset, UINT8 &data)
+void kc_m035_device::read(offs_t offset, uint8_t &data)
{
if (offset >= 0x8000 && offset < 0xc000 && m_enabled & m_mei)
{
@@ -367,7 +367,7 @@ void kc_m035_device::read(offs_t offset, UINT8 &data)
write
-------------------------------------------------*/
-void kc_m035_device::write(offs_t offset, UINT8 data)
+void kc_m035_device::write(offs_t offset, uint8_t data)
{
if (offset >= 0x8000 && offset < 0xc000 && m_enabled && m_mei)
{
@@ -388,7 +388,7 @@ void kc_m035_device::write(offs_t offset, UINT8 data)
// kc_m036_device - constructor
//-------------------------------------------------
-kc_m036_device::kc_m036_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_m036_device::kc_m036_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: kc_m011_device(mconfig, KC_M036, "M036 128KB segmented RAM", tag, owner, clock, "kc_m036", __FILE__)
{
}
@@ -406,7 +406,7 @@ void kc_m036_device::device_reset()
/*-------------------------------------------------
module control write
-------------------------------------------------*/
-void kc_m036_device::control_w(UINT8 data)
+void kc_m036_device::control_w(uint8_t data)
{
if (m_mei)
{
@@ -421,7 +421,7 @@ void kc_m036_device::control_w(UINT8 data)
read
-------------------------------------------------*/
-void kc_m036_device::read(offs_t offset, UINT8 &data)
+void kc_m036_device::read(offs_t offset, uint8_t &data)
{
if (offset >= m_base && offset < (m_base + 0x4000) && m_enabled && m_mei)
{
@@ -436,7 +436,7 @@ void kc_m036_device::read(offs_t offset, UINT8 &data)
write
-------------------------------------------------*/
-void kc_m036_device::write(offs_t offset, UINT8 data)
+void kc_m036_device::write(offs_t offset, uint8_t data)
{
if (offset >= m_base && offset < (m_base + 0x4000) && m_enabled && m_mei)
{
diff --git a/src/devices/bus/kc/ram.h b/src/devices/bus/kc/ram.h
index 0cc441a5fa0..856d26b8016 100644
--- a/src/devices/bus/kc/ram.h
+++ b/src/devices/bus/kc/ram.h
@@ -20,8 +20,8 @@ class kc_m011_device :
{
public:
// construction/destruction
- kc_m011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- kc_m011_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ kc_m011_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ kc_m011_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -29,10 +29,10 @@ protected:
virtual void device_reset() override;
// kcexp_interface overrides
- virtual UINT8 module_id_r() override { return 0xf6; }
- virtual void control_w(UINT8 data) override;
- virtual void read(offs_t offset, UINT8 &data) override;
- virtual void write(offs_t offset, UINT8 data) override;
+ virtual uint8_t module_id_r() override { return 0xf6; }
+ virtual void control_w(uint8_t data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
+ virtual void write(offs_t offset, uint8_t data) override;
virtual DECLARE_WRITE_LINE_MEMBER( mei_w ) override;
protected:
@@ -40,15 +40,15 @@ protected:
// internal state
int m_mei; // module enable line
- UINT8 * m_ram;
- UINT8 m_enabled;
- UINT8 m_write_enabled;
- UINT16 m_base;
- UINT8 m_segment;
+ uint8_t * m_ram;
+ uint8_t m_enabled;
+ uint8_t m_write_enabled;
+ uint16_t m_base;
+ uint8_t m_segment;
private:
// internal helpers
- virtual UINT32 get_ram_size() const { return 0x10000; }
+ virtual uint32_t get_ram_size() const { return 0x10000; }
};
@@ -59,17 +59,17 @@ class kc_m022_device :
{
public:
// construction/destruction
- kc_m022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_m022_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// kcexp_interface overrides
- virtual UINT8 module_id_r() override { return 0xf4; }
- virtual void read(offs_t offset, UINT8 &ata) override;
- virtual void write(offs_t offset, UINT8 data) override;
+ virtual uint8_t module_id_r() override { return 0xf4; }
+ virtual void read(offs_t offset, uint8_t &ata) override;
+ virtual void write(offs_t offset, uint8_t data) override;
private:
// internal helpers
- virtual UINT32 get_ram_size() const override { return 0x4000; }
+ virtual uint32_t get_ram_size() const override { return 0x4000; }
};
@@ -80,21 +80,21 @@ class kc_m032_device :
{
public:
// construction/destruction
- kc_m032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_m032_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_reset() override;
// kcexp_interface overrides
- virtual UINT8 module_id_r() override { return 0x79; }
- virtual void control_w(UINT8 data) override;
- virtual void read(offs_t offset, UINT8 &data) override;
- virtual void write(offs_t offset, UINT8 data) override;
+ virtual uint8_t module_id_r() override { return 0x79; }
+ virtual void control_w(uint8_t data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
+ virtual void write(offs_t offset, uint8_t data) override;
private:
// internal helpers
- virtual UINT32 get_ram_size() const override { return 0x40000; }
+ virtual uint32_t get_ram_size() const override { return 0x40000; }
};
@@ -105,21 +105,21 @@ class kc_m034_device :
{
public:
// construction/destruction
- kc_m034_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_m034_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_reset() override;
// kcexp_interface overrides
- virtual UINT8 module_id_r() override { return 0x7a; }
- virtual void control_w(UINT8 data) override;
- virtual void read(offs_t offset, UINT8 &data) override;
- virtual void write(offs_t offset, UINT8 data) override;
+ virtual uint8_t module_id_r() override { return 0x7a; }
+ virtual void control_w(uint8_t data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
+ virtual void write(offs_t offset, uint8_t data) override;
private:
// internal helpers
- virtual UINT32 get_ram_size() const override { return 0x80000; }
+ virtual uint32_t get_ram_size() const override { return 0x80000; }
};
@@ -130,18 +130,18 @@ class kc_m035_device :
{
public:
// construction/destruction
- kc_m035_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_m035_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// kcexp_interface overrides
- virtual UINT8 module_id_r() override { return 0x7b; }
- virtual void control_w(UINT8 data) override;
- virtual void read(offs_t offset, UINT8 &data) override;
- virtual void write(offs_t offset, UINT8 data) override;
+ virtual uint8_t module_id_r() override { return 0x7b; }
+ virtual void control_w(uint8_t data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
+ virtual void write(offs_t offset, uint8_t data) override;
private:
// internal helpers
- virtual UINT32 get_ram_size() const override { return 0x100000; }
+ virtual uint32_t get_ram_size() const override { return 0x100000; }
};
@@ -152,21 +152,21 @@ class kc_m036_device :
{
public:
// construction/destruction
- kc_m036_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_m036_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_reset() override;
// kcexp_interface overrides
- virtual UINT8 module_id_r() override { return 0x78; }
- virtual void control_w(UINT8 data) override;
- virtual void read(offs_t offset, UINT8 &data) override;
- virtual void write(offs_t offset, UINT8 data) override;
+ virtual uint8_t module_id_r() override { return 0x78; }
+ virtual void control_w(uint8_t data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
+ virtual void write(offs_t offset, uint8_t data) override;
private:
// internal helpers
- virtual UINT32 get_ram_size() const override { return 0x20000; }
+ virtual uint32_t get_ram_size() const override { return 0x20000; }
};
// device type definition
diff --git a/src/devices/bus/kc/rom.cpp b/src/devices/bus/kc/rom.cpp
index 8906f1cbe18..6c2c4b85292 100644
--- a/src/devices/bus/kc/rom.cpp
+++ b/src/devices/bus/kc/rom.cpp
@@ -42,13 +42,13 @@ const device_type KC_M033 = &device_creator<kc_m033_device>;
// kc_8k_device - constructor
//-------------------------------------------------
-kc_8k_device::kc_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_8k_device::kc_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, KC_STANDARD, "Standard 8K ROM module", tag, owner, clock, "kc_8k", __FILE__),
device_kcexp_interface( mconfig, *this ), m_slot(nullptr), m_mei(0), m_rom(nullptr), m_enabled(0), m_base(0)
{
}
-kc_8k_device::kc_8k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+kc_8k_device::kc_8k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_kcexp_interface( mconfig, *this ), m_slot(nullptr), m_mei(0), m_rom(nullptr), m_enabled(0), m_base(0)
{
@@ -89,7 +89,7 @@ const tiny_rom_entry *kc_8k_device::device_rom_region() const
get_cart_base
-------------------------------------------------*/
-UINT8* kc_8k_device::get_cart_base()
+uint8_t* kc_8k_device::get_cart_base()
{
return m_rom;
}
@@ -98,7 +98,7 @@ UINT8* kc_8k_device::get_cart_base()
module control write
-------------------------------------------------*/
-void kc_8k_device::control_w(UINT8 data)
+void kc_8k_device::control_w(uint8_t data)
{
if (m_mei)
{
@@ -111,7 +111,7 @@ void kc_8k_device::control_w(UINT8 data)
read
-------------------------------------------------*/
-void kc_8k_device::read(offs_t offset, UINT8 &data)
+void kc_8k_device::read(offs_t offset, uint8_t &data)
{
if (offset >= m_base && offset < (m_base + 0x2000) && m_enabled && m_mei)
{
@@ -142,7 +142,7 @@ WRITE_LINE_MEMBER( kc_8k_device::mei_w )
// kc_m006_device - constructor
//-------------------------------------------------
-kc_m006_device::kc_m006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_m006_device::kc_m006_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: kc_8k_device(mconfig, KC_M006, "M006 BASIC", tag, owner, clock, "kc_m006", __FILE__)
{
}
@@ -151,7 +151,7 @@ kc_m006_device::kc_m006_device(const machine_config &mconfig, const char *tag, d
module control write
-------------------------------------------------*/
-void kc_m006_device::control_w(UINT8 data)
+void kc_m006_device::control_w(uint8_t data)
{
if (m_mei)
{
@@ -164,7 +164,7 @@ void kc_m006_device::control_w(UINT8 data)
read
-------------------------------------------------*/
-void kc_m006_device::read(offs_t offset, UINT8 &data)
+void kc_m006_device::read(offs_t offset, uint8_t &data)
{
if (offset >= m_base && offset < (m_base + 0x4000) && m_enabled)
{
@@ -184,7 +184,7 @@ void kc_m006_device::read(offs_t offset, UINT8 &data)
// kc_m033_device - constructor
//-------------------------------------------------
-kc_m033_device::kc_m033_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kc_m033_device::kc_m033_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: kc_8k_device(mconfig, KC_M033, "M033 TypeStar", tag, owner, clock, "kc_m033", __FILE__), m_bank(0)
{
}
@@ -204,7 +204,7 @@ void kc_m033_device::device_reset()
module control write
-------------------------------------------------*/
-void kc_m033_device::control_w(UINT8 data)
+void kc_m033_device::control_w(uint8_t data)
{
if (m_mei)
{
@@ -218,7 +218,7 @@ void kc_m033_device::control_w(UINT8 data)
read
-------------------------------------------------*/
-void kc_m033_device::read(offs_t offset, UINT8 &data)
+void kc_m033_device::read(offs_t offset, uint8_t &data)
{
if (offset >= m_base && offset < (m_base + 0x2000) && m_enabled && m_mei)
{
diff --git a/src/devices/bus/kc/rom.h b/src/devices/bus/kc/rom.h
index e5e1673058c..5e9e94473b6 100644
--- a/src/devices/bus/kc/rom.h
+++ b/src/devices/bus/kc/rom.h
@@ -20,8 +20,8 @@ class kc_8k_device :
{
public:
// construction/destruction
- kc_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- kc_8k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ kc_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ kc_8k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
@@ -32,10 +32,10 @@ protected:
virtual const tiny_rom_entry *device_rom_region() const override;
// kcexp_interface overrides
- virtual UINT8 module_id_r() override { return 0xfb; }
- virtual void control_w(UINT8 data) override;
- virtual void read(offs_t offset, UINT8 &data) override;
- virtual UINT8* get_cart_base() override;
+ virtual uint8_t module_id_r() override { return 0xfb; }
+ virtual void control_w(uint8_t data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
+ virtual uint8_t* get_cart_base() override;
virtual DECLARE_WRITE_LINE_MEMBER( mei_w ) override;
protected:
@@ -43,9 +43,9 @@ protected:
// internal state
int m_mei; // module enable line
- UINT8 * m_rom;
- UINT8 m_enabled;
- UINT16 m_base;
+ uint8_t * m_rom;
+ uint8_t m_enabled;
+ uint16_t m_base;
};
@@ -56,13 +56,13 @@ class kc_m006_device :
{
public:
// construction/destruction
- kc_m006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_m006_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// kcexp_interface overrides
- virtual UINT8 module_id_r() override { return 0xfc; }
- virtual void control_w(UINT8 data) override;
- virtual void read(offs_t offset, UINT8 &data) override;
+ virtual uint8_t module_id_r() override { return 0xfc; }
+ virtual void control_w(uint8_t data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
};
@@ -73,20 +73,20 @@ class kc_m033_device :
{
public:
// construction/destruction
- kc_m033_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kc_m033_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_reset() override;
// kcexp_interface overrides
- virtual UINT8 module_id_r() override { return 0x01; }
- virtual void control_w(UINT8 data) override;
- virtual void read(offs_t offset, UINT8 &data) override;
+ virtual uint8_t module_id_r() override { return 0x01; }
+ virtual void control_w(uint8_t data) override;
+ virtual void read(offs_t offset, uint8_t &data) override;
private:
// internal state
- UINT16 m_bank;
+ uint16_t m_bank;
};
diff --git a/src/devices/bus/lpci/cirrus.cpp b/src/devices/bus/lpci/cirrus.cpp
index 61cea36a3e9..49d216845b7 100644
--- a/src/devices/bus/lpci/cirrus.cpp
+++ b/src/devices/bus/lpci/cirrus.cpp
@@ -83,7 +83,7 @@ const device_type CIRRUS = &device_creator<cirrus_device>;
// cirrus_device - constructor
//-------------------------------------------------
-cirrus_device::cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+cirrus_device::cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, CIRRUS, "CIRRUS", tag, owner, clock, "cirrus", __FILE__),
pci_device_interface( mconfig, *this )
{
@@ -109,9 +109,9 @@ void cirrus_device::device_reset()
// pci_read - implementation of PCI read
//-------------------------------------------------
-UINT32 cirrus_device::pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask)
+uint32_t cirrus_device::pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask)
{
- UINT32 result = 0;
+ uint32_t result = 0;
if (function == 0)
{
@@ -145,7 +145,7 @@ UINT32 cirrus_device::pci_read(pci_bus_device *pcibus, int function, int offset,
// pci_write - implementation of PCI write
//-------------------------------------------------
-void cirrus_device::pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask)
+void cirrus_device::pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask)
{
if (LOG_PCIACCESS)
logerror("cirrus5430_pci_write(): function=%d offset=0x%02X data=0x%04X\n", function, offset, data);
diff --git a/src/devices/bus/lpci/cirrus.h b/src/devices/bus/lpci/cirrus.h
index 9b06a0c7878..e9c4aeeccd3 100644
--- a/src/devices/bus/lpci/cirrus.h
+++ b/src/devices/bus/lpci/cirrus.h
@@ -20,10 +20,10 @@ class cirrus_device : public device_t,
{
public:
// construction/destruction
- cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override;
- virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override;
+ virtual uint32_t pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask) override;
+ virtual void pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask) override;
DECLARE_WRITE8_MEMBER( cirrus_42E8_w );
diff --git a/src/devices/bus/lpci/i82371ab.cpp b/src/devices/bus/lpci/i82371ab.cpp
index 9f5a9de2edd..23b3b81121d 100644
--- a/src/devices/bus/lpci/i82371ab.cpp
+++ b/src/devices/bus/lpci/i82371ab.cpp
@@ -22,15 +22,15 @@
const device_type I82371AB = &device_creator<i82371ab_device>;
-i82371ab_device::i82371ab_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i82371ab_device::i82371ab_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: southbridge_device(mconfig, I82371AB, "Intel 82371AB", tag, owner, clock, "i82371ab", __FILE__),
pci_device_interface( mconfig, *this )
{
}
-UINT32 i82371ab_device::pci_isa_r(device_t *busdevice, int offset, UINT32 mem_mask)
+uint32_t i82371ab_device::pci_isa_r(device_t *busdevice, int offset, uint32_t mem_mask)
{
- UINT32 result = m_regs[0][offset] |
+ uint32_t result = m_regs[0][offset] |
m_regs[0][offset+1] << 8 |
m_regs[0][offset+2] << 16|
m_regs[0][offset+3] << 24;
@@ -40,9 +40,9 @@ UINT32 i82371ab_device::pci_isa_r(device_t *busdevice, int offset, UINT32 mem_ma
return result;
}
-void i82371ab_device::pci_isa_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask)
+void i82371ab_device::pci_isa_w(device_t *busdevice, int offset, uint32_t data, uint32_t mem_mask)
{
- UINT32 cdata = 0;
+ uint32_t cdata = 0;
int i;
COMBINE_DATA(&cdata);
@@ -67,9 +67,9 @@ void i82371ab_device::pci_isa_w(device_t *busdevice, int offset, UINT32 data, UI
}
}
-UINT32 i82371ab_device::pci_ide_r(device_t *busdevice, int offset, UINT32 mem_mask)
+uint32_t i82371ab_device::pci_ide_r(device_t *busdevice, int offset, uint32_t mem_mask)
{
- UINT32 result = m_regs[1][offset] |
+ uint32_t result = m_regs[1][offset] |
m_regs[1][offset+1] << 8 |
m_regs[1][offset+2] << 16|
m_regs[1][offset+3] << 24;
@@ -79,9 +79,9 @@ UINT32 i82371ab_device::pci_ide_r(device_t *busdevice, int offset, UINT32 mem_ma
return result;
}
-void i82371ab_device::pci_ide_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask)
+void i82371ab_device::pci_ide_w(device_t *busdevice, int offset, uint32_t data, uint32_t mem_mask)
{
- UINT32 cdata = 0;
+ uint32_t cdata = 0;
int i;
COMBINE_DATA(&cdata);
@@ -106,9 +106,9 @@ void i82371ab_device::pci_ide_w(device_t *busdevice, int offset, UINT32 data, UI
}
}
-UINT32 i82371ab_device::pci_usb_r(device_t *busdevice, int offset, UINT32 mem_mask)
+uint32_t i82371ab_device::pci_usb_r(device_t *busdevice, int offset, uint32_t mem_mask)
{
- UINT32 result = m_regs[2][offset] |
+ uint32_t result = m_regs[2][offset] |
m_regs[2][offset+1] << 8 |
m_regs[2][offset+2] << 16|
m_regs[2][offset+3] << 24;
@@ -118,9 +118,9 @@ UINT32 i82371ab_device::pci_usb_r(device_t *busdevice, int offset, UINT32 mem_ma
return result;
}
-void i82371ab_device::pci_usb_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask)
+void i82371ab_device::pci_usb_w(device_t *busdevice, int offset, uint32_t data, uint32_t mem_mask)
{
- UINT32 cdata = 0;
+ uint32_t cdata = 0;
int i;
COMBINE_DATA(&cdata);
@@ -145,9 +145,9 @@ void i82371ab_device::pci_usb_w(device_t *busdevice, int offset, UINT32 data, UI
}
}
-UINT32 i82371ab_device::pci_acpi_r(device_t *busdevice, int offset, UINT32 mem_mask)
+uint32_t i82371ab_device::pci_acpi_r(device_t *busdevice, int offset, uint32_t mem_mask)
{
- UINT32 result = m_regs[3][offset] |
+ uint32_t result = m_regs[3][offset] |
m_regs[3][offset+1] << 8 |
m_regs[3][offset+2] << 16|
m_regs[3][offset+3] << 24;
@@ -157,9 +157,9 @@ UINT32 i82371ab_device::pci_acpi_r(device_t *busdevice, int offset, UINT32 mem_m
return result;
}
-void i82371ab_device::pci_acpi_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask)
+void i82371ab_device::pci_acpi_w(device_t *busdevice, int offset, uint32_t data, uint32_t mem_mask)
{
- UINT32 cdata = 0;
+ uint32_t cdata = 0;
int i;
COMBINE_DATA(&cdata);
@@ -184,7 +184,7 @@ void i82371ab_device::pci_acpi_w(device_t *busdevice, int offset, UINT32 data, U
}
}
-UINT32 i82371ab_device::pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask)
+uint32_t i82371ab_device::pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask)
{
switch (function)
{
@@ -199,7 +199,7 @@ UINT32 i82371ab_device::pci_read(pci_bus_device *pcibus, int function, int offse
return 0;
}
-void i82371ab_device::pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask)
+void i82371ab_device::pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask)
{
switch (function)
{
@@ -229,7 +229,7 @@ void i82371ab_device::device_reset()
{
southbridge_device::device_reset();
memset(m_regs, 0, sizeof(m_regs));
- UINT32 (*regs32)[64] = (UINT32 (*)[64])(m_regs);
+ uint32_t (*regs32)[64] = (uint32_t (*)[64])(m_regs);
/* isa */
regs32[0][0x00] = 0x71108086;
diff --git a/src/devices/bus/lpci/i82371ab.h b/src/devices/bus/lpci/i82371ab.h
index ec5ec8b3be2..637819d9694 100644
--- a/src/devices/bus/lpci/i82371ab.h
+++ b/src/devices/bus/lpci/i82371ab.h
@@ -21,30 +21,30 @@ class i82371ab_device : public southbridge_device,
{
public:
// construction/destruction
- i82371ab_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i82371ab_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override;
- virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override;
+ virtual uint32_t pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask) override;
+ virtual void pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask) override;
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
- UINT32 pci_isa_r(device_t *busdevice, int offset, UINT32 mem_mask);
- void pci_isa_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask);
+ uint32_t pci_isa_r(device_t *busdevice, int offset, uint32_t mem_mask);
+ void pci_isa_w(device_t *busdevice, int offset, uint32_t data, uint32_t mem_mask);
- UINT32 pci_ide_r(device_t *busdevice, int offset, UINT32 mem_mask);
- void pci_ide_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask);
+ uint32_t pci_ide_r(device_t *busdevice, int offset, uint32_t mem_mask);
+ void pci_ide_w(device_t *busdevice, int offset, uint32_t data, uint32_t mem_mask);
- UINT32 pci_usb_r(device_t *busdevice, int offset, UINT32 mem_mask);
- void pci_usb_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask);
+ uint32_t pci_usb_r(device_t *busdevice, int offset, uint32_t mem_mask);
+ void pci_usb_w(device_t *busdevice, int offset, uint32_t data, uint32_t mem_mask);
- UINT32 pci_acpi_r(device_t *busdevice, int offset, UINT32 mem_mask);
- void pci_acpi_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask);
+ uint32_t pci_acpi_r(device_t *busdevice, int offset, uint32_t mem_mask);
+ void pci_acpi_w(device_t *busdevice, int offset, uint32_t data, uint32_t mem_mask);
private:
- UINT8 m_regs[4][0x100];
+ uint8_t m_regs[4][0x100];
};
// device type definition
diff --git a/src/devices/bus/lpci/i82371sb.cpp b/src/devices/bus/lpci/i82371sb.cpp
index de9cbc365e7..b57cea2bbd0 100644
--- a/src/devices/bus/lpci/i82371sb.cpp
+++ b/src/devices/bus/lpci/i82371sb.cpp
@@ -27,22 +27,22 @@
const device_type I82371SB = &device_creator<i82371sb_device>;
-i82371sb_device::i82371sb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i82371sb_device::i82371sb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: southbridge_device(mconfig, I82371SB, "Intel 82371SB", tag, owner, clock, "i82371sb", __FILE__),
pci_device_interface( mconfig, *this )
{
}
-UINT32 i82371sb_device::pci_isa_r(device_t *busdevice,int offset, UINT32 mem_mask)
+uint32_t i82371sb_device::pci_isa_r(device_t *busdevice,int offset, uint32_t mem_mask)
{
- UINT32 result = m_regs[0][offset];
+ uint32_t result = m_regs[0][offset];
//logerror("i82371sb_pci_isa_r, offset = %02x, mem_mask = %08x\n", offset, mem_mask);
return result;
}
-void i82371sb_device::pci_isa_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask)
+void i82371sb_device::pci_isa_w(device_t *busdevice, int offset, uint32_t data, uint32_t mem_mask)
{
//logerror("i82371sb_pci_isa_w, offset = %02x, data = %08x, mem_mask = %08x\n", offset, data, mem_mask);
@@ -61,14 +61,14 @@ void i82371sb_device::pci_isa_w(device_t *busdevice, int offset, UINT32 data, UI
}
}
-UINT32 i82371sb_device::pci_ide_r(device_t *busdevice, int offset, UINT32 mem_mask)
+uint32_t i82371sb_device::pci_ide_r(device_t *busdevice, int offset, uint32_t mem_mask)
{
//logerror("i82371sb_pci_ide_r, offset = %02x, mem_mask = %08x\n", offset, mem_mask);
- UINT32 result = m_regs[1][offset];
+ uint32_t result = m_regs[1][offset];
return result;
}
-void i82371sb_device::pci_ide_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask)
+void i82371sb_device::pci_ide_w(device_t *busdevice, int offset, uint32_t data, uint32_t mem_mask)
{
//logerror("i82371sb_pci_ide_w, offset = %02x, data = %08x, mem_mask = %08x\n", offset, data, mem_mask);
@@ -87,16 +87,16 @@ void i82371sb_device::pci_ide_w(device_t *busdevice, int offset, UINT32 data, UI
}
}
-UINT32 i82371sb_device::pci_usb_r(device_t *busdevice, int offset, UINT32 mem_mask)
+uint32_t i82371sb_device::pci_usb_r(device_t *busdevice, int offset, uint32_t mem_mask)
{
- UINT32 result = m_regs[2][offset];
+ uint32_t result = m_regs[2][offset];
//logerror("i82371sb_pci_usb_r, offset = %02x, mem_mask = %08x\n", offset, mem_mask);
return result;
}
-void i82371sb_device::pci_usb_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask)
+void i82371sb_device::pci_usb_w(device_t *busdevice, int offset, uint32_t data, uint32_t mem_mask)
{
//logerror("i82371sb_pci_usb_w, offset = %02x, data = %08x, mem_mask = %08x\n", offset, data, mem_mask);
@@ -115,7 +115,7 @@ void i82371sb_device::pci_usb_w(device_t *busdevice, int offset, UINT32 data, UI
}
}
-UINT32 i82371sb_device::pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask)
+uint32_t i82371sb_device::pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask)
{
switch (function)
{
@@ -129,7 +129,7 @@ UINT32 i82371sb_device::pci_read(pci_bus_device *pcibus, int function, int offse
return 0;
}
-void i82371sb_device::pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask)
+void i82371sb_device::pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask)
{
switch (function)
{
diff --git a/src/devices/bus/lpci/i82371sb.h b/src/devices/bus/lpci/i82371sb.h
index 9e5b3c14b2a..9627e82f8cf 100644
--- a/src/devices/bus/lpci/i82371sb.h
+++ b/src/devices/bus/lpci/i82371sb.h
@@ -21,26 +21,26 @@ class i82371sb_device : public southbridge_device,
{
public:
// construction/destruction
- i82371sb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i82371sb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override;
- virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override;
+ virtual uint32_t pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask) override;
+ virtual void pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask) override;
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
- UINT32 pci_isa_r(device_t *busdevice, int offset, UINT32 mem_mask);
- void pci_isa_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask);
+ uint32_t pci_isa_r(device_t *busdevice, int offset, uint32_t mem_mask);
+ void pci_isa_w(device_t *busdevice, int offset, uint32_t data, uint32_t mem_mask);
- UINT32 pci_ide_r(device_t *busdevice, int offset, UINT32 mem_mask);
- void pci_ide_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask);
+ uint32_t pci_ide_r(device_t *busdevice, int offset, uint32_t mem_mask);
+ void pci_ide_w(device_t *busdevice, int offset, uint32_t data, uint32_t mem_mask);
- UINT32 pci_usb_r(device_t *busdevice, int offset, UINT32 mem_mask);
- void pci_usb_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask);
+ uint32_t pci_usb_r(device_t *busdevice, int offset, uint32_t mem_mask);
+ void pci_usb_w(device_t *busdevice, int offset, uint32_t data, uint32_t mem_mask);
private:
- UINT32 m_regs[3][0x400/4];
+ uint32_t m_regs[3][0x400/4];
};
// device type definition
diff --git a/src/devices/bus/lpci/i82439tx.cpp b/src/devices/bus/lpci/i82439tx.cpp
index e2c64f49473..03abcef7b2c 100644
--- a/src/devices/bus/lpci/i82439tx.cpp
+++ b/src/devices/bus/lpci/i82439tx.cpp
@@ -16,7 +16,7 @@
const device_type I82439TX = &device_creator<i82439tx_device>;
-i82439tx_device::i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+i82439tx_device::i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: northbridge_device(mconfig, I82439TX, "Intel 82439TX", tag, owner, clock, "i82439tx", __FILE__),
pci_device_interface( mconfig, *this ),
m_cpu_tag( nullptr ),
@@ -26,7 +26,7 @@ i82439tx_device::i82439tx_device(const machine_config &mconfig, const char *tag,
{
}
-void i82439tx_device::i82439tx_configure_memory(UINT8 val, offs_t begin, offs_t end)
+void i82439tx_device::i82439tx_configure_memory(uint8_t val, offs_t begin, offs_t end)
{
switch (val & 0x03)
{
@@ -53,9 +53,9 @@ void i82439tx_device::i82439tx_configure_memory(UINT8 val, offs_t begin, offs_t
PCI INTERFACE
***************************************************************************/
-UINT32 i82439tx_device::pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask)
+uint32_t i82439tx_device::pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask)
{
- UINT32 result;
+ uint32_t result;
if (function != 0)
return 0;
@@ -142,7 +142,7 @@ UINT32 i82439tx_device::pci_read(pci_bus_device *pcibus, int function, int offse
return result;
}
-void i82439tx_device::pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask)
+void i82439tx_device::pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask)
{
if (function != 0)
return;
diff --git a/src/devices/bus/lpci/i82439tx.h b/src/devices/bus/lpci/i82439tx.h
index a0179af8265..41626c7f627 100644
--- a/src/devices/bus/lpci/i82439tx.h
+++ b/src/devices/bus/lpci/i82439tx.h
@@ -27,30 +27,30 @@ class i82439tx_device : public northbridge_device,
{
public:
// construction/destruction
- i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ i82439tx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
static void static_set_cpu(device_t &device, const char *tag) { dynamic_cast<i82439tx_device &>(device).m_cpu_tag = tag; }
static void static_set_region(device_t &device, const char *tag) { dynamic_cast<i82439tx_device &>(device).m_region_tag = tag; }
- virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override;
- virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override;
+ virtual uint32_t pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask) override;
+ virtual void pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask) override;
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
- void i82439tx_configure_memory(UINT8 val, offs_t begin, offs_t end);
+ void i82439tx_configure_memory(uint8_t val, offs_t begin, offs_t end);
private:
const char *m_cpu_tag;
const char *m_region_tag;
address_space *m_space;
- UINT8 *m_rom;
+ uint8_t *m_rom;
- UINT32 m_regs[8];
- UINT32 m_bios_ram[0x40000 / 4];
+ uint32_t m_regs[8];
+ uint32_t m_bios_ram[0x40000 / 4];
};
// device type definition
diff --git a/src/devices/bus/lpci/mpc105.cpp b/src/devices/bus/lpci/mpc105.cpp
index 2fcde258b93..cbe94911a6b 100644
--- a/src/devices/bus/lpci/mpc105.cpp
+++ b/src/devices/bus/lpci/mpc105.cpp
@@ -29,7 +29,7 @@ const device_type MPC105 = &device_creator<mpc105_device>;
// mpc105_device - constructor
//-------------------------------------------------
-mpc105_device::mpc105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mpc105_device::mpc105_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MPC105, "MPC105", tag, owner, clock, "mpc105", __FILE__),
pci_device_interface( mconfig, *this ),
m_cpu_tag(nullptr),
@@ -114,9 +114,9 @@ void mpc105_device::update_memory()
// pci_read - implementation of PCI read
//-------------------------------------------------
-UINT32 mpc105_device::pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask)
+uint32_t mpc105_device::pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask)
{
- UINT32 result;
+ uint32_t result;
if (function != 0)
return 0;
@@ -191,7 +191,7 @@ UINT32 mpc105_device::pci_read(pci_bus_device *pcibus, int function, int offset,
// pci_write - implementation of PCI write
//-------------------------------------------------
-void mpc105_device::pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask)
+void mpc105_device::pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask)
{
int i;
if (function != 0)
@@ -216,9 +216,9 @@ void mpc105_device::pci_write(pci_bus_device *pcibus, int function, int offset,
break;
case 0xA0: /* memory enable */
- if (m_bank_enable != (UINT8) data)
+ if (m_bank_enable != (uint8_t) data)
{
- m_bank_enable = (UINT8) data;
+ m_bank_enable = (uint8_t) data;
update_memory();
}
break;
diff --git a/src/devices/bus/lpci/mpc105.h b/src/devices/bus/lpci/mpc105.h
index f890432dca4..abd71070b57 100644
--- a/src/devices/bus/lpci/mpc105.h
+++ b/src/devices/bus/lpci/mpc105.h
@@ -28,13 +28,13 @@ class mpc105_device : public device_t,
{
public:
// construction/destruction
- mpc105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mpc105_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
static void static_set_cpu(device_t &device, const char *tag) { dynamic_cast<mpc105_device &>(device).m_cpu_tag = tag; }
static void static_set_bank_base_default(device_t &device, int bank_base_default) { dynamic_cast<mpc105_device &>(device).m_bank_base_default = bank_base_default; }
- virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override;
- virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override;
+ virtual uint32_t pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask) override;
+ virtual void pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask) override;
protected:
// device-level overrides
@@ -47,8 +47,8 @@ private:
const char *m_cpu_tag;
int m_bank_base_default;
int m_bank_base;
- UINT8 m_bank_enable;
- UINT32 m_bank_registers[8];
+ uint8_t m_bank_enable;
+ uint32_t m_bank_registers[8];
cpu_device* m_maincpu;
};
diff --git a/src/devices/bus/lpci/northbridge.cpp b/src/devices/bus/lpci/northbridge.cpp
index ec5a0a8582a..7b69334b688 100644
--- a/src/devices/bus/lpci/northbridge.cpp
+++ b/src/devices/bus/lpci/northbridge.cpp
@@ -13,7 +13,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-northbridge_device::northbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+northbridge_device::northbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_maincpu(*this, ":maincpu"),
m_ram(*this, ":" RAM_TAG)
diff --git a/src/devices/bus/lpci/northbridge.h b/src/devices/bus/lpci/northbridge.h
index 73c21086b8f..2d2ba918f2b 100644
--- a/src/devices/bus/lpci/northbridge.h
+++ b/src/devices/bus/lpci/northbridge.h
@@ -20,7 +20,7 @@ class northbridge_device :
{
public:
// construction/destruction
- northbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ northbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/lpci/pci.cpp b/src/devices/bus/lpci/pci.cpp
index 84f94a5569d..710d04c35af 100644
--- a/src/devices/bus/lpci/pci.cpp
+++ b/src/devices/bus/lpci/pci.cpp
@@ -89,7 +89,7 @@ const device_type PCI_BUS = &device_creator<pci_bus_device>;
//-------------------------------------------------
// pci_bus_device - constructor
//-------------------------------------------------
-pci_bus_device::pci_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pci_bus_device::pci_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PCI_BUS, "PCI Bus", tag, owner, clock, "pci_bus", __FILE__), m_busnum(0),
m_father(nullptr), m_address(0), m_devicenum(0), m_busnumber(0), m_busnumaddr(nullptr)
{
@@ -105,7 +105,7 @@ pci_bus_device::pci_bus_device(const machine_config &mconfig, const char *tag, d
READ32_MEMBER( pci_bus_device::read )
{
- UINT32 result = 0xffffffff;
+ uint32_t result = 0xffffffff;
int function, reg;
offset %= 2;
@@ -207,12 +207,12 @@ WRITE32_MEMBER( pci_bus_device::write )
READ64_MEMBER(pci_bus_device::read_64be)
{
- UINT64 result = 0;
+ uint64_t result = 0;
mem_mask = flipendian_int64(mem_mask);
if (ACCESSING_BITS_0_31)
- result |= (UINT64)read(space, offset * 2 + 0, mem_mask >> 0) << 0;
+ result |= (uint64_t)read(space, offset * 2 + 0, mem_mask >> 0) << 0;
if (ACCESSING_BITS_32_63)
- result |= (UINT64)read(space, offset * 2 + 1, mem_mask >> 32) << 32;
+ result |= (uint64_t)read(space, offset * 2 + 1, mem_mask >> 32) << 32;
return flipendian_int64(result);
}
@@ -314,7 +314,7 @@ pci_device_interface::~pci_device_interface()
const device_type PCI_CONNECTOR = &device_creator<pci_connector>;
-pci_connector::pci_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pci_connector::pci_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PCI_CONNECTOR, "PCI device connector abstraction", tag, owner, clock, "pci_connector", __FILE__),
device_slot_interface(mconfig, *this)
{
diff --git a/src/devices/bus/lpci/pci.h b/src/devices/bus/lpci/pci.h
index fbf37faa83a..4b2ee41e748 100644
--- a/src/devices/bus/lpci/pci.h
+++ b/src/devices/bus/lpci/pci.h
@@ -25,15 +25,15 @@ public:
pci_device_interface(const machine_config &mconfig, device_t &device);
virtual ~pci_device_interface();
- virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) = 0;
- virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) = 0;
+ virtual uint32_t pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask) = 0;
+ virtual void pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask) = 0;
};
class pci_connector: public device_t,
public device_slot_interface
{
public:
- pci_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pci_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~pci_connector();
pci_device_interface *get_device();
@@ -50,7 +50,7 @@ class pci_bus_device : public device_t
{
public:
// construction/destruction
- pci_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pci_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ32_MEMBER( read );
DECLARE_WRITE32_MEMBER( write );
@@ -73,19 +73,19 @@ protected:
virtual void device_post_load() override;
private:
- UINT8 m_busnum;
+ uint8_t m_busnum;
const char * m_devtag[32];
pci_device_interface *m_device[32];
const char * m_father;
pci_bus_device * m_siblings[8];
- UINT8 m_siblings_busnum[8];
+ uint8_t m_siblings_busnum[8];
int m_siblings_count;
offs_t m_address;
- INT8 m_devicenum; // device number we are addressing
- INT8 m_busnumber; // pci bus number we are addressing
+ int8_t m_devicenum; // device number we are addressing
+ int8_t m_busnumber; // pci bus number we are addressing
pci_bus_device * m_busnumaddr; // pci bus we are addressing
};
diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp
index 7e8c8dcec37..1bc7de119e1 100644
--- a/src/devices/bus/lpci/southbridge.cpp
+++ b/src/devices/bus/lpci/southbridge.cpp
@@ -127,7 +127,7 @@ machine_config_constructor southbridge_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( southbridge );
}
-southbridge_device::southbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+southbridge_device::southbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_maincpu(*this, ":maincpu"),
m_pic8259_master(*this, "pic8259_master"),
@@ -153,22 +153,22 @@ southbridge_device::southbridge_device(const machine_config &mconfig, device_typ
/// HACK: the memory system cannot cope with mixing the 8 bit device map from the fdc with a 32 bit handler
READ8_MEMBER(southbridge_device::ide_read_cs1_r)
{
- return m_ide->read_cs1(space, 1, (UINT32) 0xff0000) >> 16;
+ return m_ide->read_cs1(space, 1, (uint32_t) 0xff0000) >> 16;
}
WRITE8_MEMBER(southbridge_device::ide_write_cs1_w)
{
- m_ide->write_cs1(space, 1, (UINT32) data << 16, (UINT32) 0xff0000);
+ m_ide->write_cs1(space, 1, (uint32_t) data << 16, (uint32_t) 0xff0000);
}
READ8_MEMBER(southbridge_device::ide2_read_cs1_r)
{
- return m_ide2->read_cs1(space, 1, (UINT32) 0xff0000) >> 16;
+ return m_ide2->read_cs1(space, 1, (uint32_t) 0xff0000) >> 16;
}
WRITE8_MEMBER(southbridge_device::ide2_write_cs1_w)
{
- m_ide2->write_cs1(space, 1, (UINT32) data << 16, (UINT32) 0xff0000);
+ m_ide2->write_cs1(space, 1, (uint32_t) data << 16, (uint32_t) 0xff0000);
}
//-------------------------------------------------
@@ -232,7 +232,7 @@ READ8_MEMBER( southbridge_device::get_slave_ack )
*
*************************************************************************/
-void southbridge_device::at_speaker_set_spkrdata(UINT8 data)
+void southbridge_device::at_speaker_set_spkrdata(uint8_t data)
{
m_at_spkrdata = data ? 1 : 0;
m_speaker->level_w(m_at_spkrdata & m_pit_out2);
@@ -272,7 +272,7 @@ WRITE_LINE_MEMBER( southbridge_device::at_pit8254_out2_changed )
READ8_MEMBER( southbridge_device::at_page8_r )
{
- UINT8 data = m_at_pages[offset % 0x10];
+ uint8_t data = m_at_pages[offset % 0x10];
switch(offset % 8)
{
@@ -328,7 +328,7 @@ READ8_MEMBER(southbridge_device::pc_dma_read_byte)
address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space
if(m_dma_channel == -1)
return 0xff;
- UINT8 result;
+ uint8_t result;
offs_t page_offset = ((offs_t) m_dma_offset[0][m_dma_channel]) << 16;
result = prog_space.read_byte(page_offset + offset);
@@ -352,7 +352,7 @@ READ8_MEMBER(southbridge_device::pc_dma_read_word)
address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space
if(m_dma_channel == -1)
return 0xff;
- UINT16 result;
+ uint16_t result;
offs_t page_offset = ((offs_t) m_dma_offset[1][m_dma_channel & 3]) << 16;
result = prog_space.read_word((page_offset & 0xfe0000) | (offset << 1));
@@ -423,7 +423,7 @@ WRITE_LINE_MEMBER( southbridge_device::pc_dack7_w ) { pc_select_dma_channel(7, s
READ8_MEMBER( southbridge_device::at_portb_r )
{
- UINT8 data = m_at_speaker;
+ uint8_t data = m_at_speaker;
data &= ~0xd0; /* AT BIOS don't likes this being set */
/* 0x10 is the dram refresh line bit on the 5170, just a timer here, 15.085us. */
diff --git a/src/devices/bus/lpci/southbridge.h b/src/devices/bus/lpci/southbridge.h
index d2591646d3e..91cee4dca99 100644
--- a/src/devices/bus/lpci/southbridge.h
+++ b/src/devices/bus/lpci/southbridge.h
@@ -40,7 +40,7 @@ class southbridge_device :
{
public:
// construction/destruction
- southbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ southbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -110,19 +110,19 @@ public:
DECLARE_READ8_MEMBER(pc_dma_read_word);
DECLARE_WRITE8_MEMBER(pc_dma_write_word);
protected:
- UINT8 m_at_spkrdata;
- UINT8 m_pit_out2;
+ uint8_t m_at_spkrdata;
+ uint8_t m_pit_out2;
int m_dma_channel;
bool m_cur_eop;
- UINT8 m_dma_offset[2][4];
- UINT8 m_at_pages[0x10];
- UINT16 m_dma_high_byte;
- UINT8 m_at_speaker;
+ uint8_t m_dma_offset[2][4];
+ uint8_t m_at_pages[0x10];
+ uint16_t m_dma_high_byte;
+ uint8_t m_at_speaker;
bool m_refresh;
- void at_speaker_set_spkrdata(UINT8 data);
+ void at_speaker_set_spkrdata(uint8_t data);
- UINT8 m_channel_check;
- UINT8 m_nmi_enabled;
+ uint8_t m_channel_check;
+ uint8_t m_nmi_enabled;
void pc_select_dma_channel(int channel, bool state);
};
diff --git a/src/devices/bus/lpci/vt82c505.cpp b/src/devices/bus/lpci/vt82c505.cpp
index 15ba12b403b..a5adef41f5b 100644
--- a/src/devices/bus/lpci/vt82c505.cpp
+++ b/src/devices/bus/lpci/vt82c505.cpp
@@ -17,16 +17,16 @@
const device_type VT82C505 = &device_creator<vt82c505_device>;
-vt82c505_device::vt82c505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vt82c505_device::vt82c505_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VT82C505, "VIA VT82C505 PCI bridge", tag, owner, clock, "vt82c505", __FILE__),
pci_device_interface( mconfig, *this )
{
}
-UINT32 vt82c505_device::pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask)
+uint32_t vt82c505_device::pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask)
{
- UINT32 result = 0;
+ uint32_t result = 0;
if (function != 0)
return result;
@@ -48,7 +48,7 @@ UINT32 vt82c505_device::pci_read(pci_bus_device *pcibus, int function, int offse
return result;
}
-void vt82c505_device::pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask)
+void vt82c505_device::pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask)
{
if (function != 0)
return;
diff --git a/src/devices/bus/lpci/vt82c505.h b/src/devices/bus/lpci/vt82c505.h
index 68bb3358b00..7bd37b568b5 100644
--- a/src/devices/bus/lpci/vt82c505.h
+++ b/src/devices/bus/lpci/vt82c505.h
@@ -16,10 +16,10 @@ class vt82c505_device : public device_t,
{
public:
// construction/destruction
- vt82c505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vt82c505_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override;
- virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override;
+ virtual uint32_t pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask) override;
+ virtual void pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask) override;
protected:
// device-level overrides
@@ -27,8 +27,8 @@ protected:
virtual void device_reset() override;
private:
- UINT16 m_window_addr[3];
- UINT8 m_window_attr[3];
+ uint16_t m_window_addr[3];
+ uint8_t m_window_attr[3];
};
// device type definition
diff --git a/src/devices/bus/m5/rom.cpp b/src/devices/bus/m5/rom.cpp
index bffd33df541..8d326e05d8b 100644
--- a/src/devices/bus/m5/rom.cpp
+++ b/src/devices/bus/m5/rom.cpp
@@ -21,20 +21,20 @@ const device_type M5_ROM_STD = &device_creator<m5_rom_device>;
const device_type M5_ROM_RAM = &device_creator<m5_ram_device>;
-m5_rom_device::m5_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+m5_rom_device::m5_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_m5_cart_interface( mconfig, *this )
{
}
-m5_rom_device::m5_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m5_rom_device::m5_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, M5_ROM_STD, "M5 Standard ROM Carts", tag, owner, clock, "m5_rom", __FILE__),
device_m5_cart_interface( mconfig, *this )
{
}
-m5_ram_device::m5_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+m5_ram_device::m5_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: m5_rom_device(mconfig, M5_ROM_RAM, "M5 Expansion memory cart", tag, owner, clock, "m5_ram", __FILE__)
{
}
diff --git a/src/devices/bus/m5/rom.h b/src/devices/bus/m5/rom.h
index dedd7555f1c..bfa40ee08ed 100644
--- a/src/devices/bus/m5/rom.h
+++ b/src/devices/bus/m5/rom.h
@@ -13,8 +13,8 @@ class m5_rom_device : public device_t,
{
public:
// construction/destruction
- m5_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- m5_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m5_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ m5_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override {}
@@ -30,7 +30,7 @@ class m5_ram_device : public m5_rom_device
{
public:
// construction/destruction
- m5_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m5_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override {}
diff --git a/src/devices/bus/m5/slot.cpp b/src/devices/bus/m5/slot.cpp
index 2b5c563f54e..356cf79a5ac 100644
--- a/src/devices/bus/m5/slot.cpp
+++ b/src/devices/bus/m5/slot.cpp
@@ -45,7 +45,7 @@ device_m5_cart_interface::~device_m5_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_m5_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_m5_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -59,7 +59,7 @@ void device_m5_cart_interface::rom_alloc(UINT32 size, const char *tag)
// ram_alloc - alloc the space for the ram
//-------------------------------------------------
-void device_m5_cart_interface::ram_alloc(UINT32 size)
+void device_m5_cart_interface::ram_alloc(uint32_t size)
{
m_ram.resize(size);
}
@@ -72,7 +72,7 @@ void device_m5_cart_interface::ram_alloc(UINT32 size)
//-------------------------------------------------
// m5_cart_slot_device - constructor
//-------------------------------------------------
-m5_cart_slot_device::m5_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+m5_cart_slot_device::m5_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, M5_CART_SLOT, "M5 Cartridge Slot", tag, owner, clock, "m5_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -175,7 +175,7 @@ image_init_result m5_cart_slot_device::call_load()
if (m_type == M5_STD || m_type>2) //carts with roms
{
- UINT32 size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
+ uint32_t size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
if (size > 0x5000 && m_type == M5_STD)
{
@@ -213,7 +213,7 @@ std::string m5_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string = "std";
- //UINT32 size = core_fsize(m_file);
+ //uint32_t size = core_fsize(m_file);
int type = M5_STD;
diff --git a/src/devices/bus/m5/slot.h b/src/devices/bus/m5/slot.h
index a31f89f0a49..7f0a84ecbd4 100644
--- a/src/devices/bus/m5/slot.h
+++ b/src/devices/bus/m5/slot.h
@@ -38,20 +38,20 @@ public:
virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_ram) {}
- void rom_alloc(UINT32 size, const char *tag);
- void ram_alloc(UINT32 size);
- UINT8* get_rom_base() { return m_rom; }
- UINT8* get_ram_base() { return &m_ram[0]; }
- UINT32 get_rom_size() { return m_rom_size; }
- UINT32 get_ram_size() { return m_ram.size(); }
+ void rom_alloc(uint32_t size, const char *tag);
+ void ram_alloc(uint32_t size);
+ uint8_t* get_rom_base() { return m_rom; }
+ uint8_t* get_ram_base() { return &m_ram[0]; }
+ uint32_t get_rom_size() { return m_rom_size; }
+ uint32_t get_ram_size() { return m_ram.size(); }
void save_ram() { device().save_item(NAME(m_ram)); }
protected:
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT8> m_ram;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint8_t> m_ram;
};
@@ -63,7 +63,7 @@ class m5_cart_slot_device : public device_t,
{
public:
// construction/destruction
- m5_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ m5_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~m5_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/macpds/macpds.cpp b/src/devices/bus/macpds/macpds.cpp
index 956a0bb95ed..7757c622cbb 100644
--- a/src/devices/bus/macpds/macpds.cpp
+++ b/src/devices/bus/macpds/macpds.cpp
@@ -25,7 +25,7 @@ const device_type MACPDS_SLOT = &device_creator<macpds_slot_device>;
//-------------------------------------------------
// macpds_slot_device - constructor
//-------------------------------------------------
-macpds_slot_device::macpds_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+macpds_slot_device::macpds_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, MACPDS_SLOT, "Mac 68000 Processor-Direct Slot", tag, owner, clock, "macpds_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_macpds_tag(nullptr),
@@ -33,7 +33,7 @@ macpds_slot_device::macpds_slot_device(const machine_config &mconfig, const char
{
}
-macpds_slot_device::macpds_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+macpds_slot_device::macpds_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this), m_macpds_tag(nullptr), m_macpds_slottag(nullptr)
{
@@ -77,12 +77,12 @@ void macpds_device::static_set_cputag(device_t &device, const char *tag)
// macpds_device - constructor
//-------------------------------------------------
-macpds_device::macpds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+macpds_device::macpds_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, MACPDS, "MACPDS", tag, owner, clock, "macpds", __FILE__), m_maincpu(nullptr), m_cputag(nullptr)
{
}
-macpds_device::macpds_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+macpds_device::macpds_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr), m_cputag(nullptr)
{
}
@@ -108,19 +108,19 @@ void macpds_device::add_macpds_card(device_macpds_card_interface *card)
m_device_list.append(*card);
}
-void macpds_device::install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler, UINT32 mask)
+void macpds_device::install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler, uint32_t mask)
{
m_maincpu = machine().device<cpu_device>(m_cputag);
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, mask);
}
-void macpds_device::install_device(offs_t start, offs_t end, read16_delegate rhandler, write16_delegate whandler, UINT32 mask)
+void macpds_device::install_device(offs_t start, offs_t end, read16_delegate rhandler, write16_delegate whandler, uint32_t mask)
{
m_maincpu = machine().device<cpu_device>(m_cputag);
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, mask);
}
-void macpds_device::install_bank(offs_t start, offs_t end, const char *tag, UINT8 *data)
+void macpds_device::install_bank(offs_t start, offs_t end, const char *tag, uint8_t *data)
{
// printf("install_bank: %s @ %x->%x\n", tag, start, end);
m_maincpu = machine().device<cpu_device>(m_cputag);
@@ -176,7 +176,7 @@ void device_macpds_card_interface::set_macpds_device()
m_macpds->add_macpds_card(this);
}
-void device_macpds_card_interface::install_bank(offs_t start, offs_t end, const char *tag, UINT8 *data)
+void device_macpds_card_interface::install_bank(offs_t start, offs_t end, const char *tag, uint8_t *data)
{
char bank[256];
@@ -188,10 +188,10 @@ void device_macpds_card_interface::install_bank(offs_t start, offs_t end, const
m_macpds->install_bank(start, end, bank, data);
}
-void device_macpds_card_interface::install_rom(device_t *dev, const char *romregion, UINT32 addr)
+void device_macpds_card_interface::install_rom(device_t *dev, const char *romregion, uint32_t addr)
{
- UINT8 *rom = device().machine().root_device().memregion(dev->subtag(romregion).c_str())->base();
- UINT32 romlen = device().machine().root_device().memregion(dev->subtag(romregion).c_str())->bytes();
+ uint8_t *rom = device().machine().root_device().memregion(dev->subtag(romregion).c_str())->base();
+ uint32_t romlen = device().machine().root_device().memregion(dev->subtag(romregion).c_str())->bytes();
char bankname[128];
sprintf(bankname, "rom_%x", addr);
diff --git a/src/devices/bus/macpds/macpds.h b/src/devices/bus/macpds/macpds.h
index 95a1a1e0b50..0dcaa529a9b 100644
--- a/src/devices/bus/macpds/macpds.h
+++ b/src/devices/bus/macpds/macpds.h
@@ -51,8 +51,8 @@ class macpds_slot_device : public device_t,
{
public:
// construction/destruction
- macpds_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- macpds_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ macpds_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ macpds_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -75,16 +75,16 @@ class macpds_device : public device_t
{
public:
// construction/destruction
- macpds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- macpds_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ macpds_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ macpds_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
~macpds_device() { m_device_list.detach_all(); }
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
void add_macpds_card(device_macpds_card_interface *card);
- void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler, UINT32 mask=0xffffffff);
- void install_device(offs_t start, offs_t end, read16_delegate rhandler, write16_delegate whandler, UINT32 mask=0xffffffff);
- void install_bank(offs_t start, offs_t end, const char *tag, UINT8 *data);
+ void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler, uint32_t mask=0xffffffff);
+ void install_device(offs_t start, offs_t end, read16_delegate rhandler, write16_delegate whandler, uint32_t mask=0xffffffff);
+ void install_bank(offs_t start, offs_t end, const char *tag, uint8_t *data);
void set_irq_line(int line, int state);
protected:
@@ -119,8 +119,8 @@ public:
void set_macpds_device();
// helper functions for card devices
- void install_bank(offs_t start, offs_t end, const char *tag, UINT8 *data);
- void install_rom(device_t *dev, const char *romregion, UINT32 addr);
+ void install_bank(offs_t start, offs_t end, const char *tag, uint8_t *data);
+ void install_rom(device_t *dev, const char *romregion, uint32_t addr);
// inline configuration
static void static_set_macpds_tag(device_t &device, const char *tag, const char *slottag);
diff --git a/src/devices/bus/macpds/pds_tpdfpd.cpp b/src/devices/bus/macpds/pds_tpdfpd.cpp
index 6ba0b413722..ed4d2259821 100644
--- a/src/devices/bus/macpds/pds_tpdfpd.cpp
+++ b/src/devices/bus/macpds/pds_tpdfpd.cpp
@@ -86,7 +86,7 @@ const tiny_rom_entry *macpds_sedisplay_device::device_rom_region() const
// macpds_sedisplay_device - constructor
//-------------------------------------------------
-macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PDS_SEDISPLAY, "Radius SE Full Page Display", tag, owner, clock, "pds_sefp", __FILE__),
device_video_interface(mconfig, *this),
device_macpds_card_interface(mconfig, *this), m_vram(nullptr), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -95,7 +95,7 @@ macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig,
m_screen_tag = m_assembled_tag.c_str();
}
-macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_macpds_card_interface(mconfig, *this), m_vram(nullptr), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -115,7 +115,7 @@ void macpds_sedisplay_device::device_start()
install_rom(this, SEDISPLAY_ROM_REGION, 0xc00000);
install_rom(this, SEDISPLAY_ROM_REGION, 0xf80000);
- m_vram = std::make_unique<UINT8[]>(VRAM_SIZE);
+ m_vram = std::make_unique<uint8_t[]>(VRAM_SIZE);
static const char bankname[] = { "radpds_ram" };
m_macpds->install_bank(0xc40000, 0xc40000+VRAM_SIZE-1, bankname, m_vram.get());
@@ -160,11 +160,11 @@ void macpds_sedisplay_device::device_timer(emu_timer &timer, device_timer_id tid
***************************************************************************/
-UINT32 macpds_sedisplay_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t macpds_sedisplay_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT32 *scanline;
+ uint32_t *scanline;
int x, y;
- UINT8 pixels, *vram;
+ uint8_t pixels, *vram;
vram = m_vram.get();
diff --git a/src/devices/bus/macpds/pds_tpdfpd.h b/src/devices/bus/macpds/pds_tpdfpd.h
index 44878aa8e82..c697305c845 100644
--- a/src/devices/bus/macpds/pds_tpdfpd.h
+++ b/src/devices/bus/macpds/pds_tpdfpd.h
@@ -21,14 +21,14 @@ class macpds_sedisplay_device :
{
public:
// construction/destruction
- macpds_sedisplay_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- macpds_sedisplay_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ macpds_sedisplay_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ macpds_sedisplay_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
protected:
// device-level overrides
virtual void device_start() override;
@@ -41,9 +41,9 @@ protected:
DECLARE_WRITE16_MEMBER(ramdac_w);
public:
- std::unique_ptr<UINT8[]> m_vram;
- UINT32 m_vbl_disable;
- UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
+ std::unique_ptr<uint8_t[]> m_vram;
+ uint32_t m_vbl_disable;
+ uint32_t m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
std::string m_assembled_tag;
};
diff --git a/src/devices/bus/megadrive/eeprom.cpp b/src/devices/bus/megadrive/eeprom.cpp
index 016a17507eb..49132e537e4 100644
--- a/src/devices/bus/megadrive/eeprom.cpp
+++ b/src/devices/bus/megadrive/eeprom.cpp
@@ -60,46 +60,46 @@ const device_type MD_EEPROM_NHLPA = &device_creator<md_eeprom_nhlpa_device>;
const device_type MD_EEPROM_BLARA = &device_creator<md_eeprom_blara_device>;
-md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_md_cart_interface( mconfig, *this ),
m_i2cmem(*this, "i2cmem"), m_i2c_mem(0), m_i2c_clk(0)
{
}
-md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MD_STD_EEPROM, "MD Standard cart + EEPROM", tag, owner, clock, "md_std_eeprom", __FILE__),
device_md_cart_interface( mconfig, *this ),
m_i2cmem(*this, "i2cmem"), m_i2c_mem(0), m_i2c_clk(0)
{
}
-md_eeprom_nbajam_device::md_eeprom_nbajam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_eeprom_nbajam_device::md_eeprom_nbajam_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_eeprom_device(mconfig, MD_EEPROM_NBAJAM, "MD NBA Jam", tag, owner, clock, "md_eeprom_nbajam", __FILE__)
{
}
-md_eeprom_nbajamte_device::md_eeprom_nbajamte_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_eeprom_nbajamte_device::md_eeprom_nbajamte_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_eeprom_device(mconfig, MD_EEPROM_NBAJAMTE, "MD NBA Jam TE (and a few more)", tag, owner, clock, "md_eeprom_nbajamte", __FILE__)
{
}
-md_eeprom_cslam_device::md_eeprom_cslam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_eeprom_cslam_device::md_eeprom_cslam_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_eeprom_device(mconfig, MD_EEPROM_CSLAM, "MD College Slam", tag, owner, clock, "md_eeprom_cslam", __FILE__)
{
}
-md_eeprom_nflqb_device::md_eeprom_nflqb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_eeprom_nflqb_device::md_eeprom_nflqb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_eeprom_device(mconfig, MD_EEPROM_NFLQB, "MD NFL Quarterback 96", tag, owner, clock, "md_eeprom_nflqb", __FILE__)
{
}
-md_eeprom_nhlpa_device::md_eeprom_nhlpa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_eeprom_nhlpa_device::md_eeprom_nhlpa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_eeprom_device(mconfig, MD_EEPROM_NHLPA, "MD NHLPA 93", tag, owner, clock, "md_eeprom_nhlpa", __FILE__)
{
}
-md_eeprom_blara_device::md_eeprom_blara_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_eeprom_blara_device::md_eeprom_blara_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_eeprom_device(mconfig, MD_EEPROM_BLARA, "MD Brian Lara", tag, owner, clock, "md_eeprom_blara", __FILE__)
{
}
@@ -380,7 +380,7 @@ WRITE16_MEMBER(md_eeprom_blara_device::write)
const device_type MD_EEPROM_NBAJAM_ALT = &device_creator<md_eeprom_nbajam_device_alt>;
-md_eeprom_nbajam_device_alt::md_eeprom_nbajam_device_alt(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_eeprom_nbajam_device_alt::md_eeprom_nbajam_device_alt(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_eeprom_device(mconfig, MD_EEPROM_NBAJAM_ALT, "MD NBA Jam (Alt)", tag, owner, clock, "md_eeprom_nbajama", __FILE__)
{
}
@@ -555,8 +555,8 @@ void md_eeprom_nbajam_device_alt::eeprom_i2c_update(void)
m_eeprom_byte = ((m_eeprom_byte << 1) | m_eeprom_sda) & 0xff;
else
{
- UINT8 *nvram = (UINT8 *)&m_nvram[0];
- UINT16 sram_address = m_eeprom_slave_mask | (m_eeprom_devsel * 0x100) | m_eeprom_word_address;
+ uint8_t *nvram = (uint8_t *)&m_nvram[0];
+ uint16_t sram_address = m_eeprom_slave_mask | (m_eeprom_devsel * 0x100) | m_eeprom_word_address;
nvram[sram_address & 0xffff] = m_eeprom_byte;
m_eeprom_byte = 0;
@@ -574,17 +574,17 @@ void md_eeprom_nbajam_device_alt::eeprom_i2c_update(void)
//printf("Write line : status %d SDA %x SCL %x (count %d)\n", m_eeprom_cur_state, m_eeprom_sda, m_eeprom_scl, m_eeprom_cnt);
}
-UINT8 md_eeprom_nbajam_device_alt::eeprom_i2c_out()
+uint8_t md_eeprom_nbajam_device_alt::eeprom_i2c_out()
{
- UINT8 res = m_eeprom_sda;
+ uint8_t res = m_eeprom_sda;
switch (m_eeprom_cur_state)
{
case STATE_I2C_READ_DATA:
if (m_eeprom_cnt < 9)
{
- UINT8 *nvram = (UINT8 *)&m_nvram[0];
- UINT16 sram_address = m_eeprom_slave_mask | (m_eeprom_devsel * 0x100) | m_eeprom_word_address;
+ uint8_t *nvram = (uint8_t *)&m_nvram[0];
+ uint16_t sram_address = m_eeprom_slave_mask | (m_eeprom_devsel * 0x100) | m_eeprom_word_address;
sram_address &= 0xffff;
res = (nvram[sram_address] >> (8 - m_eeprom_cnt)) & 1;
diff --git a/src/devices/bus/megadrive/eeprom.h b/src/devices/bus/megadrive/eeprom.h
index f3582a49cba..a99766a8681 100644
--- a/src/devices/bus/megadrive/eeprom.h
+++ b/src/devices/bus/megadrive/eeprom.h
@@ -18,8 +18,8 @@ class md_std_eeprom_device : public device_t,
{
public:
// construction/destruction
- md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- md_std_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ md_std_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -31,7 +31,7 @@ public:
virtual DECLARE_WRITE16_MEMBER(write) override;
required_device<i2cmem_device> m_i2cmem;
- UINT8 m_i2c_mem, m_i2c_clk;
+ uint8_t m_i2c_mem, m_i2c_clk;
};
// ======================> md_eeprom_nbajam_device
@@ -40,7 +40,7 @@ class md_eeprom_nbajam_device : public md_std_eeprom_device
{
public:
// construction/destruction
- md_eeprom_nbajam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_eeprom_nbajam_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -56,7 +56,7 @@ class md_eeprom_nbajamte_device : public md_std_eeprom_device
{
public:
// construction/destruction
- md_eeprom_nbajamte_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_eeprom_nbajamte_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -72,7 +72,7 @@ class md_eeprom_cslam_device : public md_std_eeprom_device
{
public:
// construction/destruction
- md_eeprom_cslam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_eeprom_cslam_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -88,7 +88,7 @@ class md_eeprom_nflqb_device : public md_std_eeprom_device
{
public:
// construction/destruction
- md_eeprom_nflqb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_eeprom_nflqb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -104,7 +104,7 @@ class md_eeprom_nhlpa_device : public md_std_eeprom_device
{
public:
// construction/destruction
- md_eeprom_nhlpa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_eeprom_nhlpa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -120,7 +120,7 @@ class md_eeprom_blara_device : public md_std_eeprom_device
{
public:
// construction/destruction
- md_eeprom_blara_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_eeprom_blara_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -161,7 +161,7 @@ class md_eeprom_nbajam_device_alt : public md_std_eeprom_device
{
public:
// construction/destruction
- md_eeprom_nbajam_device_alt(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_eeprom_nbajam_device_alt(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
// virtual machine_config_constructor device_mconfig_additions() const override;
@@ -171,29 +171,29 @@ public:
virtual DECLARE_READ16_MEMBER(read) override;
virtual DECLARE_WRITE16_MEMBER(write) override;
- std::vector<UINT8> m_sram;
+ std::vector<uint8_t> m_sram;
void eeprom_i2c_init();
void idle_devsel_check();
void eeprom_i2c_update();
- UINT8 eeprom_i2c_out();
+ uint8_t eeprom_i2c_out();
private:
// EEPROM runtime vars
- UINT8 m_eeprom_sda; // current SDA
- UINT8 m_eeprom_prev_sda; // previous SDA
- UINT8 m_eeprom_scl; // current SCL
- UINT8 m_eeprom_prev_scl; // previous SCL
- UINT8 m_eeprom_cnt; // operation count in 0-9
- UINT8 m_eeprom_readwrite; // read/write bit
- UINT16 m_eeprom_slave_mask; // dev addr
- UINT16 m_eeprom_word_address; // memory addr
- UINT16 m_eeprom_devsel; // selected device
- UINT16 m_eeprom_byte; // byte to be written
+ uint8_t m_eeprom_sda; // current SDA
+ uint8_t m_eeprom_prev_sda; // previous SDA
+ uint8_t m_eeprom_scl; // current SCL
+ uint8_t m_eeprom_prev_scl; // previous SCL
+ uint8_t m_eeprom_cnt; // operation count in 0-9
+ uint8_t m_eeprom_readwrite; // read/write bit
+ uint16_t m_eeprom_slave_mask; // dev addr
+ uint16_t m_eeprom_word_address; // memory addr
+ uint16_t m_eeprom_devsel; // selected device
+ uint16_t m_eeprom_byte; // byte to be written
int m_eeprom_cur_state; // current state
// EEPROM physical characteristics (configured at init)
- UINT16 m_eeprom_mask; // size of the memory - 1
- UINT16 m_eeprom_pagewrite_mask; // max number of bytes that can be written in a single write cycle
+ uint16_t m_eeprom_mask; // size of the memory - 1
+ uint16_t m_eeprom_pagewrite_mask; // max number of bytes that can be written in a single write cycle
};
diff --git a/src/devices/bus/megadrive/ggenie.cpp b/src/devices/bus/megadrive/ggenie.cpp
index 65097208567..a8586e087eb 100644
--- a/src/devices/bus/megadrive/ggenie.cpp
+++ b/src/devices/bus/megadrive/ggenie.cpp
@@ -32,7 +32,7 @@
const device_type MD_ROM_GAMEGENIE = &device_creator<md_rom_ggenie_device>;
-md_rom_ggenie_device::md_rom_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_ggenie_device::md_rom_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MD_ROM_GAMEGENIE, "MD Game Genie", tag, owner, clock, "md_ggenie", __FILE__),
device_md_cart_interface( mconfig, *this ),
m_exp(*this, "subslot"), m_gg_bypass(0), m_reg_enable(0)
diff --git a/src/devices/bus/megadrive/ggenie.h b/src/devices/bus/megadrive/ggenie.h
index 75b943abb4e..5970ca1d172 100644
--- a/src/devices/bus/megadrive/ggenie.h
+++ b/src/devices/bus/megadrive/ggenie.h
@@ -13,7 +13,7 @@ class md_rom_ggenie_device : public device_t,
{
public:
// construction/destruction
- md_rom_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -26,11 +26,11 @@ public:
private:
required_device<md_cart_slot_device> m_exp;
- UINT16 m_gg_regs[0x20];
+ uint16_t m_gg_regs[0x20];
int m_gg_bypass;
int m_reg_enable;
- UINT16 m_gg_addr[6];
- UINT16 m_gg_data[6];
+ uint16_t m_gg_addr[6];
+ uint16_t m_gg_data[6];
};
diff --git a/src/devices/bus/megadrive/jcart.cpp b/src/devices/bus/megadrive/jcart.cpp
index e3182fca414..43d38e50a60 100644
--- a/src/devices/bus/megadrive/jcart.cpp
+++ b/src/devices/bus/megadrive/jcart.cpp
@@ -40,7 +40,7 @@ const device_type MD_SEPROM_CODEMAST = &device_creator<md_seprom_codemast_device
const device_type MD_SEPROM_MM96 = &device_creator<md_seprom_mm96_device>;
// Sampras, Super Skidmarks?
-md_jcart_device::md_jcart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+md_jcart_device::md_jcart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_md_cart_interface( mconfig, *this ),
m_jcart3(*this, "JCART3"),
@@ -48,7 +48,7 @@ md_jcart_device::md_jcart_device(const machine_config &mconfig, device_type type
{
}
-md_jcart_device::md_jcart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_jcart_device::md_jcart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MD_JCART, "MD J-Cart games", tag, owner, clock, "md_jcart", __FILE__),
device_md_cart_interface( mconfig, *this ),
m_jcart3(*this, "JCART3"),
@@ -57,20 +57,20 @@ md_jcart_device::md_jcart_device(const machine_config &mconfig, const char *tag,
}
// Micro Machines 2, Micro Machines Military
-md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: md_jcart_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_i2cmem(*this, "i2cmem"), m_i2c_mem(0), m_i2c_clk(0)
{
}
-md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_seprom_codemast_device::md_seprom_codemast_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_jcart_device(mconfig, MD_SEPROM_CODEMAST, "MD J-Cart games + SEPROM", tag, owner, clock, "md_seprom_codemast", __FILE__),
m_i2cmem(*this, "i2cmem"), m_i2c_mem(0), m_i2c_clk(0)
{
}
// Micro Machines 96
-md_seprom_mm96_device::md_seprom_mm96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_seprom_mm96_device::md_seprom_mm96_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_seprom_codemast_device(mconfig, MD_SEPROM_MM96, "MD Micro Machine 96", tag, owner, clock, "md_seprom_mm96", __FILE__)
{
}
@@ -176,7 +176,7 @@ READ16_MEMBER(md_jcart_device::read)
{
if (offset == 0x38fffe/2)
{
- UINT8 joy[2];
+ uint8_t joy[2];
if (m_jcart_io_data[0] & 0x40)
{
@@ -219,7 +219,7 @@ READ16_MEMBER(md_seprom_codemast_device::read)
}
if (offset == 0x38fffe/2)
{
- UINT8 joy[2];
+ uint8_t joy[2];
if (m_jcart_io_data[0] & 0x40)
{
diff --git a/src/devices/bus/megadrive/jcart.h b/src/devices/bus/megadrive/jcart.h
index 7af02447ede..3d2a6c10bd7 100644
--- a/src/devices/bus/megadrive/jcart.h
+++ b/src/devices/bus/megadrive/jcart.h
@@ -18,8 +18,8 @@ class md_jcart_device : public device_t,
{
public:
// construction/destruction
- md_jcart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- md_jcart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_jcart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ md_jcart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -34,7 +34,7 @@ public:
required_ioport m_jcart4;
private:
- UINT8 m_jcart_io_data[2];
+ uint8_t m_jcart_io_data[2];
};
// ======================> md_seprom_codemast_device
@@ -43,8 +43,8 @@ class md_seprom_codemast_device : public md_jcart_device
{
public:
// construction/destruction
- md_seprom_codemast_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- md_seprom_codemast_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_seprom_codemast_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ md_seprom_codemast_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -58,8 +58,8 @@ public:
required_device<i2cmem_device> m_i2cmem;
private:
- UINT8 m_jcart_io_data[2];
- UINT8 m_i2c_mem, m_i2c_clk;
+ uint8_t m_jcart_io_data[2];
+ uint8_t m_i2c_mem, m_i2c_clk;
};
// ======================> md_seprom_mm96_device (same read/write as codemast, but different I2C type)
@@ -68,7 +68,7 @@ class md_seprom_mm96_device : public md_seprom_codemast_device
{
public:
// construction/destruction
- md_seprom_mm96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_seprom_mm96_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/megadrive/md_slot.cpp b/src/devices/bus/megadrive/md_slot.cpp
index 246dc43cab8..0886d204e98 100644
--- a/src/devices/bus/megadrive/md_slot.cpp
+++ b/src/devices/bus/megadrive/md_slot.cpp
@@ -87,7 +87,7 @@ void device_md_cart_interface::rom_alloc(size_t size, const char *tag)
{
if (m_rom == nullptr)
{
- m_rom = (UINT16 *)device().machine().memory().region_alloc(std::string(tag).append(MDSLOT_ROM_REGION_TAG).c_str(), size, 2, ENDIANNESS_BIG)->base();
+ m_rom = (uint16_t *)device().machine().memory().region_alloc(std::string(tag).append(MDSLOT_ROM_REGION_TAG).c_str(), size, 2, ENDIANNESS_BIG)->base();
m_rom_size = size;
}
}
@@ -99,7 +99,7 @@ void device_md_cart_interface::rom_alloc(size_t size, const char *tag)
void device_md_cart_interface::nvram_alloc(size_t size)
{
- m_nvram.resize(size/sizeof(UINT16));
+ m_nvram.resize(size/sizeof(uint16_t));
}
//-------------------------------------------------
@@ -107,7 +107,7 @@ void device_md_cart_interface::nvram_alloc(size_t size)
// blocks, so to simplify ROM mirroring
//-------------------------------------------------
-void device_md_cart_interface::rom_map_setup(UINT32 size)
+void device_md_cart_interface::rom_map_setup(uint32_t size)
{
int i;
// setup the rom_bank_map array to faster ROM read
@@ -139,9 +139,9 @@ void device_md_cart_interface::rom_map_setup(UINT32 size)
// get_padded_size
//-------------------------------------------------
-UINT32 device_md_cart_interface::get_padded_size(UINT32 size)
+uint32_t device_md_cart_interface::get_padded_size(uint32_t size)
{
- UINT32 pad_size = 0x10000;
+ uint32_t pad_size = 0x10000;
while (size > pad_size)
pad_size <<= 1;
@@ -160,7 +160,7 @@ UINT32 device_md_cart_interface::get_padded_size(UINT32 size)
//-------------------------------------------------
// base_md_cart_slot_device - constructor
//-------------------------------------------------
-base_md_cart_slot_device::base_md_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+base_md_cart_slot_device::base_md_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -169,17 +169,17 @@ base_md_cart_slot_device::base_md_cart_slot_device(const machine_config &mconfig
{
}
-md_cart_slot_device::md_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+md_cart_slot_device::md_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
base_md_cart_slot_device(mconfig, MD_CART_SLOT, "MD Cartridge Slot", tag, owner, clock, "md_cart_slot", __FILE__)
{
}
-pico_cart_slot_device::pico_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pico_cart_slot_device::pico_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
base_md_cart_slot_device(mconfig, PICO_CART_SLOT, "Pico Cartridge Slot", tag, owner, clock, "pico_cart_slot", __FILE__)
{
}
-copera_cart_slot_device::copera_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+copera_cart_slot_device::copera_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
base_md_cart_slot_device(mconfig, COPERA_CART_SLOT, "Copera Cartridge Slot", tag, owner, clock, "copera_cart_slot", __FILE__)
{
}
@@ -354,7 +354,7 @@ image_init_result base_md_cart_slot_device::call_load()
if (m_cart->get_nvram_size())
battery_load(m_cart->get_nvram_base(), m_cart->get_nvram_size(), 0xff);
- file_logging((UINT8 *)m_cart->get_rom_base(), m_cart->get_rom_size(), m_cart->get_nvram_size());
+ file_logging((uint8_t *)m_cart->get_rom_base(), m_cart->get_rom_size(), m_cart->get_nvram_size());
}
return res;
@@ -366,8 +366,8 @@ image_init_result base_md_cart_slot_device::call_load()
image_init_result base_md_cart_slot_device::load_list()
{
- UINT16 *ROM;
- UINT32 length = get_software_region_length("rom");
+ uint16_t *ROM;
+ uint32_t length = get_software_region_length("rom");
const char *slot_name;
// if cart size is not (2^n * 64K), the system will see anyway that size so we need to alloc a bit more space
@@ -375,7 +375,7 @@ image_init_result base_md_cart_slot_device::load_list()
m_cart->rom_alloc(length, tag());
ROM = m_cart->get_rom_base();
- memcpy((UINT8 *)ROM, get_software_region("rom"), get_software_region_length("rom"));
+ memcpy((uint8_t *)ROM, get_software_region("rom"), get_software_region_length("rom"));
// if we allocated a ROM larger that the file (e.g. due to uneven cart size), set remaining space to 0xff
if (length > get_software_region_length("rom"))
@@ -470,8 +470,8 @@ image_init_result base_md_cart_slot_device::load_nonlist()
{
unsigned char *ROM;
bool is_smd, is_md;
- UINT32 tmplen = length(), offset, len;
- std::vector<UINT8> tmpROM(tmplen);
+ uint32_t tmplen = length(), offset, len;
+ std::vector<uint8_t> tmpROM(tmplen);
// STEP 1: store a (possibly headered) copy of the file and determine its type (SMD? MD? BIN?)
fread(&tmpROM[0], tmplen);
@@ -562,7 +562,7 @@ void base_md_cart_slot_device::call_unload()
void base_md_cart_slot_device::setup_custom_mappers()
{
- UINT16 *ROM16 = m_cart->get_rom_base();
+ uint16_t *ROM16 = m_cart->get_rom_base();
switch (m_type)
{
@@ -583,7 +583,7 @@ void base_md_cart_slot_device::setup_custom_mappers()
void base_md_cart_slot_device::setup_nvram()
{
- UINT8 *ROM = (UINT8 *)m_cart->get_rom_base();
+ uint8_t *ROM = (uint8_t *)m_cart->get_rom_base();
m_cart->m_nvram_readonly = 0;
m_cart->m_nvram_active = 0;
m_cart->m_nvram_handlers_installed = 0;
@@ -683,7 +683,7 @@ void base_md_cart_slot_device::setup_nvram()
-int base_md_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
+int base_md_cart_slot_device::get_cart_type(uint8_t *ROM, uint32_t len)
{
int type = SEGA_STD;
@@ -889,8 +889,8 @@ int base_md_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
// If the cart is not of a special type, we check the header for SRAM.
if (ROM[0x1b1] == 'A' && ROM[0x1b0] == 'R')
{
- UINT32 start = (ROM[0x1b4] << 24 | ROM[0x1b5] << 16 | ROM[0x1b6] << 8 | ROM[0x1b7]);
- UINT32 end = (ROM[0x1b8] << 24 | ROM[0x1b9] << 16 | ROM[0x1ba] << 8 | ROM[0x1bb]);
+ uint32_t start = (ROM[0x1b4] << 24 | ROM[0x1b5] << 16 | ROM[0x1b6] << 8 | ROM[0x1b7]);
+ uint32_t end = (ROM[0x1b8] << 24 | ROM[0x1b9] << 16 | ROM[0x1ba] << 8 | ROM[0x1bb]);
// For some games using serial EEPROM, difference between SRAM end to start is 0 or 1.
// Carts with EEPROM should have been already detected above, but better safe than sorry
if (end - start < 2)
@@ -918,8 +918,8 @@ std::string base_md_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- UINT32 len = m_file->size(), offset = 0;
- std::vector<UINT8> rom(len);
+ uint32_t len = m_file->size(), offset = 0;
+ std::vector<uint8_t> rom(len);
int type;
m_file->read(&rom[0], len);
@@ -995,12 +995,12 @@ WRITE16_MEMBER(base_md_cart_slot_device::write_a15)
Image loading logging
-------------------------------------------------*/
-void base_md_cart_slot_device::file_logging(UINT8 *ROM8, UINT32 rom_len, UINT32 nvram_len)
+void base_md_cart_slot_device::file_logging(uint8_t *ROM8, uint32_t rom_len, uint32_t nvram_len)
{
char console[16], copyright[16], domestic_name[48], overseas_name[48];
char serial[14], io[16], modem[12], memo[40], country[16];
- UINT32 rom_start, rom_end, ram_start, ram_end, sram_start = 0, sram_end = 0;
- UINT16 checksum, csum = 0;
+ uint32_t rom_start, rom_end, ram_start, ram_end, sram_start = 0, sram_end = 0;
+ uint16_t checksum, csum = 0;
bool valid_sram = FALSE, is_pico = FALSE;
std::string ctrl(""), reg("");
diff --git a/src/devices/bus/megadrive/md_slot.h b/src/devices/bus/megadrive/md_slot.h
index 008ae917fb5..4953ac046cd 100644
--- a/src/devices/bus/megadrive/md_slot.h
+++ b/src/devices/bus/megadrive/md_slot.h
@@ -109,16 +109,16 @@ public:
virtual void rom_alloc(size_t size, const char *tag);
virtual void nvram_alloc(size_t size);
- virtual UINT16* get_rom_base() { return m_rom; };
- virtual UINT16* get_nvram_base() { return &m_nvram[0]; };
- virtual UINT32 get_rom_size() { return m_rom_size; };
- virtual UINT32 get_nvram_size() { return m_nvram.size()*sizeof(UINT16); };
- virtual void set_bank_to_rom(const char *banktag, UINT32 offset) {};
+ virtual uint16_t* get_rom_base() { return m_rom; };
+ virtual uint16_t* get_nvram_base() { return &m_nvram[0]; };
+ virtual uint32_t get_rom_size() { return m_rom_size; };
+ virtual uint32_t get_nvram_size() { return m_nvram.size()*sizeof(uint16_t); };
+ virtual void set_bank_to_rom(const char *banktag, uint32_t offset) {};
void save_nvram() { device().save_item(NAME(m_nvram)); }
- void rom_map_setup(UINT32 size);
- UINT32 get_padded_size(UINT32 size);
+ void rom_map_setup(uint32_t size);
+ uint32_t get_padded_size(uint32_t size);
int m_nvram_start, m_nvram_end;
int m_nvram_active, m_nvram_readonly;
@@ -129,11 +129,11 @@ public:
int m_nvram_handlers_installed;
// internal state
- UINT16 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT16> m_nvram;
+ uint16_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint16_t> m_nvram;
- UINT8 rom_bank_map[128]; // 64K chunks of rom
+ uint8_t rom_bank_map[128]; // 64K chunks of rom
};
@@ -145,7 +145,7 @@ class base_md_cart_slot_device : public device_t,
{
public:
// construction/destruction
- base_md_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ base_md_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual ~base_md_cart_slot_device();
// device-level overrides
@@ -171,12 +171,12 @@ public:
image_init_result load_list();
image_init_result load_nonlist();
- int get_cart_type(UINT8 *ROM, UINT32 len);
+ int get_cart_type(uint8_t *ROM, uint32_t len);
void setup_custom_mappers();
void setup_nvram();
void set_must_be_loaded(bool _must_be_loaded) { m_must_be_loaded = _must_be_loaded; }
- void file_logging(UINT8 *ROM, UINT32 rom_len, UINT32 nvram_len);
+ void file_logging(uint8_t *ROM, uint32_t rom_len, uint32_t nvram_len);
void save_nvram() { if (m_cart && m_cart->get_nvram_size()) m_cart->save_nvram(); }
@@ -205,7 +205,7 @@ class md_cart_slot_device : public base_md_cart_slot_device
{
public:
// construction/destruction
- md_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const char *image_interface() const override { return "megadriv_cart"; }
virtual const char *file_extensions() const override { return "smd,bin,md,gen"; }
};
@@ -216,7 +216,7 @@ class pico_cart_slot_device : public base_md_cart_slot_device
{
public:
// construction/destruction
- pico_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pico_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const char *image_interface() const override { return "pico_cart"; }
virtual const char *file_extensions() const override { return "bin,md"; }
};
@@ -227,7 +227,7 @@ class copera_cart_slot_device : public base_md_cart_slot_device
{
public:
// construction/destruction
- copera_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ copera_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const char *image_interface() const override { return "copera_cart"; }
virtual const char *file_extensions() const override { return "bin,md"; }
};
diff --git a/src/devices/bus/megadrive/rom.cpp b/src/devices/bus/megadrive/rom.cpp
index 039574487ca..772a777d965 100644
--- a/src/devices/bus/megadrive/rom.cpp
+++ b/src/devices/bus/megadrive/rom.cpp
@@ -65,184 +65,184 @@ const device_type MD_ROM_WUKONG = &device_creator<md_rom_wukong_device>;
const device_type MD_ROM_STARODYS = &device_creator<md_rom_starodys_device>;
-md_std_rom_device::md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+md_std_rom_device::md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_md_cart_interface( mconfig, *this )
{
}
-md_std_rom_device::md_std_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_std_rom_device::md_std_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MD_STD_ROM, "MD Standard cart", tag, owner, clock, "md_std_rom", __FILE__),
device_md_cart_interface( mconfig, *this )
{
}
-md_rom_sram_device::md_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_sram_device::md_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_SRAM, "MD Standard cart + SRAM", tag, owner, clock, "md_rom_sram", __FILE__)
{
}
-md_rom_fram_device::md_rom_fram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_fram_device::md_rom_fram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_FRAM, "MD Standard cart + FRAM", tag, owner, clock, "md_rom_fram", __FILE__)
{
}
-md_rom_ssf2_device::md_rom_ssf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_ssf2_device::md_rom_ssf2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_SSF2, "MD Super SF2", tag, owner, clock, "md_rom_ssf2", __FILE__), m_lastoff(0), m_lastdata(0)
{
}
-md_rom_cm2in1_device::md_rom_cm2in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_cm2in1_device::md_rom_cm2in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_CM2IN1, "MD Codemasters 2in1", tag, owner, clock, "md_rom_cm2in1", __FILE__), m_base(0)
{
}
-md_rom_mcpirate_device::md_rom_mcpirate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_mcpirate_device::md_rom_mcpirate_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_MCPIR, "MD Pirate Multicarts (Various)", tag, owner, clock, "md_rom_mcpirate", __FILE__), m_bank(0)
{
}
-md_rom_bugslife_device::md_rom_bugslife_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_bugslife_device::md_rom_bugslife_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_BUGSLIFE, "MD A Bug's Life", tag, owner, clock, "md_rom_bugslife", __FILE__)
{
}
-md_rom_smouse_device::md_rom_smouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_smouse_device::md_rom_smouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_SMOUSE, "MD Huan Le Tao Qi Shu / Smart Mouse", tag, owner, clock, "md_rom_smouse", __FILE__)
{
}
-md_rom_smb_device::md_rom_smb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_smb_device::md_rom_smb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_SMB, "MD Super Mario Bros.", tag, owner, clock, "md_rom_smb", __FILE__)
{
}
-md_rom_smb2_device::md_rom_smb2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_smb2_device::md_rom_smb2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_SMB2, "MD Super Mario Bros. 2", tag, owner, clock, "md_rom_smb2", __FILE__)
{
}
-md_rom_smw64_device::md_rom_smw64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_smw64_device::md_rom_smw64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_SMW64, "MD Super Mario World 64", tag, owner, clock, "md_rom_smw64", __FILE__), m_latch0(0), m_latch1(0)
{
}
-md_rom_sbubl_device::md_rom_sbubl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_sbubl_device::md_rom_sbubl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_SBUBL, "MD Super Bubble Bobble", tag, owner, clock, "md_rom_sbubl", __FILE__)
{
}
-md_rom_rx3_device::md_rom_rx3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_rx3_device::md_rom_rx3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_RX3, "MD Rockman X3", tag, owner, clock, "md_rom_rx3", __FILE__)
{
}
-md_rom_mjlov_device::md_rom_mjlov_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_mjlov_device::md_rom_mjlov_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_MJLOV, "MD Ma Jiang Qing Ren / Mahjong Lover", tag, owner, clock, "md_rom_mjlov", __FILE__)
{
}
-md_rom_cjmjclub_device::md_rom_cjmjclub_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_cjmjclub_device::md_rom_cjmjclub_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_CJMJCLUB, "MD Chaoji Majiang Club / Super Mahjong Club", tag, owner, clock, "md_rom_cjmjclub", __FILE__)
{
}
-md_rom_kof98_device::md_rom_kof98_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_kof98_device::md_rom_kof98_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_KOF98, "MD KOF 98", tag, owner, clock, "md_rom_kof98", __FILE__)
{
}
-md_rom_kof99_device::md_rom_kof99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_kof99_device::md_rom_kof99_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_KOF99, "MD KOF 99 (and others)", tag, owner, clock, "md_rom_kof99", __FILE__)
{
}
-md_rom_soulb_device::md_rom_soulb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_soulb_device::md_rom_soulb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_SOULB, "MD Soul Blade", tag, owner, clock, "md_rom_soulb", __FILE__)
{
}
-md_rom_chinf3_device::md_rom_chinf3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_chinf3_device::md_rom_chinf3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_CHINF3, "MD Chinese Fighter 3", tag, owner, clock, "md_rom_chinf3", __FILE__), m_bank(0)
{
}
-md_rom_16mj2_device::md_rom_16mj2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_16mj2_device::md_rom_16mj2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_16MJ2, "MD 16 Mahjong Tiles II", tag, owner, clock, "md_rom_16mj2", __FILE__)
{
}
-md_rom_elfwor_device::md_rom_elfwor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_elfwor_device::md_rom_elfwor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_ELFWOR, "MD Linghuan Daoshi Super Magician / Elf Wor", tag, owner, clock, "md_rom_elfwor", __FILE__)
{
}
-md_rom_yasech_device::md_rom_yasech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_yasech_device::md_rom_yasech_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_YASECH, "MD Ya Se Chuan Shuo", tag, owner, clock, "md_rom_yasech", __FILE__)
{
}
-md_rom_lion2_device::md_rom_lion2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_lion2_device::md_rom_lion2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_LION2, "MD Lion King 2", tag, owner, clock, "md_rom_lion2", __FILE__), m_prot1_data(0), m_prot2_data(0)
{
}
-md_rom_lion3_device::md_rom_lion3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_lion3_device::md_rom_lion3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_LION3, "MD Lion King 3", tag, owner, clock, "md_rom_lion3", __FILE__), m_bank(0)
{
}
-md_rom_pokea_device::md_rom_pokea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_pokea_device::md_rom_pokea_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_POKEA, "MD Pokemon (Alt Protection)", tag, owner, clock, "md_rom_pokea", __FILE__)
{
}
-md_rom_pokestad_device::md_rom_pokestad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_pokestad_device::md_rom_pokestad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_POKESTAD, "MD Pokemon Stadium", tag, owner, clock, "md_rom_pokestad", __FILE__), m_bank(0)
{
}
-md_rom_realtec_device::md_rom_realtec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_realtec_device::md_rom_realtec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_REALTEC, "MD Realtec", tag, owner, clock, "md_rom_realtec", __FILE__), m_bank_addr(0), m_bank_size(0), m_old_bank_addr(0)
{
}
-md_rom_redcl_device::md_rom_redcl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_redcl_device::md_rom_redcl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_REDCL, "MD Redcliff", tag, owner, clock, "md_rom_redcl", __FILE__)
{
}
-md_rom_squir_device::md_rom_squir_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_squir_device::md_rom_squir_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_SQUIR, "MD Squirrel King", tag, owner, clock, "md_rom_squir", __FILE__), m_latch(0)
{
}
-md_rom_tekkensp_device::md_rom_tekkensp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_tekkensp_device::md_rom_tekkensp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_TEKKENSP, "MD Tekken Special", tag, owner, clock, "md_rom_tekkensp", __FILE__), m_reg(0)
{
}
-md_rom_topf_device::md_rom_topf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_topf_device::md_rom_topf_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_TOPF, "MD Top Fighter", tag, owner, clock, "md_rom_topf", __FILE__), m_latch(0)
{
}
-md_rom_radica_device::md_rom_radica_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_radica_device::md_rom_radica_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_RADICA, "MD Radica TV games", tag, owner, clock, "md_rom_radica", __FILE__), m_bank(0)
{
}
-md_rom_beggarp_device::md_rom_beggarp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_beggarp_device::md_rom_beggarp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_BEGGARP, "MD Beggar Prince", tag, owner, clock, "md_rom_beggarp", __FILE__), m_mode(0), m_lock(0)
{
}
-md_rom_wukong_device::md_rom_wukong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_wukong_device::md_rom_wukong_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_WUKONG, "MD Legend of Wukong", tag, owner, clock, "md_rom_wukong", __FILE__), m_mode(0)
{
}
-md_rom_starodys_device::md_rom_starodys_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_starodys_device::md_rom_starodys_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: md_std_rom_device(mconfig, MD_ROM_STARODYS, "MD Star Odyssey", tag, owner, clock, "md_rom_starodys", __FILE__), m_mode(0), m_lock(0), m_ram_enable(0), m_base(0)
{
}
@@ -552,7 +552,7 @@ WRITE16_MEMBER(md_rom_ssf2_device::write_a13)
m_lastdata = data;
if (offset) // bank 0 is not modified
{
- UINT16 *ROM = get_rom_base();
+ uint16_t *ROM = get_rom_base();
m_bank[offset] = data & 0xf;
memcpy(ROM + offset * 0x080000/2, ROM + 0x400000/2 + (m_bank[offset] * 0x080000)/2, 0x080000);
}
@@ -625,7 +625,7 @@ READ16_MEMBER(md_rom_chinf3_device::read)
and the writes made at the start of the game.. */
if (offset >= 0x400000/2 && offset < 0x500000/2)
{
- UINT32 retdat;
+ uint32_t retdat;
/*
04dc10 chifi3, prot_r? 2800
04cefa chifi3, prot_r? 65262
@@ -1163,7 +1163,7 @@ READ16_MEMBER(md_rom_smw64_device::read)
}
if ((offset >= 0x670000/2) && (offset < 0x680000/2))
{
- UINT16 data = (m_ctrl[1] & 0x80) ? ((m_ctrl[2] & 0x40) ? (m_reg[4] & m_reg[5]) : (m_reg[4] ^ 0xff)) : 0x0000;
+ uint16_t data = (m_ctrl[1] & 0x80) ? ((m_ctrl[2] & 0x40) ? (m_reg[4] & m_reg[5]) : (m_reg[4] ^ 0xff)) : 0x0000;
if (offset & 0x1) // odd offset, return lower 7 bits of the above
return data & 0x7f;
else // even offset, return whole data above, but also update the regs if CTRL3 has 0x80 set
@@ -1503,7 +1503,7 @@ WRITE16_MEMBER(md_rom_starodys_device::write)
if (offset < 0x10000/2)
{
- UINT32 prot_offs = (offset * 2) & 0xf00;
+ uint32_t prot_offs = (offset * 2) & 0xf00;
if (!m_lock)
{
if (prot_offs == 0xd00)
diff --git a/src/devices/bus/megadrive/rom.h b/src/devices/bus/megadrive/rom.h
index d640242ff3c..a75068c2ae2 100644
--- a/src/devices/bus/megadrive/rom.h
+++ b/src/devices/bus/megadrive/rom.h
@@ -16,8 +16,8 @@ class md_std_rom_device : public device_t,
{
public:
// construction/destruction
- md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- md_std_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ md_std_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override {};
@@ -33,7 +33,7 @@ class md_rom_sram_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -47,7 +47,7 @@ class md_rom_fram_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_fram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_fram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -62,7 +62,7 @@ class md_rom_ssf2_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_ssf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_ssf2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -73,7 +73,7 @@ public:
virtual DECLARE_WRITE16_MEMBER(write_a13) override;
private:
- UINT8 m_bank[16];
+ uint8_t m_bank[16];
int m_lastoff, m_lastdata;
};
@@ -83,7 +83,7 @@ class md_rom_cm2in1_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_cm2in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_cm2in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -103,7 +103,7 @@ class md_rom_mcpirate_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_mcpirate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_mcpirate_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -114,7 +114,7 @@ public:
virtual DECLARE_WRITE16_MEMBER(write_a13) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
};
@@ -124,7 +124,7 @@ class md_rom_bugslife_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_bugslife_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_bugslife_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13) override;
@@ -136,7 +136,7 @@ class md_rom_chinf3_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_chinf3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_chinf3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -156,7 +156,7 @@ class md_rom_16mj2_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_16mj2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_16mj2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -168,7 +168,7 @@ class md_rom_elfwor_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_elfwor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_elfwor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -180,7 +180,7 @@ class md_rom_yasech_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_yasech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_yasech_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -192,7 +192,7 @@ class md_rom_kof98_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_kof98_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_kof98_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -204,7 +204,7 @@ class md_rom_kof99_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_kof99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_kof99_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13) override;
@@ -216,7 +216,7 @@ class md_rom_lion2_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_lion2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_lion2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -227,7 +227,7 @@ public:
virtual DECLARE_WRITE16_MEMBER(write) override;
private:
- UINT16 m_prot1_data, m_prot2_data;
+ uint16_t m_prot1_data, m_prot2_data;
};
// ======================> md_rom_lion3_device
@@ -236,7 +236,7 @@ class md_rom_lion3_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_lion3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_lion3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -247,8 +247,8 @@ public:
virtual DECLARE_WRITE16_MEMBER(write) override;
private:
- UINT8 m_reg[3];
- UINT16 m_bank;
+ uint8_t m_reg[3];
+ uint16_t m_bank;
};
// ======================> md_rom_mjlov_device
@@ -257,7 +257,7 @@ class md_rom_mjlov_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_mjlov_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_mjlov_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -269,7 +269,7 @@ class md_rom_cjmjclub_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_cjmjclub_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_cjmjclub_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -281,7 +281,7 @@ class md_rom_pokea_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_pokea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_pokea_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13) override;
@@ -293,7 +293,7 @@ class md_rom_pokestad_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_pokestad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_pokestad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -304,7 +304,7 @@ public:
virtual DECLARE_WRITE16_MEMBER(write) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
};
// ======================> md_rom_realtec_device
@@ -313,7 +313,7 @@ class md_rom_realtec_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_realtec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_realtec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -324,7 +324,7 @@ public:
virtual DECLARE_WRITE16_MEMBER(write) override;
private:
- UINT16 m_bank_addr, m_bank_size, m_old_bank_addr;
+ uint16_t m_bank_addr, m_bank_size, m_old_bank_addr;
};
// ======================> md_rom_redcl_device
@@ -333,7 +333,7 @@ class md_rom_redcl_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_redcl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_redcl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -345,7 +345,7 @@ class md_rom_rx3_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_rx3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_rx3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13) override;
@@ -357,7 +357,7 @@ class md_rom_sbubl_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_sbubl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_sbubl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -369,7 +369,7 @@ class md_rom_smb_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_smb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_smb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13) override;
@@ -381,7 +381,7 @@ class md_rom_smb2_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_smb2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_smb2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13) override;
@@ -393,7 +393,7 @@ class md_rom_smw64_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_smw64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_smw64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -404,9 +404,9 @@ public:
virtual DECLARE_WRITE16_MEMBER(write) override;
private:
- UINT32 m_latch0, m_latch1;
- UINT16 m_reg[6];
- UINT16 m_ctrl[3];
+ uint32_t m_latch0, m_latch1;
+ uint16_t m_reg[6];
+ uint16_t m_ctrl[3];
};
// ======================> md_rom_smouse_device
@@ -415,7 +415,7 @@ class md_rom_smouse_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_smouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_smouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -428,7 +428,7 @@ class md_rom_soulb_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_soulb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_soulb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ16_MEMBER(read) override;
@@ -440,7 +440,7 @@ class md_rom_squir_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_squir_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_squir_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -451,7 +451,7 @@ public:
virtual DECLARE_WRITE16_MEMBER(write) override;
private:
- UINT16 m_latch;
+ uint16_t m_latch;
};
// ======================> md_rom_tekkensp_device
@@ -460,7 +460,7 @@ class md_rom_tekkensp_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_tekkensp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_tekkensp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -471,7 +471,7 @@ public:
virtual DECLARE_WRITE16_MEMBER(write) override;
private:
- UINT16 m_reg;
+ uint16_t m_reg;
};
// ======================> md_rom_topf_device
@@ -480,7 +480,7 @@ class md_rom_topf_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_topf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_topf_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -491,8 +491,8 @@ public:
virtual DECLARE_WRITE16_MEMBER(write) override;
private:
- UINT16 m_latch;
- UINT8 m_bank[3];
+ uint16_t m_latch;
+ uint8_t m_bank[3];
};
// ======================> md_rom_radica_device
@@ -501,7 +501,7 @@ class md_rom_radica_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_radica_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_radica_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -512,7 +512,7 @@ public:
virtual DECLARE_READ16_MEMBER(read_a13) override;
private:
- UINT8 m_bank;
+ uint8_t m_bank;
};
// ======================> md_rom_beggarp_device
@@ -521,7 +521,7 @@ class md_rom_beggarp_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_beggarp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_beggarp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -533,7 +533,7 @@ public:
virtual DECLARE_WRITE16_MEMBER(write_a13) override;
private:
- UINT8 m_mode, m_lock;
+ uint8_t m_mode, m_lock;
};
// ======================> md_rom_wukong_device
@@ -542,7 +542,7 @@ class md_rom_wukong_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_wukong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_wukong_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -554,7 +554,7 @@ public:
virtual DECLARE_WRITE16_MEMBER(write_a13) override;
private:
- UINT8 m_mode;
+ uint8_t m_mode;
};
// ======================> md_rom_starodys_device
@@ -563,7 +563,7 @@ class md_rom_starodys_device : public md_std_rom_device
{
public:
// construction/destruction
- md_rom_starodys_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_starodys_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -576,7 +576,7 @@ public:
virtual DECLARE_WRITE16_MEMBER(write_a13) override;
private:
- UINT8 m_mode, m_lock, m_ram_enable, m_base;
+ uint8_t m_mode, m_lock, m_ram_enable, m_base;
};
diff --git a/src/devices/bus/megadrive/sk.cpp b/src/devices/bus/megadrive/sk.cpp
index 4cee6dd90f4..5703a2a96ca 100644
--- a/src/devices/bus/megadrive/sk.cpp
+++ b/src/devices/bus/megadrive/sk.cpp
@@ -27,14 +27,14 @@
const device_type MD_ROM_SK = &device_creator<md_rom_sk_device>;
-md_rom_sk_device::md_rom_sk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+md_rom_sk_device::md_rom_sk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_md_cart_interface( mconfig, *this ),
m_exp(*this, "subslot")
{
}
-md_rom_sk_device::md_rom_sk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_sk_device::md_rom_sk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MD_ROM_SK, "MD Sonic & Knuckles", tag, owner, clock, "md_rom_sk", __FILE__),
device_md_cart_interface( mconfig, *this ),
m_exp(*this, "subslot")
diff --git a/src/devices/bus/megadrive/sk.h b/src/devices/bus/megadrive/sk.h
index 606d928daae..526a2aa47ea 100644
--- a/src/devices/bus/megadrive/sk.h
+++ b/src/devices/bus/megadrive/sk.h
@@ -13,8 +13,8 @@ class md_rom_sk_device : public device_t,
{
public:
// construction/destruction
- md_rom_sk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- md_rom_sk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_sk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ md_rom_sk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/megadrive/stm95.cpp b/src/devices/bus/megadrive/stm95.cpp
index 2c7ddf89ad4..dded370bdba 100644
--- a/src/devices/bus/megadrive/stm95.cpp
+++ b/src/devices/bus/megadrive/stm95.cpp
@@ -15,7 +15,7 @@
#include "stm95.h"
-stm95_eeprom_device::stm95_eeprom_device(running_machine &machine, UINT8 *eeprom) :
+stm95_eeprom_device::stm95_eeprom_device(running_machine &machine, uint8_t *eeprom) :
stm_state(IDLE),
stream_pos(0),
m_machine(machine)
@@ -175,13 +175,13 @@ void stm95_eeprom_device::set_sck_line(int state)
const device_type MD_EEPROM_STM95 = &device_creator<md_eeprom_stm95_device>;
-md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_md_cart_interface( mconfig, *this ), m_rdcnt(0)
{
}
-md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MD_EEPROM_STM95, "MD Cart + EEPROM STM95", tag, owner, clock, "md_eeprom_stm95", __FILE__),
device_md_cart_interface( mconfig, *this ), m_rdcnt(0)
{
@@ -191,7 +191,7 @@ md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, co
void md_eeprom_stm95_device::device_start()
{
nvram_alloc(M95320_SIZE);
- m_stm95 = std::make_unique<stm95_eeprom_device>(machine(), (UINT8*)get_nvram_base());
+ m_stm95 = std::make_unique<stm95_eeprom_device>(machine(), (uint8_t*)get_nvram_base());
save_item(NAME(m_rdcnt));
save_item(NAME(m_bank));
@@ -215,7 +215,7 @@ READ16_MEMBER(md_eeprom_stm95_device::read)
{
// ugly hack until we don't know much about game protection
// first 3 reads from 15e6 return 0x00000010, then normal 0x00018010 value for crc check
- UINT16 res;
+ uint16_t res;
offset -= 0x0015e6/2;
logerror("read 0x15e6 %d\n", m_rdcnt);
if (m_rdcnt < 6)
@@ -231,7 +231,7 @@ READ16_MEMBER(md_eeprom_stm95_device::read)
return m_rom[offset];
else // last 0x180000 are bankswitched
{
- UINT8 bank = (offset - 0x280000/2) >> 18;
+ uint8_t bank = (offset - 0x280000/2) >> 18;
return m_rom[(offset & 0x7ffff/2) + (m_bank[bank] * 0x80000)/2];
}
}
diff --git a/src/devices/bus/megadrive/stm95.h b/src/devices/bus/megadrive/stm95.h
index 09e61670c14..1e0561f3fae 100644
--- a/src/devices/bus/megadrive/stm95.h
+++ b/src/devices/bus/megadrive/stm95.h
@@ -28,10 +28,10 @@ enum STMSTATE
class stm95_eeprom_device
{
public:
- stm95_eeprom_device(running_machine &machine, UINT8 *eeprom);
+ stm95_eeprom_device(running_machine &machine, uint8_t *eeprom);
running_machine &machine() const { return m_machine; }
- UINT8 *eeprom_data;
+ uint8_t *eeprom_data;
void set_cs_line(int);
void set_halt_line(int state) {}; // not implemented
void set_si_line(int);
@@ -60,8 +60,8 @@ class md_eeprom_stm95_device : public device_t,
{
public:
// construction/destruction
- md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- md_eeprom_stm95_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ md_eeprom_stm95_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -73,7 +73,7 @@ public:
virtual DECLARE_WRITE16_MEMBER(write_a13) override;
private:
- UINT8 m_bank[3];
+ uint8_t m_bank[3];
int m_rdcnt;
std::unique_ptr<stm95_eeprom_device> m_stm95;
diff --git a/src/devices/bus/megadrive/svp.cpp b/src/devices/bus/megadrive/svp.cpp
index 589a58138a6..8aa370164f2 100644
--- a/src/devices/bus/megadrive/svp.cpp
+++ b/src/devices/bus/megadrive/svp.cpp
@@ -36,7 +36,7 @@
const device_type MD_ROM_SVP = &device_creator<md_rom_svp_device>;
-md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_md_cart_interface( mconfig, *this ),
m_svp(*this, "svp"),
@@ -44,7 +44,7 @@ md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, device_type
{
}
-md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MD_ROM_SVP, "MD Virtua Racing", tag, owner, clock, "md_rom_svp", __FILE__),
device_md_cart_interface( mconfig, *this ),
m_svp(*this, "svp"),
@@ -71,7 +71,7 @@ static inline int get_inc(int mode)
return inc;
}
-static inline void overwrite_write(UINT16 *dst, UINT16 d)
+static inline void overwrite_write(uint16_t *dst, uint16_t d)
{
if (d & 0xf000) { *dst &= ~0xf000; *dst |= d & 0xf000; }
if (d & 0x0f00) { *dst &= ~0x0f00; *dst |= d & 0x0f00; }
@@ -81,7 +81,7 @@ static inline void overwrite_write(UINT16 *dst, UINT16 d)
-UINT32 md_rom_svp_device::pm_io(int reg, int write, UINT32 d)
+uint32_t md_rom_svp_device::pm_io(int reg, int write, uint32_t d)
{
if (m_emu_status & SSP_PMC_SET)
{
@@ -101,7 +101,7 @@ UINT32 md_rom_svp_device::pm_io(int reg, int write, UINT32 d)
if (reg == 4 || (m_svp->state().state_int(SSP_ST) & 0x60))
{
#define CADDR ((((mode<<16)&0x7f0000)|addr)<<1)
- UINT16 *dram = (UINT16 *)m_dram;
+ uint16_t *dram = (uint16_t *)m_dram;
if (write)
{
int mode = m_pmac_write[reg] >> 16;
@@ -127,7 +127,7 @@ UINT32 md_rom_svp_device::pm_io(int reg, int write, UINT32 d)
else if ((mode & 0x47ff) == 0x001c) // IRAM
{
int inc = get_inc(mode);
- ((UINT16 *)m_iram)[addr & 0x3ff] = d;
+ ((uint16_t *)m_iram)[addr & 0x3ff] = d;
m_pmac_write[reg] += inc;
}
else
@@ -142,7 +142,7 @@ UINT32 md_rom_svp_device::pm_io(int reg, int write, UINT32 d)
int addr = m_pmac_read[reg] & 0xffff;
if ((mode & 0xfff0) == 0x0800) // ROM, inc 1, verified to be correct
{
- UINT16 *ROM = (UINT16 *)get_rom_base();
+ uint16_t *ROM = (uint16_t *)get_rom_base();
m_pmac_read[reg] += 1;
d = ROM[addr | ((mode & 0xf) << 16)];
}
@@ -169,13 +169,13 @@ UINT32 md_rom_svp_device::pm_io(int reg, int write, UINT32 d)
return d;
}
- return (UINT32)-1;
+ return (uint32_t)-1;
}
READ16_MEMBER( md_rom_svp_device::read_pm0 )
{
- UINT32 d = pm_io(0, 0, 0);
- if (d != (UINT32)-1)
+ uint32_t d = pm_io(0, 0, 0);
+ if (d != (uint32_t)-1)
return d;
d = m_xst2;
m_xst2 &= ~2; // ?
@@ -184,16 +184,16 @@ READ16_MEMBER( md_rom_svp_device::read_pm0 )
WRITE16_MEMBER( md_rom_svp_device::write_pm0 )
{
- UINT32 r = pm_io(0, 1, data);
- if (r != (UINT32)-1)
+ uint32_t r = pm_io(0, 1, data);
+ if (r != (uint32_t)-1)
return;
m_xst2 = data; // ?
}
READ16_MEMBER( md_rom_svp_device::read_pm1 )
{
- UINT32 r = pm_io(1, 0, 0);
- if (r != (UINT32)-1)
+ uint32_t r = pm_io(1, 0, 0);
+ if (r != (uint32_t)-1)
return r;
logerror("svp: PM1 acces in non PM mode?\n");
return 0;
@@ -201,16 +201,16 @@ READ16_MEMBER( md_rom_svp_device::read_pm1 )
WRITE16_MEMBER( md_rom_svp_device::write_pm1 )
{
- UINT32 r = pm_io(1, 1, data);
- if (r != (UINT32)-1)
+ uint32_t r = pm_io(1, 1, data);
+ if (r != (uint32_t)-1)
return;
logerror("svp: PM1 acces in non PM mode?\n");
}
READ16_MEMBER( md_rom_svp_device::read_pm2 )
{
- UINT32 r = pm_io(2, 0, 0);
- if (r != (UINT32)-1)
+ uint32_t r = pm_io(2, 0, 0);
+ if (r != (uint32_t)-1)
return r;
logerror("svp: PM2 acces in non PM mode?\n");
return 0;
@@ -218,24 +218,24 @@ READ16_MEMBER( md_rom_svp_device::read_pm2 )
WRITE16_MEMBER( md_rom_svp_device::write_pm2 )
{
- UINT32 r = pm_io(2, 1, data);
- if (r != (UINT32)-1)
+ uint32_t r = pm_io(2, 1, data);
+ if (r != (uint32_t)-1)
return;
logerror("svp: PM2 acces in non PM mode?\n");
}
READ16_MEMBER( md_rom_svp_device::read_xst )
{
- UINT32 d = pm_io(3, 0, 0);
- if (d != (UINT32)-1)
+ uint32_t d = pm_io(3, 0, 0);
+ if (d != (uint32_t)-1)
return d;
return m_xst;
}
WRITE16_MEMBER( md_rom_svp_device::write_xst )
{
- UINT32 r = pm_io(3, 1, data);
- if (r != (UINT32)-1)
+ uint32_t r = pm_io(3, 1, data);
+ if (r != (uint32_t)-1)
return;
m_xst2 |= 1;
m_xst = data;
@@ -294,7 +294,7 @@ WRITE16_MEMBER( md_rom_svp_device::write_al )
READ16_MEMBER( md_rom_svp_device::rom_read1 )
{
- UINT16 *IRAM = (UINT16 *)m_iram;
+ uint16_t *IRAM = (uint16_t *)m_iram;
return IRAM[offset];
}
@@ -368,7 +368,7 @@ ioport_constructor md_rom_svp_device::device_input_ports() const
}
-void md_rom_svp_device::set_bank_to_rom(const char *banktag, UINT32 offset)
+void md_rom_svp_device::set_bank_to_rom(const char *banktag, uint32_t offset)
{
if (membank(banktag))
membank(banktag)->set_base(m_rom + offset);
@@ -404,7 +404,7 @@ void md_rom_svp_device::device_start()
READ16_MEMBER(md_rom_svp_device::read)
{
- UINT16 *DRAM = (UINT16 *)m_dram;
+ uint16_t *DRAM = (uint16_t *)m_dram;
if (offset >= 0x300000/2 && offset < 0x320000/2)
{
@@ -413,14 +413,14 @@ READ16_MEMBER(md_rom_svp_device::read)
else if (offset >= 0x390000/2 && offset < 0x3a0000/2)
{
// this is rewritten 68k test code
- UINT32 a1 = offset - 0x390000/2;
+ uint32_t a1 = offset - 0x390000/2;
a1 = (a1 & 0x7001) | ((a1 & 0x3e) << 6) | ((a1 & 0xfc0) >> 5);
return DRAM[a1];
}
else if (offset >= 0x3a0000/2 && offset < 0x3b0000/2)
{
// this is rewritten 68k test code
- UINT32 a1 = offset - 0x3a0000/2;
+ uint32_t a1 = offset - 0x3a0000/2;
a1 = (a1 & 0x7801) | ((a1 & 0x1e) << 6) | ((a1 & 0x7e0) >> 4);
return DRAM[a1];
}
@@ -437,15 +437,15 @@ WRITE16_MEMBER(md_rom_svp_device::write)
{
if (offset >= 0x300000/2 && offset < 0x320000/2)
{
- UINT32 a1 = offset - 0x300000/2;
- UINT16 *DRAM = (UINT16 *)m_dram;
+ uint32_t a1 = offset - 0x300000/2;
+ uint16_t *DRAM = (uint16_t *)m_dram;
DRAM[a1] = data;
}
}
READ16_MEMBER(md_rom_svp_device::read_a15)
{
- UINT32 d;
+ uint32_t d;
switch (offset)
{
// 0xa15000, 0xa15002
diff --git a/src/devices/bus/megadrive/svp.h b/src/devices/bus/megadrive/svp.h
index 73c230c92a0..57aa7713b67 100644
--- a/src/devices/bus/megadrive/svp.h
+++ b/src/devices/bus/megadrive/svp.h
@@ -17,15 +17,15 @@ class md_rom_svp_device : public device_t,
{
public:
// construction/destruction
- md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- md_rom_svp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ md_rom_svp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
//protected:
// device-level overrides
virtual void device_start() override;
virtual machine_config_constructor device_mconfig_additions() const override;
virtual ioport_constructor device_input_ports() const override;
- virtual void set_bank_to_rom(const char *banktag, UINT32 offset) override;
+ virtual void set_bank_to_rom(const char *banktag, uint32_t offset) override;
required_device<device_t> m_svp;
required_ioport m_test_ipt;
@@ -56,16 +56,16 @@ public:
virtual DECLARE_WRITE16_MEMBER(write_pmc);
virtual DECLARE_WRITE16_MEMBER(write_al);
- UINT32 pm_io(int reg, int write, UINT32 d);
+ uint32_t pm_io(int reg, int write, uint32_t d);
- UINT32 m_pmac_read[6]; // read modes/addrs for PM0-PM5
- UINT32 m_pmac_write[6]; // write ...
+ uint32_t m_pmac_read[6]; // read modes/addrs for PM0-PM5
+ uint32_t m_pmac_write[6]; // write ...
PAIR m_pmc;
- UINT32 m_emu_status;
- UINT16 m_xst; // external status, mapped at a15000 and a15002 on 68k side.
- UINT16 m_xst2; // status of XST (bit1 set when 68k writes to XST)
- UINT8 m_iram[0x800]; // IRAM (0-0x7ff)
- UINT8 m_dram[0x20000]; // [0x20000];
+ uint32_t m_emu_status;
+ uint16_t m_xst; // external status, mapped at a15000 and a15002 on 68k side.
+ uint16_t m_xst2; // status of XST (bit1 set when 68k writes to XST)
+ uint8_t m_iram[0x800]; // IRAM (0-0x7ff)
+ uint8_t m_dram[0x20000]; // [0x20000];
};
diff --git a/src/devices/bus/midi/midi.cpp b/src/devices/bus/midi/midi.cpp
index cc8a9166f4f..b636ecbcdc1 100644
--- a/src/devices/bus/midi/midi.cpp
+++ b/src/devices/bus/midi/midi.cpp
@@ -4,7 +4,7 @@
const device_type MIDI_PORT = &device_creator<midi_port_device>;
-midi_port_device::midi_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+midi_port_device::midi_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MIDI_PORT, "Midi Port", tag, owner, clock, "midi_port", __FILE__),
device_slot_interface(mconfig, *this),
m_rxd(0),
diff --git a/src/devices/bus/midi/midi.h b/src/devices/bus/midi/midi.h
index fcd16932637..350d6cac33e 100644
--- a/src/devices/bus/midi/midi.h
+++ b/src/devices/bus/midi/midi.h
@@ -20,7 +20,7 @@ class midi_port_device : public device_t,
friend class device_midi_port_interface;
public:
- midi_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ midi_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~midi_port_device();
// static configuration helpers
diff --git a/src/devices/bus/midi/midiinport.cpp b/src/devices/bus/midi/midiinport.cpp
index 13632219c03..bfb1b2b9ac9 100644
--- a/src/devices/bus/midi/midiinport.cpp
+++ b/src/devices/bus/midi/midiinport.cpp
@@ -12,7 +12,7 @@
const device_type MIDIIN_PORT = &device_creator<midiin_port_device>;
-midiin_port_device::midiin_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+midiin_port_device::midiin_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MIDIIN_PORT, "MIDI In port", tag, owner, clock, "midiin_port", __FILE__),
device_midi_port_interface(mconfig, *this),
m_midiin(*this, "midiinimg")
diff --git a/src/devices/bus/midi/midiinport.h b/src/devices/bus/midi/midiinport.h
index 1f938855d70..0f69cb11620 100644
--- a/src/devices/bus/midi/midiinport.h
+++ b/src/devices/bus/midi/midiinport.h
@@ -18,7 +18,7 @@ class midiin_port_device : public device_t,
public device_midi_port_interface
{
public:
- midiin_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ midiin_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_WRITE_LINE_MEMBER( read ) { output_rxd(state); }
diff --git a/src/devices/bus/midi/midioutport.cpp b/src/devices/bus/midi/midioutport.cpp
index 6ba39d6ee57..1bf5a46200c 100644
--- a/src/devices/bus/midi/midioutport.cpp
+++ b/src/devices/bus/midi/midioutport.cpp
@@ -12,7 +12,7 @@
const device_type MIDIOUT_PORT = &device_creator<midiout_port_device>;
-midiout_port_device::midiout_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+midiout_port_device::midiout_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MIDIOUT_PORT, "MIDI Out port", tag, owner, clock, "midiout_port", __FILE__),
device_midi_port_interface(mconfig, *this),
m_midiout(*this, "midioutimg")
diff --git a/src/devices/bus/midi/midioutport.h b/src/devices/bus/midi/midioutport.h
index 4cfabf9eeea..8fca565f82d 100644
--- a/src/devices/bus/midi/midioutport.h
+++ b/src/devices/bus/midi/midioutport.h
@@ -18,7 +18,7 @@ class midiout_port_device : public device_t,
public device_midi_port_interface
{
public:
- midiout_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ midiout_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { if (started()) m_midiout->tx(state); }
diff --git a/src/devices/bus/msx_cart/arc.cpp b/src/devices/bus/msx_cart/arc.cpp
index a64f321af14..3aa7e52dcdd 100644
--- a/src/devices/bus/msx_cart/arc.cpp
+++ b/src/devices/bus/msx_cart/arc.cpp
@@ -7,7 +7,7 @@
const device_type MSX_CART_ARC = &device_creator<msx_cart_arc>;
-msx_cart_arc::msx_cart_arc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_arc::msx_cart_arc(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_ARC, "MSX Cartridge - Arc", tag, owner, clock, "msx_cart_arc", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_7f(0)
diff --git a/src/devices/bus/msx_cart/arc.h b/src/devices/bus/msx_cart/arc.h
index 29f24bc7e66..748b225935d 100644
--- a/src/devices/bus/msx_cart/arc.h
+++ b/src/devices/bus/msx_cart/arc.h
@@ -13,7 +13,7 @@ class msx_cart_arc : public device_t
, public msx_cart_interface
{
public:
- msx_cart_arc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_arc(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -27,7 +27,7 @@ public:
DECLARE_READ8_MEMBER(io_7f_r);
private:
- UINT8 m_7f;
+ uint8_t m_7f;
};
diff --git a/src/devices/bus/msx_cart/ascii.cpp b/src/devices/bus/msx_cart/ascii.cpp
index 04ef820e7d9..dadc92e6606 100644
--- a/src/devices/bus/msx_cart/ascii.cpp
+++ b/src/devices/bus/msx_cart/ascii.cpp
@@ -11,7 +11,7 @@ const device_type MSX_CART_ASCII16_SRAM = &device_creator<msx_cart_ascii16_sram>
const device_type MSX_CART_MSXWRITE = &device_creator<msx_cart_msxwrite>;
-msx_cart_ascii8::msx_cart_ascii8(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_ascii8::msx_cart_ascii8(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_ASCII8, "MSX Cartridge - ASCII8", tag, owner, clock, "msx_cart_ascii8", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
@@ -52,14 +52,14 @@ void msx_cart_ascii8::device_reset()
void msx_cart_ascii8::initialize_cartridge()
{
- UINT32 size = get_rom_size();
+ uint32_t size = get_rom_size();
if ( size > 256 * 0x2000 )
{
fatalerror("ascii8: ROM is too big\n");
}
- UINT16 banks = size / 0x2000;
+ uint16_t banks = size / 0x2000;
if (size != banks * 0x2000 || (~(banks - 1) % banks))
{
@@ -86,7 +86,7 @@ WRITE8_MEMBER(msx_cart_ascii8::write_cart)
{
if (offset >= 0x6000 && offset < 0x8000)
{
- UINT8 bank = (offset / 0x800) & 0x03;
+ uint8_t bank = (offset / 0x800) & 0x03;
m_selected_bank[bank] = data;
m_bank_base[bank] = get_rom_base() + (m_selected_bank[bank] & m_bank_mask ) * 0x2000;
@@ -95,7 +95,7 @@ WRITE8_MEMBER(msx_cart_ascii8::write_cart)
-msx_cart_ascii16::msx_cart_ascii16(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_ascii16::msx_cart_ascii16(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_ASCII16, "MSX Cartridge - ASCII16", tag, owner, clock, "msx_cart_ascii16", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
@@ -136,14 +136,14 @@ void msx_cart_ascii16::device_reset()
void msx_cart_ascii16::initialize_cartridge()
{
- UINT32 size = get_rom_size();
+ uint32_t size = get_rom_size();
if ( size > 256 * 0x4000 )
{
fatalerror("ascii16: ROM is too big\n");
}
- UINT16 banks = size / 0x4000;
+ uint16_t banks = size / 0x4000;
if (size != banks * 0x4000 || (~(banks - 1) % banks))
{
@@ -185,7 +185,7 @@ WRITE8_MEMBER(msx_cart_ascii16::write_cart)
-msx_cart_ascii8_sram::msx_cart_ascii8_sram(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_ascii8_sram::msx_cart_ascii8_sram(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_ASCII8_SRAM, "MSX Cartridge - ASCII8 w/SRAM", tag, owner, clock, "msx_cart_ascii8_sram", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
@@ -207,7 +207,7 @@ void msx_cart_ascii8_sram::device_start()
}
-void msx_cart_ascii8_sram::setup_bank(UINT8 bank)
+void msx_cart_ascii8_sram::setup_bank(uint8_t bank)
{
if (m_selected_bank[bank] & ~(m_sram_select_mask | m_bank_mask))
{
@@ -246,14 +246,14 @@ void msx_cart_ascii8_sram::device_reset()
void msx_cart_ascii8_sram::initialize_cartridge()
{
- UINT32 size = get_rom_size();
+ uint32_t size = get_rom_size();
if ( size > 128 * 0x2000 )
{
fatalerror("ascii8_sram: ROM is too big\n");
}
- UINT16 banks = size / 0x2000;
+ uint16_t banks = size / 0x2000;
if (size != banks * 0x2000 || (~(banks - 1) % banks))
{
@@ -276,7 +276,7 @@ READ8_MEMBER(msx_cart_ascii8_sram::read_cart)
{
if ( offset >= 0x4000 && offset < 0xC000 )
{
- UINT8 *bank_base = m_bank_base[(offset - 0x4000) >> 13];
+ uint8_t *bank_base = m_bank_base[(offset - 0x4000) >> 13];
if (bank_base != nullptr)
{
@@ -291,14 +291,14 @@ WRITE8_MEMBER(msx_cart_ascii8_sram::write_cart)
{
if (offset >= 0x6000 && offset < 0x8000)
{
- UINT8 bank = (offset / 0x800) & 0x03;
+ uint8_t bank = (offset / 0x800) & 0x03;
m_selected_bank[bank] = data;
setup_bank(bank);
}
else if (offset >= 0x8000 && offset < 0xc000)
{
- UINT8 bank = (offset & 0x2000) ? 3 : 2;
+ uint8_t bank = (offset & 0x2000) ? 3 : 2;
if ((m_selected_bank[bank] & m_sram_select_mask) && !(m_selected_bank[bank] & ~(m_sram_select_mask | m_bank_mask)))
{
@@ -310,7 +310,7 @@ WRITE8_MEMBER(msx_cart_ascii8_sram::write_cart)
-msx_cart_ascii16_sram::msx_cart_ascii16_sram(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_ascii16_sram::msx_cart_ascii16_sram(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_ASCII16_SRAM, "MSX Cartridge - ASCII16 w/SRAM", tag, owner, clock, "msx_cart_ascii16_sram", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
@@ -332,7 +332,7 @@ void msx_cart_ascii16_sram::device_start()
}
-void msx_cart_ascii16_sram::setup_bank(UINT8 bank)
+void msx_cart_ascii16_sram::setup_bank(uint8_t bank)
{
if (m_selected_bank[bank] & ~(m_sram_select_mask | m_bank_mask))
{
@@ -371,14 +371,14 @@ void msx_cart_ascii16_sram::device_reset()
void msx_cart_ascii16_sram::initialize_cartridge()
{
- UINT32 size = get_rom_size();
+ uint32_t size = get_rom_size();
if ( size > 128 * 0x4000 )
{
fatalerror("ascii16_sram: ROM is too big\n");
}
- UINT16 banks = size / 0x4000;
+ uint16_t banks = size / 0x4000;
if (size != banks * 0x4000 || (~(banks - 1) % banks))
{
@@ -401,7 +401,7 @@ READ8_MEMBER(msx_cart_ascii16_sram::read_cart)
{
if ( offset >= 0x4000 && offset < 0xC000 )
{
- UINT8 bank = offset >> 15;
+ uint8_t bank = offset >> 15;
if (m_bank_base[bank] != nullptr)
{
@@ -445,7 +445,7 @@ WRITE8_MEMBER(msx_cart_ascii16_sram::write_cart)
-msx_cart_msxwrite::msx_cart_msxwrite(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_msxwrite::msx_cart_msxwrite(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_MSXWRITE, "MSX Cartridge - MSXWRITE", tag, owner, clock, "msx_cart_msxwrite", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
@@ -486,14 +486,14 @@ void msx_cart_msxwrite::device_reset()
void msx_cart_msxwrite::initialize_cartridge()
{
- UINT32 size = get_rom_size();
+ uint32_t size = get_rom_size();
if ( size > 256 * 0x4000 )
{
fatalerror("msxwrite: ROM is too big\n");
}
- UINT16 banks = size / 0x4000;
+ uint16_t banks = size / 0x4000;
if (size != banks * 0x4000 || (~(banks - 1) % banks))
{
diff --git a/src/devices/bus/msx_cart/ascii.h b/src/devices/bus/msx_cart/ascii.h
index d66cff8ff25..926560d1bea 100644
--- a/src/devices/bus/msx_cart/ascii.h
+++ b/src/devices/bus/msx_cart/ascii.h
@@ -17,7 +17,7 @@ class msx_cart_ascii8 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_ascii8(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_ascii8(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -31,9 +31,9 @@ public:
void restore_banks();
private:
- UINT8 m_bank_mask;
- UINT8 m_selected_bank[4];
- UINT8 *m_bank_base[4];
+ uint8_t m_bank_mask;
+ uint8_t m_selected_bank[4];
+ uint8_t *m_bank_base[4];
};
@@ -41,7 +41,7 @@ class msx_cart_ascii16 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_ascii16(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_ascii16(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -55,9 +55,9 @@ public:
void restore_banks();
private:
- UINT8 m_bank_mask;
- UINT8 m_selected_bank[2];
- UINT8 *m_bank_base[2];
+ uint8_t m_bank_mask;
+ uint8_t m_selected_bank[2];
+ uint8_t *m_bank_base[2];
};
@@ -65,7 +65,7 @@ class msx_cart_ascii8_sram : public device_t
, public msx_cart_interface
{
public:
- msx_cart_ascii8_sram(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_ascii8_sram(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -79,12 +79,12 @@ public:
void restore_banks();
private:
- UINT8 m_bank_mask;
- UINT8 m_selected_bank[4];
- UINT8 *m_bank_base[4];
- UINT8 m_sram_select_mask;
+ uint8_t m_bank_mask;
+ uint8_t m_selected_bank[4];
+ uint8_t *m_bank_base[4];
+ uint8_t m_sram_select_mask;
- void setup_bank(UINT8 bank);
+ void setup_bank(uint8_t bank);
};
@@ -92,7 +92,7 @@ class msx_cart_ascii16_sram : public device_t
, public msx_cart_interface
{
public:
- msx_cart_ascii16_sram(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_ascii16_sram(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -106,12 +106,12 @@ public:
void restore_banks();
private:
- UINT8 m_bank_mask;
- UINT8 m_selected_bank[2];
- UINT8 *m_bank_base[2];
- UINT8 m_sram_select_mask;
+ uint8_t m_bank_mask;
+ uint8_t m_selected_bank[2];
+ uint8_t *m_bank_base[2];
+ uint8_t m_sram_select_mask;
- void setup_bank(UINT8 bank);
+ void setup_bank(uint8_t bank);
};
@@ -119,7 +119,7 @@ class msx_cart_msxwrite : public device_t
, public msx_cart_interface
{
public:
- msx_cart_msxwrite(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_msxwrite(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -133,9 +133,9 @@ public:
void restore_banks();
private:
- UINT8 m_bank_mask;
- UINT8 m_selected_bank[2];
- UINT8 *m_bank_base[2];
+ uint8_t m_bank_mask;
+ uint8_t m_selected_bank[2];
+ uint8_t *m_bank_base[2];
};
#endif
diff --git a/src/devices/bus/msx_cart/bm_012.cpp b/src/devices/bus/msx_cart/bm_012.cpp
index 4939d15e902..0ef22130923 100644
--- a/src/devices/bus/msx_cart/bm_012.cpp
+++ b/src/devices/bus/msx_cart/bm_012.cpp
@@ -22,7 +22,7 @@ TODO:
const device_type MSX_CART_BM_012 = &device_creator<msx_cart_bm_012>;
-msx_cart_bm_012::msx_cart_bm_012(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_bm_012::msx_cart_bm_012(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_BM_012, "MSX Cartridge - BM-012", tag, owner, clock, "msx_cart_bm_012", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_tmpz84c015af(*this, "tmpz84c015af")
diff --git a/src/devices/bus/msx_cart/bm_012.h b/src/devices/bus/msx_cart/bm_012.h
index 8cab8e268e9..4c526f3ac49 100644
--- a/src/devices/bus/msx_cart/bm_012.h
+++ b/src/devices/bus/msx_cart/bm_012.h
@@ -15,7 +15,7 @@ class msx_cart_bm_012 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_bm_012(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_bm_012(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/msx_cart/cartridge.cpp b/src/devices/bus/msx_cart/cartridge.cpp
index 7f990101a08..4dae6ac0471 100644
--- a/src/devices/bus/msx_cart/cartridge.cpp
+++ b/src/devices/bus/msx_cart/cartridge.cpp
@@ -75,25 +75,25 @@ msx_cart_interface::msx_cart_interface(const machine_config &mconfig, device_t &
{
}
-void msx_cart_interface::rom_alloc(UINT32 size)
+void msx_cart_interface::rom_alloc(uint32_t size)
{
m_rom.resize(size);
memset(&m_rom[0], 0xff, size);
}
-void msx_cart_interface::rom_vlm5030_alloc(UINT32 size)
+void msx_cart_interface::rom_vlm5030_alloc(uint32_t size)
{
m_rom_vlm5030.resize(size);
memset(&m_rom_vlm5030[0], 0xff, size);
}
-void msx_cart_interface::ram_alloc(UINT32 size)
+void msx_cart_interface::ram_alloc(uint32_t size)
{
m_ram.resize(size);
memset(&m_ram[0], 0x00, size);
}
-void msx_cart_interface::sram_alloc(UINT32 size)
+void msx_cart_interface::sram_alloc(uint32_t size)
{
m_sram.resize(size);
memset(&m_sram[0], 0x00, size);
diff --git a/src/devices/bus/msx_cart/cartridge.h b/src/devices/bus/msx_cart/cartridge.h
index 6016d30202a..5025f6cfa2b 100644
--- a/src/devices/bus/msx_cart/cartridge.h
+++ b/src/devices/bus/msx_cart/cartridge.h
@@ -26,25 +26,25 @@ public:
// ROM/RAM/SRAM management
// Mainly used by the cartridge slot when loading images
- void rom_alloc(UINT32 size);
- void ram_alloc(UINT32 size);
- void rom_vlm5030_alloc(UINT32 size);
- void sram_alloc(UINT32 size);
-
- UINT8* get_rom_base() { return &m_rom[0]; }
- UINT8* get_rom_vlm5030_base() { return &m_rom_vlm5030[0]; }
- UINT8* get_ram_base() { return &m_ram[0]; }
- UINT8* get_sram_base() { return &m_sram[0]; }
- UINT32 get_rom_size() { return m_rom.size(); }
- UINT32 get_rom_vlm5030_size() { return m_rom_vlm5030.size(); }
- UINT32 get_ram_size() { return m_ram.size(); }
- UINT32 get_sram_size() { return m_sram.size(); }
+ void rom_alloc(uint32_t size);
+ void ram_alloc(uint32_t size);
+ void rom_vlm5030_alloc(uint32_t size);
+ void sram_alloc(uint32_t size);
+
+ uint8_t* get_rom_base() { return &m_rom[0]; }
+ uint8_t* get_rom_vlm5030_base() { return &m_rom_vlm5030[0]; }
+ uint8_t* get_ram_base() { return &m_ram[0]; }
+ uint8_t* get_sram_base() { return &m_sram[0]; }
+ uint32_t get_rom_size() { return m_rom.size(); }
+ uint32_t get_rom_vlm5030_size() { return m_rom_vlm5030.size(); }
+ uint32_t get_ram_size() { return m_ram.size(); }
+ uint32_t get_sram_size() { return m_sram.size(); }
protected:
- std::vector<UINT8> m_rom;
- std::vector<UINT8> m_ram;
- std::vector<UINT8> m_rom_vlm5030;
- std::vector<UINT8> m_sram;
+ std::vector<uint8_t> m_rom;
+ std::vector<uint8_t> m_ram;
+ std::vector<uint8_t> m_rom_vlm5030;
+ std::vector<uint8_t> m_sram;
devcb_write_line m_out_irq_cb;
};
diff --git a/src/devices/bus/msx_cart/crossblaim.cpp b/src/devices/bus/msx_cart/crossblaim.cpp
index f36f7b4b8cc..99f081e1eb0 100644
--- a/src/devices/bus/msx_cart/crossblaim.cpp
+++ b/src/devices/bus/msx_cart/crossblaim.cpp
@@ -6,7 +6,7 @@
const device_type MSX_CART_CROSSBLAIM = &device_creator<msx_cart_crossblaim>;
-msx_cart_crossblaim::msx_cart_crossblaim(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_crossblaim::msx_cart_crossblaim(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_CROSSBLAIM, "MSX Cartridge - Cross Blaim", tag, owner, clock, "msx_cart_crossblaim", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_selected_bank(1)
@@ -60,7 +60,7 @@ void msx_cart_crossblaim::initialize_cartridge()
READ8_MEMBER(msx_cart_crossblaim::read_cart)
{
- UINT8 *bank_base = m_bank_base[offset >> 14];
+ uint8_t *bank_base = m_bank_base[offset >> 14];
if (bank_base != nullptr)
{
diff --git a/src/devices/bus/msx_cart/crossblaim.h b/src/devices/bus/msx_cart/crossblaim.h
index 85af99795fb..8ee0a0ad6a7 100644
--- a/src/devices/bus/msx_cart/crossblaim.h
+++ b/src/devices/bus/msx_cart/crossblaim.h
@@ -13,7 +13,7 @@ class msx_cart_crossblaim : public device_t
, public msx_cart_interface
{
public:
- msx_cart_crossblaim(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_crossblaim(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -27,8 +27,8 @@ public:
void restore_banks();
private:
- UINT8 m_selected_bank;
- UINT8 *m_bank_base[4];
+ uint8_t m_selected_bank;
+ uint8_t *m_bank_base[4];
void setup_bank();
};
diff --git a/src/devices/bus/msx_cart/disk.cpp b/src/devices/bus/msx_cart/disk.cpp
index 11789e0a79f..e025ae73ce2 100644
--- a/src/devices/bus/msx_cart/disk.cpp
+++ b/src/devices/bus/msx_cart/disk.cpp
@@ -122,7 +122,7 @@ static SLOT_INTERFACE_START( msx_floppies )
SLOT_INTERFACE_END
-msx_cart_disk::msx_cart_disk(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+msx_cart_disk::msx_cart_disk(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
, msx_cart_interface(mconfig, *this)
, m_floppy0(*this, "fdc:0")
@@ -132,53 +132,53 @@ msx_cart_disk::msx_cart_disk(const machine_config &mconfig, device_type type, co
}
-msx_cart_disk_wd::msx_cart_disk_wd(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+msx_cart_disk_wd::msx_cart_disk_wd(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname)
: msx_cart_disk(mconfig, type, name, tag, owner, clock, shortname)
, m_fdc(*this, "fdc")
{
}
-msx_cart_disk_type1::msx_cart_disk_type1(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+msx_cart_disk_type1::msx_cart_disk_type1(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname)
: msx_cart_disk_wd(mconfig, type, name, tag, owner, clock, shortname), m_side_control(0)
, m_control(0)
{
}
-msx_cart_disk_type2::msx_cart_disk_type2(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+msx_cart_disk_type2::msx_cart_disk_type2(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname)
: msx_cart_disk_wd(mconfig, type, name, tag, owner, clock, shortname)
, m_control(0)
{
}
-msx_cart_vy0010::msx_cart_vy0010(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_vy0010::msx_cart_vy0010(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_cart_disk_type1(mconfig, MSX_CART_VY0010, "MSX Cartridge - VY0010", tag, owner, clock, "msx_cart_vy0010")
{
}
-msx_cart_fsfd1::msx_cart_fsfd1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_fsfd1::msx_cart_fsfd1(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_cart_disk_type1(mconfig, MSX_CART_FSFD1, "MSX Cartridge - FS-FD1", tag, owner, clock, "msx_cart_fsfd1")
{
}
-msx_cart_fscf351::msx_cart_fscf351(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_fscf351::msx_cart_fscf351(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_cart_disk_type2(mconfig, MSX_CART_FSCF351, "MSX Cartridge - FS-CF351", tag, owner, clock, "msx_cart_fscf351")
{
}
-msx_cart_disk_tc8566::msx_cart_disk_tc8566(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+msx_cart_disk_tc8566::msx_cart_disk_tc8566(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname)
: msx_cart_disk(mconfig, type, name, tag, owner, clock, shortname)
, m_fdc(*this, "fdc")
{
}
-msx_cart_fsfd1a::msx_cart_fsfd1a(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_fsfd1a::msx_cart_fsfd1a(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_cart_disk_tc8566(mconfig, MSX_CART_FSFD1A, "MSX Cartridge - FS-FD1A", tag, owner, clock, "msx_cart_fsfd1a")
{
}
@@ -294,7 +294,7 @@ void msx_cart_disk_type1::device_start()
void msx_cart_disk_type1::post_load()
{
- UINT8 data = m_control;
+ uint8_t data = m_control;
// To make sure the FDD busy led status gets set correctly
m_control ^= 0x40;
@@ -303,9 +303,9 @@ void msx_cart_disk_type1::post_load()
}
-void msx_cart_disk_type1::set_control(UINT8 data)
+void msx_cart_disk_type1::set_control(uint8_t data)
{
- UINT8 old_m_control = m_control;
+ uint8_t old_m_control = m_control;
m_control = data;
@@ -340,7 +340,7 @@ void msx_cart_disk_type1::set_control(UINT8 data)
}
-void msx_cart_disk_type1::set_side_control(UINT8 data)
+void msx_cart_disk_type1::set_side_control(uint8_t data)
{
m_side_control = data;
@@ -455,7 +455,7 @@ void msx_cart_disk_type2::device_reset()
void msx_cart_disk_type2::post_load()
{
- UINT8 data = m_control;
+ uint8_t data = m_control;
// To make sure the FDD busy led status gets set correctly
m_control ^= 0x40;
@@ -464,9 +464,9 @@ void msx_cart_disk_type2::post_load()
}
-void msx_cart_disk_type2::set_control(UINT8 data)
+void msx_cart_disk_type2::set_control(uint8_t data)
{
- UINT8 old_m_control = m_control;
+ uint8_t old_m_control = m_control;
m_control = data;
diff --git a/src/devices/bus/msx_cart/disk.h b/src/devices/bus/msx_cart/disk.h
index f941e7e5668..2724ef39d4e 100644
--- a/src/devices/bus/msx_cart/disk.h
+++ b/src/devices/bus/msx_cart/disk.h
@@ -20,7 +20,7 @@ class msx_cart_disk : public device_t
, public msx_cart_interface
{
public:
- msx_cart_disk(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ msx_cart_disk(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname);
virtual void initialize_cartridge() override;
@@ -36,7 +36,7 @@ protected:
class msx_cart_disk_wd : public msx_cart_disk
{
public:
- msx_cart_disk_wd(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ msx_cart_disk_wd(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname);
protected:
required_device<wd_fdc_analog_t> m_fdc;
@@ -46,7 +46,7 @@ protected:
class msx_cart_disk_type1 : public msx_cart_disk_wd
{
public:
- msx_cart_disk_type1(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ msx_cart_disk_type1(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname);
// device-level overrides
virtual void device_start() override;
@@ -58,18 +58,18 @@ public:
void post_load();
protected:
- UINT8 m_side_control;
- UINT8 m_control;
+ uint8_t m_side_control;
+ uint8_t m_control;
- void set_side_control(UINT8 data);
- void set_control(UINT8 data);
+ void set_side_control(uint8_t data);
+ void set_control(uint8_t data);
};
class msx_cart_disk_type2 : public msx_cart_disk_wd
{
public:
- msx_cart_disk_type2(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ msx_cart_disk_type2(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname);
// device-level overrides
virtual void device_start() override;
@@ -81,16 +81,16 @@ public:
void post_load();
protected:
- UINT8 m_control;
+ uint8_t m_control;
- void set_control(UINT8 data);
+ void set_control(uint8_t data);
};
class msx_cart_vy0010 : public msx_cart_disk_type1
{
public:
- msx_cart_vy0010(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_vy0010(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
@@ -99,7 +99,7 @@ public:
class msx_cart_fsfd1 : public msx_cart_disk_type1
{
public:
- msx_cart_fsfd1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_fsfd1(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
@@ -108,7 +108,7 @@ public:
class msx_cart_fscf351 : public msx_cart_disk_type2
{
public:
- msx_cart_fscf351(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_fscf351(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
};
@@ -117,7 +117,7 @@ public:
class msx_cart_disk_tc8566 : public msx_cart_disk
{
public:
- msx_cart_disk_tc8566(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ msx_cart_disk_tc8566(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname);
protected:
required_device<tc8566af_device> m_fdc;
@@ -127,7 +127,7 @@ protected:
class msx_cart_fsfd1a : public msx_cart_disk_tc8566
{
public:
- msx_cart_fsfd1a(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_fsfd1a(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/dooly.cpp b/src/devices/bus/msx_cart/dooly.cpp
index 95f2748b04a..494e1bf7207 100644
--- a/src/devices/bus/msx_cart/dooly.cpp
+++ b/src/devices/bus/msx_cart/dooly.cpp
@@ -7,7 +7,7 @@
const device_type MSX_CART_DOOLY = &device_creator<msx_cart_dooly>;
-msx_cart_dooly::msx_cart_dooly(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_dooly::msx_cart_dooly(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_DOOLY, "MSX Cartridge - Dooly", tag, owner, clock, "msx_cart_dooly", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_prot(0)
@@ -40,7 +40,7 @@ READ8_MEMBER(msx_cart_dooly::read_cart)
{
if (offset >= 0x4000 && offset < 0xc000)
{
- UINT8 data = get_rom_base()[offset - 0x4000];
+ uint8_t data = get_rom_base()[offset - 0x4000];
switch (m_prot)
{
diff --git a/src/devices/bus/msx_cart/dooly.h b/src/devices/bus/msx_cart/dooly.h
index dca29881c5f..150d8ad452a 100644
--- a/src/devices/bus/msx_cart/dooly.h
+++ b/src/devices/bus/msx_cart/dooly.h
@@ -13,7 +13,7 @@ class msx_cart_dooly : public device_t
, public msx_cart_interface
{
public:
- msx_cart_dooly(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_dooly(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -25,7 +25,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_cart) override;
private:
- UINT8 m_prot;
+ uint8_t m_prot;
};
diff --git a/src/devices/bus/msx_cart/fmpac.cpp b/src/devices/bus/msx_cart/fmpac.cpp
index 44b934d17f5..0654c27b1fe 100644
--- a/src/devices/bus/msx_cart/fmpac.cpp
+++ b/src/devices/bus/msx_cart/fmpac.cpp
@@ -13,7 +13,7 @@ with: PAC2 BACKUP DATA. We only store the raw sram contents.
const device_type MSX_CART_FMPAC = &device_creator<msx_cart_fmpac>;
-msx_cart_fmpac::msx_cart_fmpac(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_fmpac::msx_cart_fmpac(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_FMPAC, "MSX Cartridge - FM-PAC", tag, owner, clock, "msx_cart_fmpac", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_ym2413(*this, "ym2413")
diff --git a/src/devices/bus/msx_cart/fmpac.h b/src/devices/bus/msx_cart/fmpac.h
index 4fe13f8d084..ed75abdbe05 100644
--- a/src/devices/bus/msx_cart/fmpac.h
+++ b/src/devices/bus/msx_cart/fmpac.h
@@ -14,7 +14,7 @@ class msx_cart_fmpac : public device_t
, public msx_cart_interface
{
public:
- msx_cart_fmpac(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_fmpac(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -33,13 +33,13 @@ public:
private:
required_device<ym2413_device> m_ym2413;
- UINT8 m_selected_bank;
- UINT8 *m_bank_base;
+ uint8_t m_selected_bank;
+ uint8_t *m_bank_base;
bool m_sram_active;
bool m_opll_active;
- UINT8 m_1ffe;
- UINT8 m_1fff;
- UINT8 m_7ff6;
+ uint8_t m_1ffe;
+ uint8_t m_1fff;
+ uint8_t m_7ff6;
};
diff --git a/src/devices/bus/msx_cart/fs_sr022.cpp b/src/devices/bus/msx_cart/fs_sr022.cpp
index df3819fc6b3..efea17e4153 100644
--- a/src/devices/bus/msx_cart/fs_sr022.cpp
+++ b/src/devices/bus/msx_cart/fs_sr022.cpp
@@ -7,7 +7,7 @@
const device_type MSX_CART_FS_SR022 = &device_creator<msx_cart_fs_sr022>;
-msx_cart_fs_sr022::msx_cart_fs_sr022(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_fs_sr022::msx_cart_fs_sr022(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_FS_SR022, "MSX Cartridge - FS-SR022", tag, owner, clock, "msx_cart_fs_sr022", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bunsetsu_rom(nullptr)
diff --git a/src/devices/bus/msx_cart/fs_sr022.h b/src/devices/bus/msx_cart/fs_sr022.h
index 4555520f5b3..8318669d198 100644
--- a/src/devices/bus/msx_cart/fs_sr022.h
+++ b/src/devices/bus/msx_cart/fs_sr022.h
@@ -13,7 +13,7 @@ class msx_cart_fs_sr022 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_fs_sr022(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_fs_sr022(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -25,8 +25,8 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_cart) override;
private:
- const UINT8 *m_bunsetsu_rom;
- UINT32 m_bunsetsu_address;
+ const uint8_t *m_bunsetsu_rom;
+ uint32_t m_bunsetsu_address;
};
diff --git a/src/devices/bus/msx_cart/halnote.cpp b/src/devices/bus/msx_cart/halnote.cpp
index d37354dd0a5..13b85a3cf77 100644
--- a/src/devices/bus/msx_cart/halnote.cpp
+++ b/src/devices/bus/msx_cart/halnote.cpp
@@ -7,7 +7,7 @@
const device_type MSX_CART_HALNOTE = &device_creator<msx_cart_halnote>;
-msx_cart_halnote::msx_cart_halnote(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_halnote::msx_cart_halnote(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_HALNOTE, "MSX Cartridge - Halnote", tag, owner, clock, "msx_cart_halnote", __FILE__)
, msx_cart_interface(mconfig, *this)
{
@@ -99,7 +99,7 @@ READ8_MEMBER(msx_cart_halnote::read_cart)
return m_bank_base[6 + ((offset >> 11) & 0x01)][offset & 0x7ff];
}
- const UINT8 *mem = m_bank_base[offset >> 13];
+ const uint8_t *mem = m_bank_base[offset >> 13];
if (mem)
{
diff --git a/src/devices/bus/msx_cart/halnote.h b/src/devices/bus/msx_cart/halnote.h
index 5d59ce7cd35..79002eca1bc 100644
--- a/src/devices/bus/msx_cart/halnote.h
+++ b/src/devices/bus/msx_cart/halnote.h
@@ -13,7 +13,7 @@ class msx_cart_halnote : public device_t
, public msx_cart_interface
{
public:
- msx_cart_halnote(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_halnote(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -27,8 +27,8 @@ public:
void restore_banks();
private:
- UINT8 m_selected_bank[8];
- UINT8 *m_bank_base[8];
+ uint8_t m_selected_bank[8];
+ uint8_t *m_bank_base[8];
void map_bank(int bank);
};
diff --git a/src/devices/bus/msx_cart/hfox.cpp b/src/devices/bus/msx_cart/hfox.cpp
index a0f2f7c4556..e5879cee778 100644
--- a/src/devices/bus/msx_cart/hfox.cpp
+++ b/src/devices/bus/msx_cart/hfox.cpp
@@ -7,7 +7,7 @@
const device_type MSX_CART_HFOX = &device_creator<msx_cart_hfox>;
-msx_cart_hfox::msx_cart_hfox(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_hfox::msx_cart_hfox(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_HFOX, "MSX Cartridge - Harry Fox", tag, owner, clock, "msx_cart_hfox", __FILE__)
, msx_cart_interface(mconfig, *this)
{
diff --git a/src/devices/bus/msx_cart/hfox.h b/src/devices/bus/msx_cart/hfox.h
index c51bd77cd2f..7e58a07b10f 100644
--- a/src/devices/bus/msx_cart/hfox.h
+++ b/src/devices/bus/msx_cart/hfox.h
@@ -13,7 +13,7 @@ class msx_cart_hfox : public device_t
, public msx_cart_interface
{
public:
- msx_cart_hfox(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_hfox(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -27,8 +27,8 @@ public:
void restore_banks();
private:
- UINT8 m_selected_bank[2];
- UINT8 *m_bank_base[2];
+ uint8_t m_selected_bank[2];
+ uint8_t *m_bank_base[2];
};
diff --git a/src/devices/bus/msx_cart/holy_quran.cpp b/src/devices/bus/msx_cart/holy_quran.cpp
index 7671e8624de..3c5ae04dc0c 100644
--- a/src/devices/bus/msx_cart/holy_quran.cpp
+++ b/src/devices/bus/msx_cart/holy_quran.cpp
@@ -7,7 +7,7 @@
const device_type MSX_CART_HOLY_QURAN = &device_creator<msx_cart_holy_quran>;
-msx_cart_holy_quran::msx_cart_holy_quran(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_holy_quran::msx_cart_holy_quran(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_HOLY_QURAN, "MSX Cartridge - Holy Quran", tag, owner, clock, "msx_cart_holy_quran", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_decrypt(false)
@@ -72,7 +72,7 @@ READ8_MEMBER(msx_cart_holy_quran::read_cart)
{
if (offset >= 0x4000 && offset < 0xc000)
{
- UINT8 data = m_bank_base[(offset - 0x4000) >> 13][offset & 0x1fff];
+ uint8_t data = m_bank_base[(offset - 0x4000) >> 13][offset & 0x1fff];
if (m_decrypt)
{
diff --git a/src/devices/bus/msx_cart/holy_quran.h b/src/devices/bus/msx_cart/holy_quran.h
index 00ae6bc92f4..0b2bd1a06f8 100644
--- a/src/devices/bus/msx_cart/holy_quran.h
+++ b/src/devices/bus/msx_cart/holy_quran.h
@@ -13,7 +13,7 @@ class msx_cart_holy_quran : public device_t
, public msx_cart_interface
{
public:
- msx_cart_holy_quran(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_holy_quran(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -27,9 +27,9 @@ public:
void restore_banks();
private:
- UINT8 m_lookup_prot[256];
- UINT8 m_selected_bank[4];
- UINT8 *m_bank_base[4];
+ uint8_t m_lookup_prot[256];
+ uint8_t m_selected_bank[4];
+ uint8_t *m_bank_base[4];
bool m_decrypt;
};
diff --git a/src/devices/bus/msx_cart/konami.cpp b/src/devices/bus/msx_cart/konami.cpp
index 659fdf054ea..f30685bf01f 100644
--- a/src/devices/bus/msx_cart/konami.cpp
+++ b/src/devices/bus/msx_cart/konami.cpp
@@ -13,7 +13,7 @@ const device_type MSX_CART_SOUND_SDSNATCHER = &device_creator<msx_cart_konami_so
const device_type MSX_CART_KEYBOARD_MASTER = &device_creator<msx_cart_keyboard_master>;
-msx_cart_konami::msx_cart_konami(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_konami::msx_cart_konami(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_KONAMI, "MSX Cartridge - KONAMI", tag, owner, clock, "msx_cart_konami", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
@@ -61,14 +61,14 @@ void msx_cart_konami::device_reset()
void msx_cart_konami::initialize_cartridge()
{
- UINT32 size = get_rom_size();
+ uint32_t size = get_rom_size();
if ( get_rom_size() > 256 * 0x2000 )
{
fatalerror("konami: ROM is too big\n");
}
- UINT16 banks = size / 0x2000;
+ uint16_t banks = size / 0x2000;
if (size != banks * 0x2000 || (~(banks - 1) % banks))
{
@@ -120,7 +120,7 @@ WRITE8_MEMBER(msx_cart_konami::write_cart)
-msx_cart_konami_scc::msx_cart_konami_scc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_konami_scc::msx_cart_konami_scc(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_KONAMI_SCC, "MSX Cartridge - KONAMI+SCC", tag, owner, clock, "msx_cart_konami_scc", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_k051649(*this, "k051649")
@@ -186,14 +186,14 @@ void msx_cart_konami_scc::device_reset()
void msx_cart_konami_scc::initialize_cartridge()
{
- UINT32 size = get_rom_size();
+ uint32_t size = get_rom_size();
if ( get_rom_size() > 256 * 0x2000 )
{
fatalerror("konami_scc: ROM is too big\n");
}
- UINT16 banks = size / 0x2000;
+ uint16_t banks = size / 0x2000;
if (size != banks * 0x2000 || (~(banks - 1) % banks))
{
@@ -296,7 +296,7 @@ WRITE8_MEMBER(msx_cart_konami_scc::write_cart)
-msx_cart_gamemaster2::msx_cart_gamemaster2(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_gamemaster2::msx_cart_gamemaster2(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_GAMEMASTER2, "MSX Cartridge - GAMEMASTER2", tag, owner, clock, "msx_cart_gamemaster2", __FILE__)
, msx_cart_interface(mconfig, *this)
{
@@ -319,7 +319,7 @@ void msx_cart_gamemaster2::device_start()
}
-void msx_cart_gamemaster2::setup_bank(UINT8 bank)
+void msx_cart_gamemaster2::setup_bank(uint8_t bank)
{
switch (bank)
{
@@ -402,7 +402,7 @@ void msx_cart_gamemaster2::initialize_cartridge()
READ8_MEMBER(msx_cart_gamemaster2::read_cart)
{
- UINT8 bank = offset >> 13;
+ uint8_t bank = offset >> 13;
switch (bank)
{
@@ -466,7 +466,7 @@ WRITE8_MEMBER(msx_cart_gamemaster2::write_cart)
-msx_cart_synthesizer::msx_cart_synthesizer(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_synthesizer::msx_cart_synthesizer(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_SYNTHESIZER, "MSX Cartridge - Synthesizer", tag, owner, clock, "msx_cart_synthesizer", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_base(nullptr)
@@ -527,7 +527,7 @@ WRITE8_MEMBER(msx_cart_synthesizer::write_cart)
-msx_cart_konami_sound::msx_cart_konami_sound(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+msx_cart_konami_sound::msx_cart_konami_sound(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
, msx_cart_interface(mconfig, *this)
, m_k052539(*this, "k052539")
@@ -588,7 +588,7 @@ void msx_cart_konami_sound::restore_banks()
}
-void msx_cart_konami_sound::setup_bank(UINT8 bank)
+void msx_cart_konami_sound::setup_bank(uint8_t bank)
{
switch (bank)
{
@@ -671,7 +671,7 @@ READ8_MEMBER(msx_cart_konami_sound::read_cart)
return 0xff;
}
- UINT8 *base = m_bank_base[offset >> 13];
+ uint8_t *base = m_bank_base[offset >> 13];
if (base != nullptr)
{
@@ -823,7 +823,7 @@ WRITE8_MEMBER(msx_cart_konami_sound::write_cart)
}
-msx_cart_konami_sound_snatcher::msx_cart_konami_sound_snatcher(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_konami_sound_snatcher::msx_cart_konami_sound_snatcher(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_cart_konami_sound(mconfig, MSX_CART_SOUND_SNATCHER, "MSX Cartridge - Sound Snatcher", tag, owner, clock, "msx_cart_sound_snatcher", __FILE__)
{
}
@@ -847,7 +847,7 @@ void msx_cart_konami_sound_snatcher::initialize_cartridge()
}
-msx_cart_konami_sound_sdsnatcher::msx_cart_konami_sound_sdsnatcher(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_konami_sound_sdsnatcher::msx_cart_konami_sound_sdsnatcher(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_cart_konami_sound(mconfig, MSX_CART_SOUND_SDSNATCHER, "MSX Cartridge - Sound SD Snatcher", tag, owner, clock, "msx_cart_sound_sdsnatcher", __FILE__)
{
}
@@ -873,7 +873,7 @@ void msx_cart_konami_sound_sdsnatcher::initialize_cartridge()
-msx_cart_keyboard_master::msx_cart_keyboard_master(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_keyboard_master::msx_cart_keyboard_master(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_KEYBOARD_MASTER, "MSX Cartridge - Keyboard Master", tag, owner, clock, "msx_cart_keyboard_master", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_vlm5030(*this, "vlm5030")
diff --git a/src/devices/bus/msx_cart/konami.h b/src/devices/bus/msx_cart/konami.h
index f42057692b6..74400582420 100644
--- a/src/devices/bus/msx_cart/konami.h
+++ b/src/devices/bus/msx_cart/konami.h
@@ -22,7 +22,7 @@ class msx_cart_konami : public device_t
, public msx_cart_interface
{
public:
- msx_cart_konami(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_konami(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -36,9 +36,9 @@ public:
void restore_banks();
private:
- UINT8 m_bank_mask;
- UINT8 m_selected_bank[4];
- UINT8 *m_bank_base[8];
+ uint8_t m_bank_mask;
+ uint8_t m_selected_bank[4];
+ uint8_t *m_bank_base[8];
};
@@ -46,7 +46,7 @@ class msx_cart_konami_scc : public device_t
, public msx_cart_interface
{
public:
- msx_cart_konami_scc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_konami_scc(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -63,9 +63,9 @@ public:
private:
required_device<k051649_device> m_k051649;
- UINT8 m_bank_mask;
- UINT8 m_selected_bank[4];
- UINT8 *m_bank_base[8];
+ uint8_t m_bank_mask;
+ uint8_t m_selected_bank[4];
+ uint8_t *m_bank_base[8];
bool m_scc_active;
};
@@ -74,7 +74,7 @@ class msx_cart_gamemaster2 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_gamemaster2(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_gamemaster2(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -88,10 +88,10 @@ public:
void restore_banks();
private:
- UINT8 m_selected_bank[3];
- UINT8 *m_bank_base[8];
+ uint8_t m_selected_bank[3];
+ uint8_t *m_bank_base[8];
- void setup_bank(UINT8 bank);
+ void setup_bank(uint8_t bank);
};
@@ -99,7 +99,7 @@ class msx_cart_synthesizer : public device_t
, public msx_cart_interface
{
public:
- msx_cart_synthesizer(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_synthesizer(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -111,7 +111,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_cart) override;
private:
- UINT8 *m_bank_base;
+ uint8_t *m_bank_base;
required_device<dac_byte_interface> m_dac;
};
@@ -120,7 +120,7 @@ class msx_cart_konami_sound : public device_t
, public msx_cart_interface
{
public:
- msx_cart_konami_sound(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ msx_cart_konami_sound(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -135,27 +135,27 @@ public:
void restore_banks();
protected:
- UINT8 *m_ram_bank[16];
+ uint8_t *m_ram_bank[16];
private:
// This is actually a K052539
required_device<k051649_device> m_k052539;
- UINT8 m_selected_bank[4];
- UINT8 *m_bank_base[8];
+ uint8_t m_selected_bank[4];
+ uint8_t *m_bank_base[8];
bool m_scc_active;
bool m_sccplus_active;
bool m_ram_enabled[4];
- UINT8 m_scc_mode;
+ uint8_t m_scc_mode;
- void setup_bank(UINT8 bank);
+ void setup_bank(uint8_t bank);
};
class msx_cart_konami_sound_snatcher : public msx_cart_konami_sound
{
public:
- msx_cart_konami_sound_snatcher(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_konami_sound_snatcher(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void initialize_cartridge() override;
};
@@ -164,7 +164,7 @@ public:
class msx_cart_konami_sound_sdsnatcher : public msx_cart_konami_sound
{
public:
- msx_cart_konami_sound_sdsnatcher(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_konami_sound_sdsnatcher(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void initialize_cartridge() override;
};
@@ -175,7 +175,7 @@ class msx_cart_keyboard_master : public device_t
, public msx_cart_interface
{
public:
- msx_cart_keyboard_master(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_keyboard_master(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/msx_cart/korean.cpp b/src/devices/bus/msx_cart/korean.cpp
index f1dedeb9874..7f97f4bb49f 100644
--- a/src/devices/bus/msx_cart/korean.cpp
+++ b/src/devices/bus/msx_cart/korean.cpp
@@ -8,7 +8,7 @@ const device_type MSX_CART_KOREAN_90IN1 = &device_creator<msx_cart_korean_90in1>
const device_type MSX_CART_KOREAN_126IN1 = &device_creator<msx_cart_korean_126in1>;
-msx_cart_korean_80in1::msx_cart_korean_80in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_korean_80in1::msx_cart_korean_80in1(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_KOREAN_80IN1, "MSX Cartridge - Korean 80-in-1", tag, owner, clock, "msx_cart_korean_80in1", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
@@ -29,7 +29,7 @@ void msx_cart_korean_80in1::device_start()
}
-void msx_cart_korean_80in1::setup_bank(UINT8 bank)
+void msx_cart_korean_80in1::setup_bank(uint8_t bank)
{
m_bank_base[bank] = get_rom_base() + ( m_selected_bank[bank] & m_bank_mask ) * 0x2000;
}
@@ -55,14 +55,14 @@ void msx_cart_korean_80in1::device_reset()
void msx_cart_korean_80in1::initialize_cartridge()
{
- UINT32 size = get_rom_size();
+ uint32_t size = get_rom_size();
if ( size > 256 * 0x2000 )
{
fatalerror("korean_80in1: ROM is too big\n");
}
- UINT16 banks = size / 0x2000;
+ uint16_t banks = size / 0x2000;
if (size != banks * 0x2000 || (~(banks - 1) % banks))
{
@@ -90,7 +90,7 @@ WRITE8_MEMBER(msx_cart_korean_80in1::write_cart)
{
if (offset >= 0x4000 && offset < 0x4004)
{
- UINT8 bank = offset & 3;
+ uint8_t bank = offset & 3;
m_selected_bank[bank] = data;
setup_bank(bank);
@@ -101,7 +101,7 @@ WRITE8_MEMBER(msx_cart_korean_80in1::write_cart)
-msx_cart_korean_90in1::msx_cart_korean_90in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_korean_90in1::msx_cart_korean_90in1(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_KOREAN_90IN1, "MSX Cartridge - Korean 90-in-1", tag, owner, clock, "msx_cart_korean_90in1", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
@@ -128,7 +128,7 @@ void msx_cart_korean_90in1::device_start()
void msx_cart_korean_90in1::restore_banks()
{
- UINT8 *base = get_rom_base();
+ uint8_t *base = get_rom_base();
switch (m_selected_bank & 0xc0)
{
@@ -167,14 +167,14 @@ void msx_cart_korean_90in1::device_reset()
void msx_cart_korean_90in1::initialize_cartridge()
{
- UINT32 size = get_rom_size();
+ uint32_t size = get_rom_size();
if ( size > 64 * 0x4000 )
{
fatalerror("korean_90in1: ROM is too big\n");
}
- UINT16 banks = size / 0x4000;
+ uint16_t banks = size / 0x4000;
if (size != banks * 0x4000 || (~(banks - 1) % banks))
{
@@ -208,7 +208,7 @@ WRITE8_MEMBER(msx_cart_korean_90in1::banking)
-msx_cart_korean_126in1::msx_cart_korean_126in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_korean_126in1::msx_cart_korean_126in1(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_KOREAN_126IN1, "MSX Cartridge - Korean 126-in-1", tag, owner, clock, "msx_cart_korean_126in1", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_bank_mask(0)
@@ -229,7 +229,7 @@ void msx_cart_korean_126in1::device_start()
}
-void msx_cart_korean_126in1::setup_bank(UINT8 bank)
+void msx_cart_korean_126in1::setup_bank(uint8_t bank)
{
m_bank_base[bank] = get_rom_base() + ( m_selected_bank[bank] & m_bank_mask ) * 0x4000;
}
@@ -255,14 +255,14 @@ void msx_cart_korean_126in1::device_reset()
void msx_cart_korean_126in1::initialize_cartridge()
{
- UINT32 size = get_rom_size();
+ uint32_t size = get_rom_size();
if ( size > 256 * 0x4000 )
{
fatalerror("korean_126in1: ROM is too big\n");
}
- UINT16 banks = size / 0x4000;
+ uint16_t banks = size / 0x4000;
if (size != banks * 0x4000 || (~(banks - 1) % banks))
{
@@ -290,7 +290,7 @@ WRITE8_MEMBER(msx_cart_korean_126in1::write_cart)
{
if (offset >= 0x4000 && offset < 0x4002)
{
- UINT8 bank = offset & 1;
+ uint8_t bank = offset & 1;
m_selected_bank[bank] = data;
setup_bank(bank);
diff --git a/src/devices/bus/msx_cart/korean.h b/src/devices/bus/msx_cart/korean.h
index 7c332f486c3..9dd19addf15 100644
--- a/src/devices/bus/msx_cart/korean.h
+++ b/src/devices/bus/msx_cart/korean.h
@@ -15,7 +15,7 @@ class msx_cart_korean_80in1 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_korean_80in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_korean_80in1(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -29,11 +29,11 @@ public:
void restore_banks();
private:
- UINT8 m_bank_mask;
- UINT8 m_selected_bank[4];
- UINT8 *m_bank_base[4];
+ uint8_t m_bank_mask;
+ uint8_t m_selected_bank[4];
+ uint8_t *m_bank_base[4];
- void setup_bank(UINT8 bank);
+ void setup_bank(uint8_t bank);
};
@@ -41,7 +41,7 @@ class msx_cart_korean_90in1 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_korean_90in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_korean_90in1(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -56,9 +56,9 @@ public:
void restore_banks();
private:
- UINT8 m_bank_mask;
- UINT8 m_selected_bank;
- UINT8 *m_bank_base[4];
+ uint8_t m_bank_mask;
+ uint8_t m_selected_bank;
+ uint8_t *m_bank_base[4];
};
@@ -66,7 +66,7 @@ class msx_cart_korean_126in1 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_korean_126in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_korean_126in1(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -80,11 +80,11 @@ public:
void restore_banks();
private:
- UINT8 m_bank_mask;
- UINT8 m_selected_bank[2];
- UINT8 *m_bank_base[2];
+ uint8_t m_bank_mask;
+ uint8_t m_selected_bank[2];
+ uint8_t *m_bank_base[2];
- void setup_bank(UINT8 bank);
+ void setup_bank(uint8_t bank);
};
diff --git a/src/devices/bus/msx_cart/majutsushi.cpp b/src/devices/bus/msx_cart/majutsushi.cpp
index 49dc7b25450..d81d79b95ec 100644
--- a/src/devices/bus/msx_cart/majutsushi.cpp
+++ b/src/devices/bus/msx_cart/majutsushi.cpp
@@ -7,7 +7,7 @@
const device_type MSX_CART_MAJUTSUSHI = &device_creator<msx_cart_majutsushi>;
-msx_cart_majutsushi::msx_cart_majutsushi(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_majutsushi::msx_cart_majutsushi(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_MAJUTSUSHI, "MSX Cartridge - Majutsushi", tag, owner, clock, "msx_cart_majutsushi", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_dac(*this, "dac")
diff --git a/src/devices/bus/msx_cart/majutsushi.h b/src/devices/bus/msx_cart/majutsushi.h
index 82a454b785c..94be25040c3 100644
--- a/src/devices/bus/msx_cart/majutsushi.h
+++ b/src/devices/bus/msx_cart/majutsushi.h
@@ -14,7 +14,7 @@ class msx_cart_majutsushi : public device_t
, public msx_cart_interface
{
public:
- msx_cart_majutsushi(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_majutsushi(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -31,8 +31,8 @@ public:
private:
required_device<dac_byte_interface> m_dac;
- UINT8 m_selected_bank[4];
- UINT8 *m_bank_base[8];
+ uint8_t m_selected_bank[4];
+ uint8_t *m_bank_base[8];
};
diff --git a/src/devices/bus/msx_cart/moonsound.cpp b/src/devices/bus/msx_cart/moonsound.cpp
index 1d7371f1a9a..8596bfce530 100644
--- a/src/devices/bus/msx_cart/moonsound.cpp
+++ b/src/devices/bus/msx_cart/moonsound.cpp
@@ -19,7 +19,7 @@ TODO:
const device_type MSX_CART_MOONSOUND = &device_creator<msx_cart_moonsound>;
-msx_cart_moonsound::msx_cart_moonsound(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_moonsound::msx_cart_moonsound(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_MOONSOUND, "MSX Cartridge - MoonSound", tag, owner, clock, "msx_moonsound", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_ymf278b(*this, "ymf278b")
diff --git a/src/devices/bus/msx_cart/moonsound.h b/src/devices/bus/msx_cart/moonsound.h
index 0428534cda0..94adfb6ee6a 100644
--- a/src/devices/bus/msx_cart/moonsound.h
+++ b/src/devices/bus/msx_cart/moonsound.h
@@ -14,7 +14,7 @@ class msx_cart_moonsound : public device_t
, public msx_cart_interface
{
public:
- msx_cart_moonsound(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_moonsound(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/msx_audio.cpp b/src/devices/bus/msx_cart/msx_audio.cpp
index 200194e31e4..aa96a165f89 100644
--- a/src/devices/bus/msx_cart/msx_audio.cpp
+++ b/src/devices/bus/msx_cart/msx_audio.cpp
@@ -70,7 +70,7 @@ const device_type MSX_CART_MSX_AUDIO_NMS1205 = &device_creator<msx_cart_msx_audi
const device_type MSX_CART_MSX_AUDIO_FSCA1 = &device_creator<msx_cart_msx_audio_fsca1>;
-msx_cart_msx_audio_hxmu900::msx_cart_msx_audio_hxmu900(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_msx_audio_hxmu900::msx_cart_msx_audio_hxmu900(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_MSX_AUDIO_HXMU900, "MSX Cartridge - MSX-AUDIO HX-MU900", tag, owner, clock, "msx_audio_hxmu900", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_y8950(*this, "y8950")
@@ -127,7 +127,7 @@ READ8_MEMBER(msx_cart_msx_audio_hxmu900::read_cart)
-msx_cart_msx_audio_nms1205::msx_cart_msx_audio_nms1205(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_msx_audio_nms1205::msx_cart_msx_audio_nms1205(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_MSX_AUDIO_NMS1205, "MSX Cartridge - MSX-AUDIO NMS-1205", tag, owner, clock, "msx_audio_nms1205", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_y8950(*this, "y8950")
@@ -235,7 +235,7 @@ READ8_MEMBER(msx_cart_msx_audio_nms1205::read_cart)
-msx_cart_msx_audio_fsca1::msx_cart_msx_audio_fsca1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_msx_audio_fsca1::msx_cart_msx_audio_fsca1(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_MSX_AUDIO_FSCA1, "MSX Cartridge - MSX-AUDIO FS-CA1", tag, owner, clock, "msx_audio_fsca1", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_y8950(*this, "y8950")
diff --git a/src/devices/bus/msx_cart/msx_audio.h b/src/devices/bus/msx_cart/msx_audio.h
index 7759a1b6908..9de471ce170 100644
--- a/src/devices/bus/msx_cart/msx_audio.h
+++ b/src/devices/bus/msx_cart/msx_audio.h
@@ -18,7 +18,7 @@ class msx_cart_msx_audio_hxmu900 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_msx_audio_hxmu900(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_msx_audio_hxmu900(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -37,7 +37,7 @@ class msx_cart_msx_audio_nms1205 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_msx_audio_nms1205(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_msx_audio_nms1205(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -63,7 +63,7 @@ class msx_cart_msx_audio_fsca1 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_msx_audio_fsca1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_msx_audio_fsca1(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -86,8 +86,8 @@ private:
required_device<y8950_device> m_y8950;
required_ioport m_io_config;
required_memory_region m_region_y8950;
- UINT8 m_7ffe;
- UINT8 m_7fff;
+ uint8_t m_7ffe;
+ uint8_t m_7fff;
};
#endif
diff --git a/src/devices/bus/msx_cart/msx_audio_kb.cpp b/src/devices/bus/msx_cart/msx_audio_kb.cpp
index 23349c383db..2b0fd16f725 100644
--- a/src/devices/bus/msx_cart/msx_audio_kb.cpp
+++ b/src/devices/bus/msx_cart/msx_audio_kb.cpp
@@ -7,7 +7,7 @@
const device_type MSX_AUDIO_KBDC_PORT = &device_creator<msx_audio_kbdc_port_device>;
-msx_audio_kbdc_port_device::msx_audio_kbdc_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_audio_kbdc_port_device::msx_audio_kbdc_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_AUDIO_KBDC_PORT, "MSX Audio keyboard connector port", tag, owner, clock, "msx_audio_kbdc_port", __FILE__),
device_slot_interface(mconfig, *this),
m_keyboard(nullptr)
@@ -48,7 +48,7 @@ class msx_hxmu901 : public device_t
, public msx_audio_kb_port_interface
{
public:
- msx_hxmu901(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ msx_hxmu901(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_AUDIO_KB_HXMU901, "Toshiba HXMU901", tag, owner, clock, "hxmu901", __FILE__)
, msx_audio_kb_port_interface(mconfig, *this)
, m_row(0)
@@ -60,7 +60,7 @@ public:
virtual DECLARE_READ8_MEMBER(read) override
{
- UINT8 result = 0xff;
+ uint8_t result = 0xff;
for (int i = 0; i < 8; i++)
{
@@ -81,7 +81,7 @@ protected:
virtual void device_start() override { }
private:
- UINT8 m_row;
+ uint8_t m_row;
required_ioport_array<8> m_keyboard;
};
@@ -179,7 +179,7 @@ class msx_nms1160 : public device_t
, public msx_audio_kb_port_interface
{
public:
- msx_nms1160(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ msx_nms1160(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_AUDIO_KB_NMS1160, "Philips NMS-1160", tag, owner, clock, "nms1160", __FILE__)
, msx_audio_kb_port_interface(mconfig, *this)
, m_row(0)
@@ -190,7 +190,7 @@ public:
virtual DECLARE_READ8_MEMBER(read) override
{
- UINT8 result = 0xff;
+ uint8_t result = 0xff;
for (int i = 0; i < 8; i++)
{
@@ -212,7 +212,7 @@ protected:
virtual void device_start() override { }
private:
- UINT8 m_row;
+ uint8_t m_row;
required_ioport_array<8> m_keyboard;
};
diff --git a/src/devices/bus/msx_cart/msx_audio_kb.h b/src/devices/bus/msx_cart/msx_audio_kb.h
index 6bdc1fe86fe..8759b9200e8 100644
--- a/src/devices/bus/msx_cart/msx_audio_kb.h
+++ b/src/devices/bus/msx_cart/msx_audio_kb.h
@@ -30,7 +30,7 @@ class msx_audio_kbdc_port_device : public device_t,
{
public:
// construction/destruction
- msx_audio_kbdc_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_audio_kbdc_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/msx_cart/msxdos2.cpp b/src/devices/bus/msx_cart/msxdos2.cpp
index 96f0b99f119..3396ee67221 100644
--- a/src/devices/bus/msx_cart/msxdos2.cpp
+++ b/src/devices/bus/msx_cart/msxdos2.cpp
@@ -6,7 +6,7 @@
const device_type MSX_CART_MSXDOS2 = &device_creator<msx_cart_msxdos2>;
-msx_cart_msxdos2::msx_cart_msxdos2(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_msxdos2::msx_cart_msxdos2(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_MSXDOS2, "MSX Cartridge - MSXDOS2", tag, owner, clock, "msx_cart_msxdos2", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_selected_bank(0)
diff --git a/src/devices/bus/msx_cart/msxdos2.h b/src/devices/bus/msx_cart/msxdos2.h
index a4171b41292..11f2026925b 100644
--- a/src/devices/bus/msx_cart/msxdos2.h
+++ b/src/devices/bus/msx_cart/msxdos2.h
@@ -13,7 +13,7 @@ class msx_cart_msxdos2 : public device_t
, public msx_cart_interface
{
public:
- msx_cart_msxdos2(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_msxdos2(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -27,8 +27,8 @@ public:
void restore_banks();
private:
- UINT8 m_selected_bank;
- UINT8 *m_bank_base;
+ uint8_t m_selected_bank;
+ uint8_t *m_bank_base;
};
diff --git a/src/devices/bus/msx_cart/nomapper.cpp b/src/devices/bus/msx_cart/nomapper.cpp
index 175681e0227..2b9b756e628 100644
--- a/src/devices/bus/msx_cart/nomapper.cpp
+++ b/src/devices/bus/msx_cart/nomapper.cpp
@@ -7,7 +7,7 @@
const device_type MSX_CART_NOMAPPER = &device_creator<msx_cart_nomapper>;
-msx_cart_nomapper::msx_cart_nomapper(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_nomapper::msx_cart_nomapper(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_NOMAPPER, "MSX Cartridge - ROM", tag, owner, clock, "msx_cart_nomapper", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_start_address(0)
@@ -21,8 +21,8 @@ void msx_cart_nomapper::device_start()
void msx_cart_nomapper::initialize_cartridge()
{
- UINT32 size = get_rom_size();
- UINT8 *rom = get_rom_base();
+ uint32_t size = get_rom_size();
+ uint8_t *rom = get_rom_base();
// determine start address
// default to $4000
@@ -33,7 +33,7 @@ void msx_cart_nomapper::initialize_cartridge()
/* 8KB/16KB */
case 0x2000: case 0x4000:
{
- UINT16 start = rom[3] << 8 | rom[2];
+ uint16_t start = rom[3] << 8 | rom[2];
// start address of $0000: call address in the $4000 region: $4000, else $8000
if (start == 0)
@@ -56,7 +56,7 @@ void msx_cart_nomapper::initialize_cartridge()
// take default, check when no "AB" at $0000, but "AB" at $4000
if (rom[0] != 'A' && rom[1] != 'B' && rom[0x4000] == 'A' && rom[0x4001] == 'B')
{
- UINT16 start = rom[0x4003] << 8 | rom[0x4002];
+ uint16_t start = rom[0x4003] << 8 | rom[0x4002];
// start address of $0000 and call address in the $4000 region, or start address outside the $8000 region: $0000, else default
if ((start == 0 && (rom[0x4005] & 0xc0) == 0x40) || start < 0x8000 || start >= 0xc000)
@@ -81,7 +81,7 @@ void msx_cart_nomapper::initialize_cartridge()
break;
}
- m_end_address = std::min<UINT32>(m_start_address + size, 0x10000);
+ m_end_address = std::min<uint32_t>(m_start_address + size, 0x10000);
}
READ8_MEMBER(msx_cart_nomapper::read_cart)
diff --git a/src/devices/bus/msx_cart/nomapper.h b/src/devices/bus/msx_cart/nomapper.h
index f81c7bcdd50..9a47a2f6e30 100644
--- a/src/devices/bus/msx_cart/nomapper.h
+++ b/src/devices/bus/msx_cart/nomapper.h
@@ -13,7 +13,7 @@ class msx_cart_nomapper : public device_t
, public msx_cart_interface
{
public:
- msx_cart_nomapper(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_nomapper(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -23,8 +23,8 @@ public:
virtual DECLARE_READ8_MEMBER(read_cart) override;
private:
- UINT32 m_start_address;
- UINT32 m_end_address;
+ uint32_t m_start_address;
+ uint32_t m_end_address;
};
#endif
diff --git a/src/devices/bus/msx_cart/rtype.cpp b/src/devices/bus/msx_cart/rtype.cpp
index ffe7d56cfba..d45dbac407b 100644
--- a/src/devices/bus/msx_cart/rtype.cpp
+++ b/src/devices/bus/msx_cart/rtype.cpp
@@ -6,7 +6,7 @@
const device_type MSX_CART_RTYPE = &device_creator<msx_cart_rtype>;
-msx_cart_rtype::msx_cart_rtype(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_rtype::msx_cart_rtype(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_RTYPE, "MSX Cartridge - R-Type", tag, owner, clock, "msx_cart_rtype", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_selected_bank(0)
diff --git a/src/devices/bus/msx_cart/rtype.h b/src/devices/bus/msx_cart/rtype.h
index 811ccc5ad27..c89570f4cac 100644
--- a/src/devices/bus/msx_cart/rtype.h
+++ b/src/devices/bus/msx_cart/rtype.h
@@ -13,7 +13,7 @@ class msx_cart_rtype : public device_t
, public msx_cart_interface
{
public:
- msx_cart_rtype(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_rtype(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -27,8 +27,8 @@ public:
void restore_banks();
private:
- UINT8 m_selected_bank;
- UINT8 *m_bank_base[2];
+ uint8_t m_selected_bank;
+ uint8_t *m_bank_base[2];
};
diff --git a/src/devices/bus/msx_cart/super_swangi.cpp b/src/devices/bus/msx_cart/super_swangi.cpp
index 65e4992afe3..c020e1f311f 100644
--- a/src/devices/bus/msx_cart/super_swangi.cpp
+++ b/src/devices/bus/msx_cart/super_swangi.cpp
@@ -7,7 +7,7 @@
const device_type MSX_CART_SUPER_SWANGI = &device_creator<msx_cart_super_swangi>;
-msx_cart_super_swangi::msx_cart_super_swangi(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_super_swangi::msx_cart_super_swangi(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_SUPER_SWANGI, "MSX Cartridge - Super Swangi", tag, owner, clock, "msx_cart_super_swangi", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_selected_bank(0)
diff --git a/src/devices/bus/msx_cart/super_swangi.h b/src/devices/bus/msx_cart/super_swangi.h
index 19241869877..09619437379 100644
--- a/src/devices/bus/msx_cart/super_swangi.h
+++ b/src/devices/bus/msx_cart/super_swangi.h
@@ -13,7 +13,7 @@ class msx_cart_super_swangi : public device_t
, public msx_cart_interface
{
public:
- msx_cart_super_swangi(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_super_swangi(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -27,8 +27,8 @@ public:
void restore_banks();
private:
- UINT8 m_selected_bank;
- UINT8 *m_bank_base[2];
+ uint8_t m_selected_bank;
+ uint8_t *m_bank_base[2];
};
diff --git a/src/devices/bus/msx_cart/superloderunner.cpp b/src/devices/bus/msx_cart/superloderunner.cpp
index f71a109a83b..c738d19ebbb 100644
--- a/src/devices/bus/msx_cart/superloderunner.cpp
+++ b/src/devices/bus/msx_cart/superloderunner.cpp
@@ -6,7 +6,7 @@
const device_type MSX_CART_SUPERLODERUNNER = &device_creator<msx_cart_superloderunner>;
-msx_cart_superloderunner::msx_cart_superloderunner(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_superloderunner::msx_cart_superloderunner(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_CART_SUPERLODERUNNER, "MSX Cartridge - Super Lode Runner", tag, owner, clock, "msx_cart_superloderunner", __FILE__)
, msx_cart_interface(mconfig, *this)
, m_selected_bank(0)
diff --git a/src/devices/bus/msx_cart/superloderunner.h b/src/devices/bus/msx_cart/superloderunner.h
index 22b1e47e368..9ca4e49bcd8 100644
--- a/src/devices/bus/msx_cart/superloderunner.h
+++ b/src/devices/bus/msx_cart/superloderunner.h
@@ -13,7 +13,7 @@ class msx_cart_superloderunner : public device_t
, public msx_cart_interface
{
public:
- msx_cart_superloderunner(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_superloderunner(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -27,8 +27,8 @@ public:
void restore_banks();
private:
- UINT8 m_selected_bank;
- UINT8 *m_bank_base;
+ uint8_t m_selected_bank;
+ uint8_t *m_bank_base;
};
diff --git a/src/devices/bus/msx_cart/yamaha.cpp b/src/devices/bus/msx_cart/yamaha.cpp
index cec5bdd673b..b5841580917 100644
--- a/src/devices/bus/msx_cart/yamaha.cpp
+++ b/src/devices/bus/msx_cart/yamaha.cpp
@@ -18,7 +18,7 @@ const device_type MSX_CART_SFG01 = &device_creator<msx_cart_sfg01>;
const device_type MSX_CART_SFG05 = &device_creator<msx_cart_sfg05>;
-msx_cart_sfg::msx_cart_sfg(const machine_config &mconfig, const device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
+msx_cart_sfg::msx_cart_sfg(const machine_config &mconfig, const device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
, msx_cart_interface(mconfig, *this)
, m_region_sfg(*this, "sfg")
@@ -32,13 +32,13 @@ msx_cart_sfg::msx_cart_sfg(const machine_config &mconfig, const device_type type
}
-msx_cart_sfg01::msx_cart_sfg01(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_sfg01::msx_cart_sfg01(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_cart_sfg(mconfig, MSX_CART_SFG01, "MSX Cartridge - SFG01", tag, owner, clock, "msx_cart_sfg01")
{
}
-msx_cart_sfg05::msx_cart_sfg05(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_cart_sfg05::msx_cart_sfg05(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_cart_sfg(mconfig, MSX_CART_SFG05, "MSX Cartridge - SFG05", tag, owner, clock, "msx_cart_sfg05")
{
}
diff --git a/src/devices/bus/msx_cart/yamaha.h b/src/devices/bus/msx_cart/yamaha.h
index f8897cc45be..60462dd7015 100644
--- a/src/devices/bus/msx_cart/yamaha.h
+++ b/src/devices/bus/msx_cart/yamaha.h
@@ -17,7 +17,7 @@ class msx_cart_sfg : public device_t
, public msx_cart_interface
{
public:
- msx_cart_sfg(const machine_config &mconfig, const device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+ msx_cart_sfg(const machine_config &mconfig, const device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -38,7 +38,7 @@ private:
required_device<ym2148_device> m_ym2148;
int m_ym2151_irq_state;
int m_ym2148_irq_state;
- UINT32 m_rom_mask;
+ uint32_t m_rom_mask;
void check_irq();
};
@@ -47,7 +47,7 @@ private:
class msx_cart_sfg01 : public msx_cart_sfg
{
public:
- msx_cart_sfg01(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_sfg01(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
@@ -56,7 +56,7 @@ public:
class msx_cart_sfg05 : public msx_cart_sfg
{
public:
- msx_cart_sfg05(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_sfg05(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
diff --git a/src/devices/bus/msx_slot/bunsetsu.cpp b/src/devices/bus/msx_slot/bunsetsu.cpp
index 0c5921cf677..ce144821213 100644
--- a/src/devices/bus/msx_slot/bunsetsu.cpp
+++ b/src/devices/bus/msx_slot/bunsetsu.cpp
@@ -11,7 +11,7 @@
const device_type MSX_SLOT_BUNSETSU = &device_creator<msx_slot_bunsetsu_device>;
-msx_slot_bunsetsu_device::msx_slot_bunsetsu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_bunsetsu_device::msx_slot_bunsetsu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_slot_rom_device(mconfig, MSX_SLOT_BUNSETSU, "MSX Internal BUNSETSU", tag, owner, clock, "msx_slot_bunsetsu", __FILE__)
, m_bunsetsu_region(*this, finder_base::DUMMY_TAG, 0x20000)
, m_bunsetsu_address(0)
diff --git a/src/devices/bus/msx_slot/bunsetsu.h b/src/devices/bus/msx_slot/bunsetsu.h
index 90e1cbd5bf5..eff00928a83 100644
--- a/src/devices/bus/msx_slot/bunsetsu.h
+++ b/src/devices/bus/msx_slot/bunsetsu.h
@@ -17,7 +17,7 @@ extern const device_type MSX_SLOT_BUNSETSU;
class msx_slot_bunsetsu_device : public msx_slot_rom_device
{
public:
- msx_slot_bunsetsu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_bunsetsu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// static configuration helpers
static void set_bunsetsu_region_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_bunsetsu_device &>(device).m_bunsetsu_region.set_tag(tag); }
@@ -28,8 +28,8 @@ public:
virtual DECLARE_WRITE8_MEMBER(write) override;
private:
- required_region_ptr<UINT8> m_bunsetsu_region;
- UINT32 m_bunsetsu_address;
+ required_region_ptr<uint8_t> m_bunsetsu_region;
+ uint32_t m_bunsetsu_address;
};
diff --git a/src/devices/bus/msx_slot/cartridge.cpp b/src/devices/bus/msx_slot/cartridge.cpp
index 104f82b6bd5..d7742676d1d 100644
--- a/src/devices/bus/msx_slot/cartridge.cpp
+++ b/src/devices/bus/msx_slot/cartridge.cpp
@@ -33,7 +33,7 @@ const device_type MSX_SLOT_CARTRIDGE = &device_creator<msx_slot_cartridge_device
const device_type MSX_SLOT_YAMAHA_EXPANSION = &device_creator<msx_slot_yamaha_expansion_device>;
-msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_SLOT_CARTRIDGE, "MSX Cartridge slot", tag, owner, clock, "msx_slot_cartridge", __FILE__)
, device_image_interface(mconfig, *this)
, device_slot_interface(mconfig, *this)
@@ -44,7 +44,7 @@ msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconf
}
-msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+msx_slot_cartridge_device::msx_slot_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
, device_image_interface(mconfig, *this)
, device_slot_interface(mconfig, *this)
@@ -108,14 +108,14 @@ image_init_result msx_slot_cartridge_device::call_load()
{
if ( software_entry() )
{
- UINT32 length;
+ uint32_t length;
// Allocate and copy rom contents
length = get_software_region_length("rom");
m_cartridge->rom_alloc( length );
if (length > 0)
{
- UINT8 *rom_base = m_cartridge->get_rom_base();
+ uint8_t *rom_base = m_cartridge->get_rom_base();
memcpy(rom_base, get_software_region("rom"), length);
}
@@ -124,7 +124,7 @@ image_init_result msx_slot_cartridge_device::call_load()
m_cartridge->rom_vlm5030_alloc(length);
if (length > 0)
{
- UINT8 *rom_base = m_cartridge->get_rom_vlm5030_base();
+ uint8_t *rom_base = m_cartridge->get_rom_vlm5030_base();
memcpy(rom_base, get_software_region("vlm5030"), length);
}
@@ -138,10 +138,10 @@ image_init_result msx_slot_cartridge_device::call_load()
}
else
{
- UINT32 length = this->length();
+ uint32_t length = this->length();
// determine how much space to allocate
- UINT32 length_aligned = 0x10000;
+ uint32_t length_aligned = 0x10000;
if (length <= 0x2000)
length_aligned = 0x2000;
@@ -204,7 +204,7 @@ WRITE_LINE_MEMBER(msx_slot_cartridge_device::irq_out)
}
-int msx_slot_cartridge_device::get_cart_type(UINT8 *rom, UINT32 length)
+int msx_slot_cartridge_device::get_cart_type(uint8_t *rom, uint32_t length)
{
if (length < 0x2000)
{
@@ -276,8 +276,8 @@ std::string msx_slot_cartridge_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string = "nomapper";
- UINT32 length = m_file->size();
- std::vector<UINT8> rom(length);
+ uint32_t length = m_file->size();
+ std::vector<uint8_t> rom(length);
int type = NOMAPPER;
// Check if there's some mapper related information in the hashfiles
@@ -357,7 +357,7 @@ WRITE8_MEMBER(msx_slot_cartridge_device::write)
-msx_slot_yamaha_expansion_device::msx_slot_yamaha_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_yamaha_expansion_device::msx_slot_yamaha_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_slot_cartridge_device(mconfig, MSX_SLOT_YAMAHA_EXPANSION, "MSX Yamaha Expansion slot", tag, owner, clock, "msx_slot_yamaha_expansion", __FILE__)
{
}
diff --git a/src/devices/bus/msx_slot/cartridge.h b/src/devices/bus/msx_slot/cartridge.h
index 63530699b2b..b554eec833b 100644
--- a/src/devices/bus/msx_slot/cartridge.h
+++ b/src/devices/bus/msx_slot/cartridge.h
@@ -31,8 +31,8 @@ class msx_slot_cartridge_device : public device_t
{
public:
// construction/destruction
- msx_slot_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- msx_slot_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ msx_slot_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// static configuration helpers
template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<msx_slot_cartridge_device &>(device).m_irq_handler.set_callback(object); }
@@ -67,7 +67,7 @@ protected:
devcb_write_line m_irq_handler;
msx_cart_interface *m_cartridge;
- int get_cart_type(UINT8 *rom, UINT32 length);
+ int get_cart_type(uint8_t *rom, uint32_t length);
};
@@ -75,7 +75,7 @@ class msx_slot_yamaha_expansion_device : public msx_slot_cartridge_device
{
public:
// construction/destruction
- msx_slot_yamaha_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_yamaha_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void device_start() override;
virtual void device_config_complete() override { update_names(MSX_SLOT_YAMAHA_EXPANSION, "cartridge60pin", "cart60p"); }
diff --git a/src/devices/bus/msx_slot/disk.cpp b/src/devices/bus/msx_slot/disk.cpp
index ea4313f6ac5..f2110a16791 100644
--- a/src/devices/bus/msx_slot/disk.cpp
+++ b/src/devices/bus/msx_slot/disk.cpp
@@ -43,7 +43,7 @@ const device_type MSX_SLOT_DISK5 = &device_creator<msx_slot_disk5_device>;
const device_type MSX_SLOT_DISK6 = &device_creator<msx_slot_disk6_device>;
-msx_slot_disk_device::msx_slot_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+msx_slot_disk_device::msx_slot_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: msx_slot_rom_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_floppy0(nullptr)
, m_floppy1(nullptr)
@@ -80,7 +80,7 @@ void msx_slot_disk_device::device_start()
}
-msx_slot_wd_disk_device::msx_slot_wd_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+msx_slot_wd_disk_device::msx_slot_wd_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: msx_slot_disk_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_fdc(nullptr)
{
@@ -100,7 +100,7 @@ void msx_slot_wd_disk_device::device_start()
}
-msx_slot_tc8566_disk_device::msx_slot_tc8566_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+msx_slot_tc8566_disk_device::msx_slot_tc8566_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: msx_slot_disk_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_fdc(nullptr)
{
@@ -121,7 +121,7 @@ void msx_slot_tc8566_disk_device::device_start()
-msx_slot_disk1_device::msx_slot_disk1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_disk1_device::msx_slot_disk1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_slot_wd_disk_device(mconfig, MSX_SLOT_DISK1, "MSX Internal floppy type 1", tag, owner, clock, "msx_slot_disk1", __FILE__)
, m_side_control(0)
, m_control(0)
@@ -148,7 +148,7 @@ void msx_slot_disk1_device::device_reset()
void msx_slot_disk1_device::post_load()
{
- UINT8 data = m_control;
+ uint8_t data = m_control;
// To make sure the FDD busy led status gets set correctly
m_control ^= 0x40;
@@ -157,7 +157,7 @@ void msx_slot_disk1_device::post_load()
}
-void msx_slot_disk1_device::set_side_control(UINT8 data)
+void msx_slot_disk1_device::set_side_control(uint8_t data)
{
m_side_control = data;
@@ -168,9 +168,9 @@ void msx_slot_disk1_device::set_side_control(UINT8 data)
}
-void msx_slot_disk1_device::set_control(UINT8 data)
+void msx_slot_disk1_device::set_control(uint8_t data)
{
- UINT8 old_m_control = m_control;
+ uint8_t old_m_control = m_control;
m_control = data;
@@ -284,7 +284,7 @@ WRITE8_MEMBER(msx_slot_disk1_device::write)
}
-msx_slot_disk2_device::msx_slot_disk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_disk2_device::msx_slot_disk2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_slot_wd_disk_device(mconfig, MSX_SLOT_DISK2, "MSX Internal floppy type 2", tag, owner, clock, "msx_slot_disk2", __FILE__)
, m_control(0)
{
@@ -309,7 +309,7 @@ void msx_slot_disk2_device::device_reset()
void msx_slot_disk2_device::post_load()
{
- UINT8 data = m_control;
+ uint8_t data = m_control;
// To make sure the FDD busy led status gets set correctly
m_control ^= 0x40;
@@ -318,9 +318,9 @@ void msx_slot_disk2_device::post_load()
}
-void msx_slot_disk2_device::set_control(UINT8 data)
+void msx_slot_disk2_device::set_control(uint8_t data)
{
- UINT8 old_m_control = m_control;
+ uint8_t old_m_control = m_control;
m_control = data;
@@ -423,7 +423,7 @@ WRITE8_MEMBER(msx_slot_disk2_device::write)
-msx_slot_disk3_device::msx_slot_disk3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_disk3_device::msx_slot_disk3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_slot_tc8566_disk_device(mconfig, MSX_SLOT_DISK3, "MSX Internal floppy type 3", tag, owner, clock, "msx_slot_disk3", __FILE__)
{
}
@@ -469,7 +469,7 @@ READ8_MEMBER(msx_slot_disk3_device::read)
-msx_slot_disk4_device::msx_slot_disk4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_disk4_device::msx_slot_disk4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_slot_tc8566_disk_device(mconfig, MSX_SLOT_DISK4, "MSX Internal floppy type 4", tag, owner, clock, "msx_slot_disk4", __FILE__)
{
}
@@ -521,7 +521,7 @@ READ8_MEMBER(msx_slot_disk4_device::read)
-msx_slot_disk5_device::msx_slot_disk5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_disk5_device::msx_slot_disk5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_slot_wd_disk_device(mconfig, MSX_SLOT_DISK5, "MSX Internal floppy type 5", tag, owner, clock, "msx_slot_disk5", __FILE__)
, m_control(0)
{
@@ -555,7 +555,7 @@ void msx_slot_disk5_device::post_load()
}
-void msx_slot_disk5_device::set_control(UINT8 control)
+void msx_slot_disk5_device::set_control(uint8_t control)
{
m_control = control;
@@ -644,7 +644,7 @@ WRITE8_MEMBER(msx_slot_disk5_device::io_write)
-msx_slot_disk6_device::msx_slot_disk6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_disk6_device::msx_slot_disk6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_slot_wd_disk_device(mconfig, MSX_SLOT_DISK6, "MSX Internal floppy type 6", tag, owner, clock, "msx_slot_disk6", __FILE__)
, m_side_motor(0)
, m_drive_select0(0)
diff --git a/src/devices/bus/msx_slot/disk.h b/src/devices/bus/msx_slot/disk.h
index d5ce0982f82..11dee498884 100644
--- a/src/devices/bus/msx_slot/disk.h
+++ b/src/devices/bus/msx_slot/disk.h
@@ -73,7 +73,7 @@ extern const device_type MSX_SLOT_DISK6;
class msx_slot_disk_device : public msx_slot_rom_device
{
public:
- msx_slot_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ msx_slot_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual void device_start() override;
@@ -102,7 +102,7 @@ protected:
class msx_slot_wd_disk_device : public msx_slot_disk_device
{
public:
- msx_slot_wd_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ msx_slot_wd_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual void device_start() override;
@@ -114,7 +114,7 @@ protected:
class msx_slot_tc8566_disk_device : public msx_slot_disk_device
{
public:
- msx_slot_tc8566_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ msx_slot_tc8566_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual void device_start() override;
@@ -126,7 +126,7 @@ protected:
class msx_slot_disk1_device : public msx_slot_wd_disk_device
{
public:
- msx_slot_disk1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_disk1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -137,18 +137,18 @@ public:
void post_load();
private:
- UINT8 m_side_control;
- UINT8 m_control;
+ uint8_t m_side_control;
+ uint8_t m_control;
- void set_control(UINT8 data);
- void set_side_control(UINT8 data);
+ void set_control(uint8_t data);
+ void set_side_control(uint8_t data);
};
class msx_slot_disk2_device : public msx_slot_wd_disk_device
{
public:
- msx_slot_disk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_disk2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -159,16 +159,16 @@ public:
void post_load();
private:
- UINT8 m_control;
+ uint8_t m_control;
- void set_control(UINT8 data);
+ void set_control(uint8_t data);
};
class msx_slot_disk3_device : public msx_slot_tc8566_disk_device
{
public:
- msx_slot_disk3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_disk3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_READ8_MEMBER(read) override;
virtual DECLARE_WRITE8_MEMBER(write) override;
@@ -178,7 +178,7 @@ public:
class msx_slot_disk4_device : public msx_slot_tc8566_disk_device
{
public:
- msx_slot_disk4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_disk4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_READ8_MEMBER(read) override;
virtual DECLARE_WRITE8_MEMBER(write) override;
@@ -188,7 +188,7 @@ public:
class msx_slot_disk5_device : public msx_slot_wd_disk_device
{
public:
- msx_slot_disk5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_disk5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -199,16 +199,16 @@ public:
void post_load();
private:
- UINT8 m_control;
+ uint8_t m_control;
- void set_control(UINT8 control);
+ void set_control(uint8_t control);
};
class msx_slot_disk6_device : public msx_slot_wd_disk_device
{
public:
- msx_slot_disk6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_disk6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -219,9 +219,9 @@ public:
void post_load();
private:
- UINT8 m_side_motor;
- UINT8 m_drive_select0;
- UINT8 m_drive_select1;
+ uint8_t m_side_motor;
+ uint8_t m_drive_select0;
+ uint8_t m_drive_select1;
void set_side_motor();
void select_drive();
diff --git a/src/devices/bus/msx_slot/fs4600.cpp b/src/devices/bus/msx_slot/fs4600.cpp
index 493b6b93f15..0b452695bf5 100644
--- a/src/devices/bus/msx_slot/fs4600.cpp
+++ b/src/devices/bus/msx_slot/fs4600.cpp
@@ -11,7 +11,7 @@
const device_type MSX_SLOT_FS4600 = &device_creator<msx_slot_fs4600_device>;
-msx_slot_fs4600_device::msx_slot_fs4600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_fs4600_device::msx_slot_fs4600_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_SLOT_FS4600, "MSX Internal FS4600 Firmware", tag, owner, clock, "msx_slot_fs4600", __FILE__)
, msx_internal_slot_interface()
, m_nvram(*this, "nvram")
@@ -41,7 +41,7 @@ machine_config_constructor msx_slot_fs4600_device::device_mconfig_additions() co
}
-void msx_slot_fs4600_device::set_rom_start(device_t &device, const char *region, UINT32 offset)
+void msx_slot_fs4600_device::set_rom_start(device_t &device, const char *region, uint32_t offset)
{
msx_slot_fs4600_device &dev = downcast<msx_slot_fs4600_device &>(device);
diff --git a/src/devices/bus/msx_slot/fs4600.h b/src/devices/bus/msx_slot/fs4600.h
index a1b0cdb4792..48f5e142c82 100644
--- a/src/devices/bus/msx_slot/fs4600.h
+++ b/src/devices/bus/msx_slot/fs4600.h
@@ -18,10 +18,10 @@ class msx_slot_fs4600_device : public device_t,
public msx_internal_slot_interface
{
public:
- msx_slot_fs4600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_fs4600_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// static configuration helpers
- static void set_rom_start(device_t &device, const char *region, UINT32 offset);
+ static void set_rom_start(device_t &device, const char *region, uint32_t offset);
virtual void device_start() override;
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -34,13 +34,13 @@ public:
private:
required_device<nvram_device> m_nvram;
required_memory_region m_rom_region;
- UINT32 m_region_offset;
- const UINT8 *m_rom;
- UINT8 m_selected_bank[4];
- const UINT8 *m_bank_base[4];
- UINT32 m_sram_address;
- UINT8 m_sram[0x1000];
- UINT8 m_control;
+ uint32_t m_region_offset;
+ const uint8_t *m_rom;
+ uint8_t m_selected_bank[4];
+ const uint8_t *m_bank_base[4];
+ uint32_t m_sram_address;
+ uint8_t m_sram[0x1000];
+ uint8_t m_control;
};
diff --git a/src/devices/bus/msx_slot/music.cpp b/src/devices/bus/msx_slot/music.cpp
index baa6bdf0175..26173425866 100644
--- a/src/devices/bus/msx_slot/music.cpp
+++ b/src/devices/bus/msx_slot/music.cpp
@@ -7,7 +7,7 @@
const device_type MSX_SLOT_MUSIC = &device_creator<msx_slot_music_device>;
-msx_slot_music_device::msx_slot_music_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_music_device::msx_slot_music_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_slot_rom_device(mconfig, MSX_SLOT_MUSIC, "MSX Internal MSX-MUSIC", tag, owner, clock, "msx_slot_music", __FILE__)
, m_ym2413(nullptr)
, m_ym2413_tag(nullptr)
diff --git a/src/devices/bus/msx_slot/music.h b/src/devices/bus/msx_slot/music.h
index 8e442bc310c..d5587c9068c 100644
--- a/src/devices/bus/msx_slot/music.h
+++ b/src/devices/bus/msx_slot/music.h
@@ -19,7 +19,7 @@ extern const device_type MSX_SLOT_MUSIC;
class msx_slot_music_device : public msx_slot_rom_device
{
public:
- msx_slot_music_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_music_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// static configuration helpers
static void set_ym2413_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_music_device &>(device).m_ym2413_tag = tag; }
diff --git a/src/devices/bus/msx_slot/panasonic08.cpp b/src/devices/bus/msx_slot/panasonic08.cpp
index 70699caed18..ce861c3e7da 100644
--- a/src/devices/bus/msx_slot/panasonic08.cpp
+++ b/src/devices/bus/msx_slot/panasonic08.cpp
@@ -16,7 +16,7 @@ Todo:
const device_type MSX_SLOT_PANASONIC08 = &device_creator<msx_slot_panasonic08_device>;
-msx_slot_panasonic08_device::msx_slot_panasonic08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_panasonic08_device::msx_slot_panasonic08_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_SLOT_PANASONIC08, "MSX Internal Panasonic08", tag, owner, clock, "msx_slot_panasonic08", __FILE__)
, msx_internal_slot_interface()
, m_nvram(*this, "nvram")
@@ -44,7 +44,7 @@ machine_config_constructor msx_slot_panasonic08_device::device_mconfig_additions
}
-void msx_slot_panasonic08_device::set_rom_start(device_t &device, const char *region, UINT32 offset)
+void msx_slot_panasonic08_device::set_rom_start(device_t &device, const char *region, uint32_t offset)
{
msx_slot_panasonic08_device &dev = downcast<msx_slot_panasonic08_device &>(device);
@@ -122,7 +122,7 @@ WRITE8_MEMBER(msx_slot_panasonic08_device::write)
{
if ((offset & 0xc000) == 0x8000 || (offset & 0xc000) == 0x0000)
{
- UINT8 bank = m_selected_bank[offset >> 13];
+ uint8_t bank = m_selected_bank[offset >> 13];
if (bank >= 0x80 && bank < 0x84) // Are these banks were sram is present? Mirroring?
{
logerror("msx_slot_panasonic08: writing %02x to sram %04x, bank = %02x\n", data, offset & 0x1fff, bank);
diff --git a/src/devices/bus/msx_slot/panasonic08.h b/src/devices/bus/msx_slot/panasonic08.h
index b43d5646bba..eb7b058a71c 100644
--- a/src/devices/bus/msx_slot/panasonic08.h
+++ b/src/devices/bus/msx_slot/panasonic08.h
@@ -18,10 +18,10 @@ class msx_slot_panasonic08_device : public device_t,
public msx_internal_slot_interface
{
public:
- msx_slot_panasonic08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_panasonic08_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// static configuration helpers
- static void set_rom_start(device_t &device, const char *region, UINT32 offset);
+ static void set_rom_start(device_t &device, const char *region, uint32_t offset);
virtual void device_start() override;
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -34,12 +34,12 @@ public:
private:
required_device<nvram_device> m_nvram;
required_memory_region m_rom_region;
- UINT32 m_region_offset;
- const UINT8 *m_rom;
- UINT8 m_selected_bank[8];
- const UINT8 *m_bank_base[8];
- UINT8 m_control;
- std::vector<UINT8> m_sram;
+ uint32_t m_region_offset;
+ const uint8_t *m_rom;
+ uint8_t m_selected_bank[8];
+ const uint8_t *m_bank_base[8];
+ uint8_t m_control;
+ std::vector<uint8_t> m_sram;
void map_bank(int bank);
};
diff --git a/src/devices/bus/msx_slot/ram.cpp b/src/devices/bus/msx_slot/ram.cpp
index cb07422358a..85b645b448d 100644
--- a/src/devices/bus/msx_slot/ram.cpp
+++ b/src/devices/bus/msx_slot/ram.cpp
@@ -6,7 +6,7 @@
const device_type MSX_SLOT_RAM = &device_creator<msx_slot_ram_device>;
-msx_slot_ram_device::msx_slot_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_ram_device::msx_slot_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_SLOT_RAM, "MSX Internal RAM", tag, owner, clock, "msx_slot_ram", __FILE__)
, msx_internal_slot_interface()
{
diff --git a/src/devices/bus/msx_slot/ram.h b/src/devices/bus/msx_slot/ram.h
index da9ed2e61b0..7e05bb9d46c 100644
--- a/src/devices/bus/msx_slot/ram.h
+++ b/src/devices/bus/msx_slot/ram.h
@@ -16,9 +16,9 @@ class msx_slot_ram_device : public device_t,
public msx_internal_slot_interface
{
public:
- msx_slot_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- static void force_start_address(device_t &device, UINT16 start) { downcast<msx_slot_ram_device &>(device).m_start_address = start; }
+ static void force_start_address(device_t &device, uint16_t start) { downcast<msx_slot_ram_device &>(device).m_start_address = start; }
virtual void device_start() override;
@@ -26,7 +26,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write) override;
private:
- std::vector<UINT8> m_ram;
+ std::vector<uint8_t> m_ram;
};
diff --git a/src/devices/bus/msx_slot/ram_mm.cpp b/src/devices/bus/msx_slot/ram_mm.cpp
index 4d70fff80bc..86078ca280f 100644
--- a/src/devices/bus/msx_slot/ram_mm.cpp
+++ b/src/devices/bus/msx_slot/ram_mm.cpp
@@ -5,7 +5,7 @@
const device_type MSX_SLOT_RAM_MM = &device_creator<msx_slot_ram_mm_device>;
-msx_slot_ram_mm_device::msx_slot_ram_mm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_ram_mm_device::msx_slot_ram_mm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_SLOT_RAM_MM, "MSX Internal Memory Mapped RAM", tag, owner, clock, "msx_slot_ram_mm", __FILE__)
, msx_internal_slot_interface()
, m_total_size(0)
diff --git a/src/devices/bus/msx_slot/ram_mm.h b/src/devices/bus/msx_slot/ram_mm.h
index b58532c2d57..1350d3c3158 100644
--- a/src/devices/bus/msx_slot/ram_mm.h
+++ b/src/devices/bus/msx_slot/ram_mm.h
@@ -16,10 +16,10 @@ class msx_slot_ram_mm_device : public device_t
, public msx_internal_slot_interface
{
public:
- msx_slot_ram_mm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_ram_mm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- static void set_total_size(device_t &device, UINT32 total_size) { dynamic_cast<msx_slot_ram_mm_device &>(device).m_total_size = total_size; }
- static void set_ramio_set_bits(device_t &device, UINT8 ramio_set_bits) { dynamic_cast<msx_slot_ram_mm_device &>(device).m_ramio_set_bits = ramio_set_bits; }
+ static void set_total_size(device_t &device, uint32_t total_size) { dynamic_cast<msx_slot_ram_mm_device &>(device).m_total_size = total_size; }
+ static void set_ramio_set_bits(device_t &device, uint8_t ramio_set_bits) { dynamic_cast<msx_slot_ram_mm_device &>(device).m_ramio_set_bits = ramio_set_bits; }
virtual void device_start() override;
@@ -32,12 +32,12 @@ public:
void restore_banks();
private:
- std::vector<UINT8> m_ram;
- UINT32 m_total_size;
- UINT8 m_bank_mask;
- UINT8 m_bank_selected[4];
- UINT8 *m_bank_base[4];
- UINT8 m_ramio_set_bits;
+ std::vector<uint8_t> m_ram;
+ uint32_t m_total_size;
+ uint8_t m_bank_mask;
+ uint8_t m_bank_selected[4];
+ uint8_t *m_bank_base[4];
+ uint8_t m_ramio_set_bits;
};
extern const device_type MSX_SLOT_RAM_MM;
diff --git a/src/devices/bus/msx_slot/rom.cpp b/src/devices/bus/msx_slot/rom.cpp
index cad0996a023..85c9930cfc7 100644
--- a/src/devices/bus/msx_slot/rom.cpp
+++ b/src/devices/bus/msx_slot/rom.cpp
@@ -7,13 +7,13 @@
const device_type MSX_SLOT_ROM = &device_creator<msx_slot_rom_device>;
-msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: msx_slot_rom_device(mconfig, MSX_SLOT_ROM, "MSX Internal ROM", tag, owner, clock, "msx_slot_rom", __FILE__)
{
}
-msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
, msx_internal_slot_interface()
, m_rom_region(*this, finder_base::DUMMY_TAG)
@@ -23,7 +23,7 @@ msx_slot_rom_device::msx_slot_rom_device(const machine_config &mconfig, device_t
}
-void msx_slot_rom_device::set_rom_start(device_t &device, const char *region, UINT32 offset)
+void msx_slot_rom_device::set_rom_start(device_t &device, const char *region, uint32_t offset)
{
msx_slot_rom_device &dev = downcast<msx_slot_rom_device &>(device);
diff --git a/src/devices/bus/msx_slot/rom.h b/src/devices/bus/msx_slot/rom.h
index 98679eaa452..09389b80eb4 100644
--- a/src/devices/bus/msx_slot/rom.h
+++ b/src/devices/bus/msx_slot/rom.h
@@ -13,11 +13,11 @@ class msx_slot_rom_device : public device_t,
public msx_internal_slot_interface
{
public:
- msx_slot_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- msx_slot_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ msx_slot_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// static configuration helpers
- static void set_rom_start(device_t &device, const char *region, UINT32 offset);
+ static void set_rom_start(device_t &device, const char *region, uint32_t offset);
virtual void device_start() override;
@@ -25,8 +25,8 @@ public:
private:
required_memory_region m_rom_region;
- UINT32 m_region_offset;
- const UINT8 *m_rom;
+ uint32_t m_region_offset;
+ const uint8_t *m_rom;
};
extern const device_type MSX_SLOT_ROM;
diff --git a/src/devices/bus/msx_slot/slot.cpp b/src/devices/bus/msx_slot/slot.cpp
index db8e8f89ae7..165edba37e0 100644
--- a/src/devices/bus/msx_slot/slot.cpp
+++ b/src/devices/bus/msx_slot/slot.cpp
@@ -20,14 +20,14 @@ msx_internal_slot_interface::msx_internal_slot_interface()
{
}
-void msx_internal_slot_interface::set_start_address(device_t &device, UINT32 start_address)
+void msx_internal_slot_interface::set_start_address(device_t &device, uint32_t start_address)
{
msx_internal_slot_interface &dev = dynamic_cast<msx_internal_slot_interface &>(device);
dev.m_start_address = start_address;
dev.m_end_address = dev.m_start_address + dev.m_size;
}
-void msx_internal_slot_interface::set_size(device_t &device, UINT32 size)
+void msx_internal_slot_interface::set_size(device_t &device, uint32_t size)
{
msx_internal_slot_interface &dev = dynamic_cast<msx_internal_slot_interface &>(device);
diff --git a/src/devices/bus/msx_slot/slot.h b/src/devices/bus/msx_slot/slot.h
index 5208e421a95..b2349fadc30 100644
--- a/src/devices/bus/msx_slot/slot.h
+++ b/src/devices/bus/msx_slot/slot.h
@@ -25,16 +25,16 @@ public:
virtual ~msx_internal_slot_interface() { }
// static configuration helpers
- static void set_start_address(device_t &device, UINT32 start_address);
- static void set_size(device_t &device, UINT32 size);
+ static void set_start_address(device_t &device, uint32_t start_address);
+ static void set_size(device_t &device, uint32_t size);
virtual DECLARE_READ8_MEMBER(read) { return 0xFF; }
virtual DECLARE_WRITE8_MEMBER(write) { }
protected:
- UINT32 m_start_address;
- UINT32 m_size;
- UINT32 m_end_address;
+ uint32_t m_start_address;
+ uint32_t m_size;
+ uint32_t m_end_address;
};
#endif
diff --git a/src/devices/bus/msx_slot/sony08.cpp b/src/devices/bus/msx_slot/sony08.cpp
index eb2f506dd36..61b6b836f13 100644
--- a/src/devices/bus/msx_slot/sony08.cpp
+++ b/src/devices/bus/msx_slot/sony08.cpp
@@ -13,7 +13,7 @@
const device_type MSX_SLOT_SONY08 = &device_creator<msx_slot_sony08_device>;
-msx_slot_sony08_device::msx_slot_sony08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+msx_slot_sony08_device::msx_slot_sony08_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MSX_SLOT_SONY08, "MSX Internal SONY08", tag, owner, clock, "msx_slot_sony08", __FILE__)
, msx_internal_slot_interface()
, m_nvram(*this, "nvram")
@@ -41,7 +41,7 @@ machine_config_constructor msx_slot_sony08_device::device_mconfig_additions() co
}
-void msx_slot_sony08_device::set_rom_start(device_t &device, const char *region, UINT32 offset)
+void msx_slot_sony08_device::set_rom_start(device_t &device, const char *region, uint32_t offset)
{
msx_slot_sony08_device &dev = downcast<msx_slot_sony08_device &>(device);
@@ -122,7 +122,7 @@ READ8_MEMBER(msx_slot_sony08_device::read)
return m_bank_base[6 + ((offset >> 11) & 0x01)][offset & 0x7ff];
}
- const UINT8 *mem = m_bank_base[offset >> 13];
+ const uint8_t *mem = m_bank_base[offset >> 13];
if (mem)
{
diff --git a/src/devices/bus/msx_slot/sony08.h b/src/devices/bus/msx_slot/sony08.h
index 87b10934511..e65c398f082 100644
--- a/src/devices/bus/msx_slot/sony08.h
+++ b/src/devices/bus/msx_slot/sony08.h
@@ -18,10 +18,10 @@ class msx_slot_sony08_device : public device_t,
public msx_internal_slot_interface
{
public:
- msx_slot_sony08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_slot_sony08_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// static configuration helpers
- static void set_rom_start(device_t &device, const char *region, UINT32 offset);
+ static void set_rom_start(device_t &device, const char *region, uint32_t offset);
virtual void device_start() override;
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -34,11 +34,11 @@ public:
private:
required_device<nvram_device> m_nvram;
required_memory_region m_rom_region;
- UINT32 m_region_offset;
- const UINT8 *m_rom;
- UINT8 m_selected_bank[8];
- const UINT8 *m_bank_base[8];
- UINT8 m_sram[0x4000];
+ uint32_t m_region_offset;
+ const uint8_t *m_rom;
+ uint8_t m_selected_bank[8];
+ const uint8_t *m_bank_base[8];
+ uint8_t m_sram[0x4000];
void map_bank(int bank);
};
diff --git a/src/devices/bus/nasbus/avc.cpp b/src/devices/bus/nasbus/avc.cpp
index 8960a19573f..4ed0931150e 100644
--- a/src/devices/bus/nasbus/avc.cpp
+++ b/src/devices/bus/nasbus/avc.cpp
@@ -47,7 +47,7 @@ machine_config_constructor nascom_avc_device::device_mconfig_additions() const
// nascom_avc_device - constructor
//-------------------------------------------------
-nascom_avc_device::nascom_avc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nascom_avc_device::nascom_avc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NASCOM_AVC, "Nascom Advanced Video Card", tag, owner, clock, "nascom_avc", __FILE__),
device_nasbus_card_interface(mconfig, *this),
m_crtc(*this, "mc6845"),
diff --git a/src/devices/bus/nasbus/avc.h b/src/devices/bus/nasbus/avc.h
index 08b43b82d8d..d576a6a6c1d 100644
--- a/src/devices/bus/nasbus/avc.h
+++ b/src/devices/bus/nasbus/avc.h
@@ -26,7 +26,7 @@ class nascom_avc_device : public device_t, public device_nasbus_card_interface
{
public:
// construction/destruction
- nascom_avc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nascom_avc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
MC6845_UPDATE_ROW(crtc_update_row);
DECLARE_WRITE8_MEMBER(control_w);
@@ -43,11 +43,11 @@ private:
required_device<mc6845_device> m_crtc;
required_device<palette_device> m_palette;
- std::vector<UINT8> m_r_ram;
- std::vector<UINT8> m_g_ram;
- std::vector<UINT8> m_b_ram;
+ std::vector<uint8_t> m_r_ram;
+ std::vector<uint8_t> m_g_ram;
+ std::vector<uint8_t> m_b_ram;
- UINT8 m_control;
+ uint8_t m_control;
};
// device type definition
diff --git a/src/devices/bus/nasbus/floppy.cpp b/src/devices/bus/nasbus/floppy.cpp
index 8c87bf55b35..f61bc5a537f 100644
--- a/src/devices/bus/nasbus/floppy.cpp
+++ b/src/devices/bus/nasbus/floppy.cpp
@@ -63,7 +63,7 @@ machine_config_constructor nascom_fdc_device::device_mconfig_additions() const
// wordpro_device - constructor
//-------------------------------------------------
-nascom_fdc_device::nascom_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nascom_fdc_device::nascom_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NASCOM_FDC, "Nascom Floppy Disc Controller", tag, owner, clock, "nascom_fdc", __FILE__),
device_nasbus_card_interface(mconfig, *this),
m_fdc(*this, "fd1793"),
@@ -190,7 +190,7 @@ WRITE8_MEMBER( nascom_fdc_device::select_w )
READ8_MEMBER( nascom_fdc_device::status_r )
{
- UINT8 data = 0;
+ uint8_t data = 0;
data |= m_fdc->intrq_r() << 0;
diff --git a/src/devices/bus/nasbus/floppy.h b/src/devices/bus/nasbus/floppy.h
index ea27b266667..2343ea3e41e 100644
--- a/src/devices/bus/nasbus/floppy.h
+++ b/src/devices/bus/nasbus/floppy.h
@@ -26,7 +26,7 @@ class nascom_fdc_device : public device_t, public device_nasbus_card_interface
{
public:
// construction/destruction
- nascom_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nascom_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER(select_r);
DECLARE_WRITE8_MEMBER(select_w);
@@ -52,7 +52,7 @@ private:
floppy_image_device *m_floppy;
emu_timer *m_motor;
- UINT8 m_select;
+ uint8_t m_select;
};
// device type definition
diff --git a/src/devices/bus/nasbus/nasbus.cpp b/src/devices/bus/nasbus/nasbus.cpp
index bd0f2d4dab4..f0e30be6039 100644
--- a/src/devices/bus/nasbus/nasbus.cpp
+++ b/src/devices/bus/nasbus/nasbus.cpp
@@ -21,7 +21,7 @@ const device_type NASBUS_SLOT = &device_creator<nasbus_slot_device>;
// nasbus_slot_device - constructor
//-------------------------------------------------
-nasbus_slot_device::nasbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nasbus_slot_device::nasbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NASBUS_SLOT, "NASBUS Slot", tag, owner, clock, "nasbus_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_nasbus_tag(nullptr)
@@ -29,7 +29,7 @@ nasbus_slot_device::nasbus_slot_device(const machine_config &mconfig, const char
}
nasbus_slot_device::nasbus_slot_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this),
m_nasbus_tag(nullptr)
@@ -69,7 +69,7 @@ const device_type NASBUS = &device_creator<nasbus_device>;
// nasbus_device - constructor
//-------------------------------------------------
-nasbus_device::nasbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nasbus_device::nasbus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NASBUS_SLOT, "NASBUS Backplane", tag, owner, clock, "nasbus", __FILE__),
m_program(nullptr),
m_io(nullptr),
diff --git a/src/devices/bus/nasbus/nasbus.h b/src/devices/bus/nasbus/nasbus.h
index 34e35de4886..73c0a9e3a3a 100644
--- a/src/devices/bus/nasbus/nasbus.h
+++ b/src/devices/bus/nasbus/nasbus.h
@@ -131,9 +131,9 @@ class nasbus_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- nasbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nasbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
nasbus_slot_device(const machine_config &mconfig, device_type type, const char *name,
- const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -155,7 +155,7 @@ class nasbus_device : public device_t
{
public:
// construction/destruction
- nasbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nasbus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~nasbus_device();
template<class _Object> static devcb_base &set_ram_disable_handler(device_t &device, _Object object)
diff --git a/src/devices/bus/neogeo/boot_cthd.cpp b/src/devices/bus/neogeo/boot_cthd.cpp
index 1cb69ca1ecb..af8f38ec254 100644
--- a/src/devices/bus/neogeo/boot_cthd.cpp
+++ b/src/devices/bus/neogeo/boot_cthd.cpp
@@ -19,12 +19,12 @@
const device_type NEOGEO_CTHD2K3_CART = &device_creator<neogeo_cthd2k3_cart>;
-neogeo_cthd2k3_cart::neogeo_cthd2k3_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) :
+neogeo_cthd2k3_cart::neogeo_cthd2k3_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) :
neogeo_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_prot(*this, "cthd_prot")
{}
-neogeo_cthd2k3_cart::neogeo_cthd2k3_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) :
+neogeo_cthd2k3_cart::neogeo_cthd2k3_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) :
neogeo_rom_device(mconfig, NEOGEO_CTHD2K3_CART, "Neo Geo CTHD 2003 Cart", tag, owner, clock, "neocart_ct2k3", __FILE__),
m_prot(*this, "cthd_prot")
{}
@@ -76,7 +76,7 @@ void neogeo_cthd2k3_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CT2K3SP_CART = &device_creator<neogeo_ct2k3sp_cart>;
-neogeo_ct2k3sp_cart::neogeo_ct2k3sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_ct2k3sp_cart::neogeo_ct2k3sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cthd2k3_cart(mconfig, NEOGEO_CT2K3SP_CART, "Neo Geo CTHD 2003 Sp Cart", tag, owner, clock, "neocart_ct2k3sp", __FILE__)
{}
@@ -92,7 +92,7 @@ void neogeo_ct2k3sp_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CT2K3SA_CART = &device_creator<neogeo_ct2k3sa_cart>;
-neogeo_ct2k3sa_cart::neogeo_ct2k3sa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_ct2k3sa_cart::neogeo_ct2k3sa_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cthd2k3_cart(mconfig, NEOGEO_CT2K3SA_CART, "Neo Geo CTHD 2003 Sp Alt Cart", tag, owner, clock, "neocart_ct2k3sa", __FILE__)
{}
@@ -109,7 +109,7 @@ void neogeo_ct2k3sa_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_MATRIMBL_CART = &device_creator<neogeo_matrimbl_cart>;
-neogeo_matrimbl_cart::neogeo_matrimbl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_matrimbl_cart::neogeo_matrimbl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cthd2k3_cart(mconfig, NEOGEO_MATRIMBL_CART, "Neo Geo Matrimelee Bootleg Cart", tag, owner, clock, "neocart_matrimbl", __FILE__),
m_cmc_prot(*this, "cmc_prot"),
m_kof2k2_prot(*this, "kof2k2_prot")
diff --git a/src/devices/bus/neogeo/boot_cthd.h b/src/devices/bus/neogeo/boot_cthd.h
index 8793bdea046..7d3bb213b80 100644
--- a/src/devices/bus/neogeo/boot_cthd.h
+++ b/src/devices/bus/neogeo/boot_cthd.h
@@ -13,8 +13,8 @@ class neogeo_cthd2k3_cart : public neogeo_rom_device
{
public:
// construction/destruction
- neogeo_cthd2k3_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_cthd2k3_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_cthd2k3_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source);
+ neogeo_cthd2k3_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock);
// device-level overrides
virtual void device_start() override;
@@ -22,7 +22,7 @@ public:
virtual machine_config_constructor device_mconfig_additions() const override;
// reading and writing
- virtual UINT32 get_bank_base(UINT16 sel) override { return m_prot->get_bank_base(sel); }
+ virtual uint32_t get_bank_base(uint16_t sel) override { return m_prot->get_bank_base(sel); }
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -42,7 +42,7 @@ extern const device_type NEOGEO_CTHD2K3_CART;
class neogeo_ct2k3sp_cart : public neogeo_cthd2k3_cart
{
public:
- neogeo_ct2k3sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_ct2k3sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
};
@@ -57,7 +57,7 @@ extern const device_type NEOGEO_CT2K3SP_CART;
class neogeo_ct2k3sa_cart : public neogeo_cthd2k3_cart
{
public:
- neogeo_ct2k3sa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_ct2k3sa_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
};
@@ -75,7 +75,7 @@ extern const device_type NEOGEO_CT2K3SA_CART;
class neogeo_matrimbl_cart : public neogeo_cthd2k3_cart
{
public:
- neogeo_matrimbl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_matrimbl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 2; }
diff --git a/src/devices/bus/neogeo/boot_kof10th.cpp b/src/devices/bus/neogeo/boot_kof10th.cpp
index a86200967b7..5420fbd52a9 100644
--- a/src/devices/bus/neogeo/boot_kof10th.cpp
+++ b/src/devices/bus/neogeo/boot_kof10th.cpp
@@ -19,7 +19,7 @@
const device_type NEOGEO_KOF10TH_CART = &device_creator<neogeo_kof10th_cart>;
-neogeo_kof10th_cart::neogeo_kof10th_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) :
+neogeo_kof10th_cart::neogeo_kof10th_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KOF10TH_CART, "Neo Geo KOF 10th Ann Bootleg Cart", tag, owner, clock, "neocart_kof10th", __FILE__)
{}
@@ -61,7 +61,7 @@ machine_config_constructor neogeo_kof10th_cart::device_mconfig_additions() const
void neogeo_kof10th_cart::decrypt_all(DECRYPT_ALL_PARAMS)
{
m_prot->kof10th_decrypt(cpuregion, cpuregion_size);
- memcpy(m_cart_ram2, (UINT8 *)cpuregion + 0xe0000, 0x20000);
+ memcpy(m_cart_ram2, (uint8_t *)cpuregion + 0xe0000, 0x20000);
m_fixed = (get_fixed_size()) ? get_fixed_base() : get_region_fixed_base();
}
@@ -70,20 +70,20 @@ void neogeo_kof10th_cart::decrypt_all(DECRYPT_ALL_PARAMS)
is incomplete, at the moment the S data is copied from the program rom on
start-up instead */
-UINT32 neogeo_kof10th_cart::get_bank_base(UINT16 sel)
+uint32_t neogeo_kof10th_cart::get_bank_base(uint16_t sel)
{
- UINT32 bank = 0x100000 + ((sel & 7) << 20);
+ uint32_t bank = 0x100000 + ((sel & 7) << 20);
if (bank >= 0x700000)
bank = 0x100000;
return bank;
}
-UINT16 neogeo_kof10th_cart::get_helper()
+uint16_t neogeo_kof10th_cart::get_helper()
{
return m_cart_ram[0xffc];
}
-UINT32 neogeo_kof10th_cart::get_special_bank()
+uint32_t neogeo_kof10th_cart::get_special_bank()
{
return m_special_bank;
}
diff --git a/src/devices/bus/neogeo/boot_kof10th.h b/src/devices/bus/neogeo/boot_kof10th.h
index 0303e4f35d8..0ba5c0ee2a1 100644
--- a/src/devices/bus/neogeo/boot_kof10th.h
+++ b/src/devices/bus/neogeo/boot_kof10th.h
@@ -13,7 +13,7 @@ class neogeo_kof10th_cart : public neogeo_bootleg_cart
{
public:
// construction/destruction
- neogeo_kof10th_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_kof10th_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock);
// device-level overrides
virtual void device_start() override;
@@ -21,9 +21,9 @@ public:
virtual machine_config_constructor device_mconfig_additions() const override;
// reading and writing
- virtual UINT16 get_helper() override;
- virtual UINT32 get_bank_base(UINT16 sel) override;
- virtual UINT32 get_special_bank() override;
+ virtual uint16_t get_helper() override;
+ virtual uint32_t get_bank_base(uint16_t sel) override;
+ virtual uint32_t get_special_bank() override;
virtual DECLARE_READ16_MEMBER(addon_r) override;
virtual DECLARE_READ16_MEMBER(protection_r) override;
virtual DECLARE_WRITE16_MEMBER(protection_w) override;
@@ -32,10 +32,10 @@ public:
virtual int get_fixed_bank_type(void) override { return 0; }
private:
- UINT8* m_fixed;
- UINT32 m_special_bank;
- UINT16 m_cart_ram[0x1000];
- UINT16 m_cart_ram2[0x10000];
+ uint8_t* m_fixed;
+ uint32_t m_special_bank;
+ uint16_t m_cart_ram[0x1000];
+ uint16_t m_cart_ram2[0x10000];
};
// device type definition
diff --git a/src/devices/bus/neogeo/boot_kof2k2.cpp b/src/devices/bus/neogeo/boot_kof2k2.cpp
index f6d602491d6..eff560a3bc2 100644
--- a/src/devices/bus/neogeo/boot_kof2k2.cpp
+++ b/src/devices/bus/neogeo/boot_kof2k2.cpp
@@ -46,7 +46,7 @@ machine_config_constructor neogeo_kf2k2mp2_cart::device_mconfig_additions() cons
const device_type NEOGEO_KOF2002B_CART = &device_creator<neogeo_kof2002b_cart>;
-neogeo_kof2002b_cart::neogeo_kof2002b_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_kof2002b_cart::neogeo_kof2002b_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KOF2002B_CART, "Neo Geo KOF 2002 Bootleg Cart", tag, owner, clock, "neocart_kof2002b", __FILE__),
m_cmc_prot(*this, "cmc_prot"),
m_pcm2_prot(*this, "pcm2_prot"),
@@ -69,7 +69,7 @@ void neogeo_kof2002b_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_KF2K2MP_CART = &device_creator<neogeo_kf2k2mp_cart>;
-neogeo_kf2k2mp_cart::neogeo_kf2k2mp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_kf2k2mp_cart::neogeo_kf2k2mp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KF2K2MP_CART, "Neo Geo KOF 2002 MP Cart", tag, owner, clock, "neocart_kf2k2mp", __FILE__),
m_cmc_prot(*this, "cmc_prot"),
m_pcm2_prot(*this, "pcm2_prot")
@@ -91,7 +91,7 @@ void neogeo_kf2k2mp_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_KF2K2MP2_CART = &device_creator<neogeo_kf2k2mp2_cart>;
-neogeo_kf2k2mp2_cart::neogeo_kf2k2mp2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_kf2k2mp2_cart::neogeo_kf2k2mp2_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KF2K2MP2_CART, "Neo Geo KOF 2002 MP2 Cart", tag, owner, clock, "neocart_kf2k2mp2", __FILE__),
m_cmc_prot(*this, "cmc_prot"),
m_pcm2_prot(*this, "pcm2_prot")
diff --git a/src/devices/bus/neogeo/boot_kof2k2.h b/src/devices/bus/neogeo/boot_kof2k2.h
index 23a8ac53aaf..11539369d78 100644
--- a/src/devices/bus/neogeo/boot_kof2k2.h
+++ b/src/devices/bus/neogeo/boot_kof2k2.h
@@ -18,7 +18,7 @@
class neogeo_kof2002b_cart : public neogeo_bootleg_cart
{
public:
- neogeo_kof2002b_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kof2002b_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -40,7 +40,7 @@ extern const device_type NEOGEO_KOF2002B_CART;
class neogeo_kf2k2mp_cart : public neogeo_bootleg_cart
{
public:
- neogeo_kf2k2mp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kf2k2mp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -61,7 +61,7 @@ extern const device_type NEOGEO_KF2K2MP_CART;
class neogeo_kf2k2mp2_cart : public neogeo_bootleg_cart
{
public:
- neogeo_kf2k2mp2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kf2k2mp2_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
diff --git a/src/devices/bus/neogeo/boot_kof2k3.cpp b/src/devices/bus/neogeo/boot_kof2k3.cpp
index 5426ebf9f5b..25b3560c45f 100644
--- a/src/devices/bus/neogeo/boot_kof2k3.cpp
+++ b/src/devices/bus/neogeo/boot_kof2k3.cpp
@@ -40,7 +40,7 @@ machine_config_constructor neogeo_kf2k3upl_cart::device_mconfig_additions() cons
const device_type NEOGEO_KF2K3BL_CART = &device_creator<neogeo_kf2k3bl_cart>;
-neogeo_kf2k3bl_cart::neogeo_kf2k3bl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_kf2k3bl_cart::neogeo_kf2k3bl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KF2K3BL_CART, "Neo Geo KOF 2003 Bootleg Cart", tag, owner, clock, "neocart_kf2k3bl", __FILE__),
m_cmc_prot(*this, "cmc_prot"),
m_pcm2_prot(*this, "pcm2_prot"),
@@ -61,7 +61,7 @@ void neogeo_kf2k3bl_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_KF2K3PL_CART = &device_creator<neogeo_kf2k3pl_cart>;
-neogeo_kf2k3pl_cart::neogeo_kf2k3pl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_kf2k3pl_cart::neogeo_kf2k3pl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KF2K3PL_CART, "Neo Geo KOF 2003 PL Cart", tag, owner, clock, "neocart_kf2k3pl", __FILE__),
m_cmc_prot(*this, "cmc_prot"),
m_pcm2_prot(*this, "pcm2_prot"),
@@ -83,7 +83,7 @@ void neogeo_kf2k3pl_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_KF2K3UPL_CART = &device_creator<neogeo_kf2k3upl_cart>;
-neogeo_kf2k3upl_cart::neogeo_kf2k3upl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_kf2k3upl_cart::neogeo_kf2k3upl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KF2K3UPL_CART, "Neo Geo KOF 2003 UPL Cart", tag, owner, clock, "neocart_kf2k3upl", __FILE__),
m_cmc_prot(*this, "cmc_prot"),
m_pcm2_prot(*this, "pcm2_prot"),
diff --git a/src/devices/bus/neogeo/boot_kof2k3.h b/src/devices/bus/neogeo/boot_kof2k3.h
index 848f5cd647e..4b7a0a9e911 100644
--- a/src/devices/bus/neogeo/boot_kof2k3.h
+++ b/src/devices/bus/neogeo/boot_kof2k3.h
@@ -15,13 +15,13 @@
class neogeo_kf2k3bl_cart : public neogeo_bootleg_cart
{
public:
- neogeo_kf2k3bl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kf2k3bl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
virtual machine_config_constructor device_mconfig_additions() const override;
- virtual UINT32 get_bank_base(UINT16 sel) override { return m_kof2k3bl_prot->get_bank_base(); }
+ virtual uint32_t get_bank_base(uint16_t sel) override { return m_kof2k3bl_prot->get_bank_base(); }
virtual DECLARE_READ16_MEMBER(protection_r) override { return m_kof2k3bl_prot->protection_r(space, offset, mem_mask); }
virtual DECLARE_WRITE16_MEMBER(protection_w) override { m_kof2k3bl_prot->kof2003_w(space, offset, data, mem_mask); }
virtual DECLARE_READ16_MEMBER(addon_r) override { return m_kof2k3bl_prot->overlay_r(space, offset, mem_mask); }
@@ -42,13 +42,13 @@ extern const device_type NEOGEO_KF2K3BL_CART;
class neogeo_kf2k3pl_cart : public neogeo_bootleg_cart
{
public:
- neogeo_kf2k3pl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kf2k3pl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
virtual machine_config_constructor device_mconfig_additions() const override;
- virtual UINT32 get_bank_base(UINT16 sel) override { return m_kof2k3bl_prot->get_bank_base(); }
+ virtual uint32_t get_bank_base(uint16_t sel) override { return m_kof2k3bl_prot->get_bank_base(); }
virtual DECLARE_READ16_MEMBER(protection_r) override { return m_kof2k3bl_prot->protection_r(space, offset, mem_mask); }
virtual DECLARE_WRITE16_MEMBER(protection_w) override { m_kof2k3bl_prot->kof2003p_w(space, offset, data, mem_mask); }
@@ -68,13 +68,13 @@ extern const device_type NEOGEO_KF2K3PL_CART;
class neogeo_kf2k3upl_cart : public neogeo_bootleg_cart
{
public:
- neogeo_kf2k3upl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kf2k3upl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
virtual machine_config_constructor device_mconfig_additions() const override;
- virtual UINT32 get_bank_base(UINT16 sel) override { return m_kof2k3bl_prot->get_bank_base(); }
+ virtual uint32_t get_bank_base(uint16_t sel) override { return m_kof2k3bl_prot->get_bank_base(); }
virtual DECLARE_READ16_MEMBER(protection_r) override { return m_kof2k3bl_prot->protection_r(space, offset, mem_mask); }
virtual DECLARE_WRITE16_MEMBER(protection_w) override { m_kof2k3bl_prot->kof2003_w(space, offset, data, mem_mask); }
virtual DECLARE_READ16_MEMBER(addon_r) override { return m_kof2k3bl_prot->overlay_r(space, offset, mem_mask); }
diff --git a/src/devices/bus/neogeo/boot_misc.cpp b/src/devices/bus/neogeo/boot_misc.cpp
index 16fa78c12f6..082d011d9ac 100644
--- a/src/devices/bus/neogeo/boot_misc.cpp
+++ b/src/devices/bus/neogeo/boot_misc.cpp
@@ -19,12 +19,12 @@
const device_type NEOGEO_BOOTLEG_CART = &device_creator<neogeo_bootleg_cart>;
-neogeo_bootleg_cart::neogeo_bootleg_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) :
+neogeo_bootleg_cart::neogeo_bootleg_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) :
neogeo_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_prot(*this, "bootleg_prot")
{}
-neogeo_bootleg_cart::neogeo_bootleg_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) :
+neogeo_bootleg_cart::neogeo_bootleg_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) :
neogeo_rom_device(mconfig, NEOGEO_BOOTLEG_CART, "Neo Geo Bootleg Protected Cart", tag, owner, clock, "neocart_boot", __FILE__),
m_prot(*this, "bootleg_prot")
{}
@@ -64,7 +64,7 @@ machine_config_constructor neogeo_bootleg_cart::device_mconfig_additions() const
const device_type NEOGEO_GAROUBL_CART = &device_creator<neogeo_garoubl_cart>;
-neogeo_garoubl_cart::neogeo_garoubl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_garoubl_cart::neogeo_garoubl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_GAROUBL_CART, "Neo Geo Garou Bootleg Cart", tag, owner, clock, "neocart_garoubl", __FILE__)
{}
@@ -82,7 +82,7 @@ void neogeo_garoubl_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_KOF97ORO_CART = &device_creator<neogeo_kof97oro_cart>;
-neogeo_kof97oro_cart::neogeo_kof97oro_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_kof97oro_cart::neogeo_kof97oro_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KOF97ORO_CART, "Neo Geo KOF 97 Orochi Bootleg Cart", tag, owner, clock, "neocart_kof97oro", __FILE__)
{}
@@ -101,7 +101,7 @@ void neogeo_kof97oro_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_KF10THEP_CART = &device_creator<neogeo_kf10thep_cart>;
-neogeo_kf10thep_cart::neogeo_kf10thep_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_kf10thep_cart::neogeo_kf10thep_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KF10THEP_CART, "Neo Geo KOF 10th Ann. EP Bootleg Cart", tag, owner, clock, "neocart_kf10thep", __FILE__)
{}
@@ -119,7 +119,7 @@ void neogeo_kf10thep_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_KF2K5UNI_CART = &device_creator<neogeo_kf2k5uni_cart>;
-neogeo_kf2k5uni_cart::neogeo_kf2k5uni_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_kf2k5uni_cart::neogeo_kf2k5uni_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KF2K5UNI_CART, "Neo Geo KOF 2005 Unique Bootleg Cart", tag, owner, clock, "neocart_kf2k5uni", __FILE__)
{}
@@ -138,7 +138,7 @@ void neogeo_kf2k5uni_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_KF2K4SE_CART = &device_creator<neogeo_kf2k4se_cart>;
-neogeo_kf2k4se_cart::neogeo_kf2k4se_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_kf2k4se_cart::neogeo_kf2k4se_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KF2K4SE_CART, "Neo Geo KOF 2004 SE Bootleg Cart", tag, owner, clock, "neocart_kf2k4se", __FILE__)
{}
@@ -155,7 +155,7 @@ void neogeo_kf2k4se_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_LANS2004_CART = &device_creator<neogeo_lans2004_cart>;
-neogeo_lans2004_cart::neogeo_lans2004_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_lans2004_cart::neogeo_lans2004_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_LANS2004_CART, "Neo Geo Lansquenet 2004 Bootleg Cart", tag, owner, clock, "neocart_lans2004", __FILE__)
{}
@@ -174,7 +174,7 @@ void neogeo_lans2004_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_SAMSHO5B_CART = &device_creator<neogeo_samsho5b_cart>;
-neogeo_samsho5b_cart::neogeo_samsho5b_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_samsho5b_cart::neogeo_samsho5b_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_SAMSHO5B_CART, "Neo Geo Samurai Shodown 5 Bootleg Cart", tag, owner, clock, "neocart_samsho5b", __FILE__)
{}
@@ -193,7 +193,7 @@ void neogeo_samsho5b_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_MSLUG3B6_CART = &device_creator<neogeo_mslug3b6_cart>;
-neogeo_mslug3b6_cart::neogeo_mslug3b6_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_mslug3b6_cart::neogeo_mslug3b6_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_MSLUG3B6_CART, "Neo Geo Metal Slug 6 Bootleg Cart", tag, owner, clock, "neocart_mslug3b6", __FILE__),
m_cmc_prot(*this, "cmc_prot")
{}
@@ -221,7 +221,7 @@ machine_config_constructor neogeo_mslug3b6_cart::device_mconfig_additions() cons
const device_type NEOGEO_MS5PLUS_CART = &device_creator<neogeo_ms5plus_cart>;
-neogeo_ms5plus_cart::neogeo_ms5plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_ms5plus_cart::neogeo_ms5plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_MS5PLUS_CART, "Neo Geo Metal Slug 5 Plus Bootleg Cart", tag, owner, clock, "neocart_ms5plus", __FILE__),
m_cmc_prot(*this, "cmc_prot"),
m_pcm2_prot(*this, "pcm2_prot")
@@ -253,7 +253,7 @@ machine_config_constructor neogeo_ms5plus_cart::device_mconfig_additions() const
const device_type NEOGEO_KOG_CART = &device_creator<neogeo_kog_cart>;
-neogeo_kog_cart::neogeo_kog_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_kog_cart::neogeo_kog_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_KOG_CART, "Neo Geo King of Gladiators Bootleg Cart", tag, owner, clock, "neocart_kog", __FILE__),
m_jumper(*this, "JUMPER")
{}
diff --git a/src/devices/bus/neogeo/boot_misc.h b/src/devices/bus/neogeo/boot_misc.h
index 6a62fab27f5..b42da3b4edb 100644
--- a/src/devices/bus/neogeo/boot_misc.h
+++ b/src/devices/bus/neogeo/boot_misc.h
@@ -15,8 +15,8 @@ class neogeo_bootleg_cart : public neogeo_rom_device
{
public:
// construction/destruction
- neogeo_bootleg_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_bootleg_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_bootleg_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source);
+ neogeo_bootleg_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock);
// device-level overrides
virtual void device_start() override;
@@ -42,7 +42,7 @@ extern const device_type NEOGEO_BOOTLEG_CART;
class neogeo_garoubl_cart : public neogeo_bootleg_cart
{
public:
- neogeo_garoubl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_garoubl_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
};
@@ -57,7 +57,7 @@ extern const device_type NEOGEO_GAROUBL_CART;
class neogeo_kof97oro_cart : public neogeo_bootleg_cart
{
public:
- neogeo_kof97oro_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kof97oro_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
};
@@ -72,7 +72,7 @@ extern const device_type NEOGEO_KOF97ORO_CART;
class neogeo_kf10thep_cart : public neogeo_bootleg_cart
{
public:
- neogeo_kf10thep_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kf10thep_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
};
@@ -87,7 +87,7 @@ extern const device_type NEOGEO_KF10THEP_CART;
class neogeo_kf2k5uni_cart : public neogeo_bootleg_cart
{
public:
- neogeo_kf2k5uni_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kf2k5uni_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
};
@@ -101,7 +101,7 @@ extern const device_type NEOGEO_KF2K5UNI_CART;
class neogeo_kf2k4se_cart : public neogeo_bootleg_cart
{
public:
- neogeo_kf2k4se_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kf2k4se_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
};
@@ -116,7 +116,7 @@ extern const device_type NEOGEO_KF2K4SE_CART;
class neogeo_lans2004_cart : public neogeo_bootleg_cart
{
public:
- neogeo_lans2004_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_lans2004_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
};
@@ -131,7 +131,7 @@ extern const device_type NEOGEO_LANS2004_CART;
class neogeo_samsho5b_cart : public neogeo_bootleg_cart
{
public:
- neogeo_samsho5b_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_samsho5b_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
};
@@ -146,7 +146,7 @@ extern const device_type NEOGEO_SAMSHO5B_CART;
class neogeo_mslug3b6_cart : public neogeo_bootleg_cart
{
public:
- neogeo_mslug3b6_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_mslug3b6_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -165,14 +165,14 @@ extern const device_type NEOGEO_MSLUG3B6_CART;
class neogeo_ms5plus_cart : public neogeo_bootleg_cart
{
public:
- neogeo_ms5plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_ms5plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
virtual machine_config_constructor device_mconfig_additions() const override;
virtual DECLARE_READ16_MEMBER(protection_r) override { return m_prot->mslug5p_prot_r(space, offset, mem_mask); }
- virtual UINT32 get_bank_base(UINT16 sel) override { return m_prot->mslug5p_bank_base(sel); }
+ virtual uint32_t get_bank_base(uint16_t sel) override { return m_prot->mslug5p_bank_base(sel); }
private:
required_device<cmc_prot_device> m_cmc_prot;
@@ -189,7 +189,7 @@ extern const device_type NEOGEO_MS5PLUS_CART;
class neogeo_kog_cart : public neogeo_bootleg_cart
{
public:
- neogeo_kog_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kog_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/neogeo/boot_svc.cpp b/src/devices/bus/neogeo/boot_svc.cpp
index 3bec1518958..869bcea516d 100644
--- a/src/devices/bus/neogeo/boot_svc.cpp
+++ b/src/devices/bus/neogeo/boot_svc.cpp
@@ -18,7 +18,7 @@
const device_type NEOGEO_SVCBOOT_CART = &device_creator<neogeo_svcboot_cart>;
-neogeo_svcboot_cart::neogeo_svcboot_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_svcboot_cart::neogeo_svcboot_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_SVCBOOT_CART, "Neo Geo SVC Bootleg Cart", tag, owner, clock, "neocart_svcboot", __FILE__),
m_pvc_prot(*this, "pvc_prot")
{}
@@ -46,7 +46,7 @@ machine_config_constructor neogeo_svcboot_cart::device_mconfig_additions() const
const device_type NEOGEO_SVCPLUS_CART = &device_creator<neogeo_svcplus_cart>;
-neogeo_svcplus_cart::neogeo_svcplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_svcplus_cart::neogeo_svcplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_SVCPLUS_CART, "Neo Geo SVC Plus Bootleg Cart", tag, owner, clock, "neocart_svcplus", __FILE__)
{}
@@ -65,7 +65,7 @@ void neogeo_svcplus_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_SVCPLUSA_CART = &device_creator<neogeo_svcplusa_cart>;
-neogeo_svcplusa_cart::neogeo_svcplusa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_svcplusa_cart::neogeo_svcplusa_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_SVCPLUSA_CART, "Neo Geo SVC Plus Alt Bootleg Cart", tag, owner, clock, "neocart_svcplusa", __FILE__)
{}
@@ -82,7 +82,7 @@ void neogeo_svcplusa_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_SVCSPLUS_CART = &device_creator<neogeo_svcsplus_cart>;
-neogeo_svcsplus_cart::neogeo_svcsplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_svcsplus_cart::neogeo_svcsplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_bootleg_cart(mconfig, NEOGEO_SVCSPLUS_CART, "Neo Geo SVC S.Plus Bootleg Cart", tag, owner, clock, "neocart_svcsplus", __FILE__),
m_pvc_prot(*this, "pvc_prot")
{}
diff --git a/src/devices/bus/neogeo/boot_svc.h b/src/devices/bus/neogeo/boot_svc.h
index e7a94b14da1..f0c676c8359 100644
--- a/src/devices/bus/neogeo/boot_svc.h
+++ b/src/devices/bus/neogeo/boot_svc.h
@@ -15,11 +15,11 @@
class neogeo_svcboot_cart : public neogeo_bootleg_cart
{
public:
- neogeo_svcboot_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_svcboot_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
- virtual UINT32 get_bank_base(UINT16 sel) override { return m_pvc_prot->get_bank_base(); }
+ virtual uint32_t get_bank_base(uint16_t sel) override { return m_pvc_prot->get_bank_base(); }
virtual DECLARE_READ16_MEMBER(protection_r) override { return m_pvc_prot->protection_r(space, offset, mem_mask); }
virtual DECLARE_WRITE16_MEMBER(protection_w) override { m_pvc_prot->protection_w(space, offset, data, mem_mask); }
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
@@ -38,7 +38,7 @@ extern const device_type NEOGEO_SVCBOOT_CART;
class neogeo_svcplus_cart : public neogeo_bootleg_cart
{
public:
- neogeo_svcplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_svcplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
};
@@ -53,7 +53,7 @@ extern const device_type NEOGEO_SVCPLUS_CART;
class neogeo_svcplusa_cart : public neogeo_bootleg_cart
{
public:
- neogeo_svcplusa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_svcplusa_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
};
@@ -68,11 +68,11 @@ extern const device_type NEOGEO_SVCPLUSA_CART;
class neogeo_svcsplus_cart : public neogeo_bootleg_cart
{
public:
- neogeo_svcsplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_svcsplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
- virtual UINT32 get_bank_base(UINT16 sel) override { return m_pvc_prot->get_bank_base(); }
+ virtual uint32_t get_bank_base(uint16_t sel) override { return m_pvc_prot->get_bank_base(); }
virtual DECLARE_READ16_MEMBER(protection_r) override { return m_pvc_prot->protection_r(space, offset, mem_mask); }
virtual DECLARE_WRITE16_MEMBER(protection_w) override { m_pvc_prot->protection_w(space, offset, data, mem_mask); }
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
diff --git a/src/devices/bus/neogeo/cmc.cpp b/src/devices/bus/neogeo/cmc.cpp
index 4fac2c9eb72..687a1faad07 100644
--- a/src/devices/bus/neogeo/cmc.cpp
+++ b/src/devices/bus/neogeo/cmc.cpp
@@ -19,12 +19,12 @@
const device_type NEOGEO_CMC_CART = &device_creator<neogeo_cmc_cart>;
-neogeo_cmc_cart::neogeo_cmc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) :
+neogeo_cmc_cart::neogeo_cmc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) :
neogeo_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_prot(*this, "cmc_prot")
{}
-neogeo_cmc_cart::neogeo_cmc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) :
+neogeo_cmc_cart::neogeo_cmc_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) :
neogeo_rom_device(mconfig, NEOGEO_CMC_CART, "Neo Geo CMC Cart", tag, owner, clock, "neocart_cmc", __FILE__),
m_prot(*this, "cmc_prot")
{}
@@ -59,7 +59,7 @@ machine_config_constructor neogeo_cmc_cart::device_mconfig_additions() const
const device_type NEOGEO_CMC_ZUPAPA_CART = &device_creator<neogeo_cmc_zupapa_cart>;
-neogeo_cmc_zupapa_cart::neogeo_cmc_zupapa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_cmc_zupapa_cart::neogeo_cmc_zupapa_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_ZUPAPA_CART, "Neo Geo Zupapa CMC42 Cart", tag, owner, clock, "neocart_zupapa", __FILE__)
{}
@@ -76,7 +76,7 @@ void neogeo_cmc_zupapa_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_MSLUG3H_CART = &device_creator<neogeo_cmc_mslug3h_cart>;
-neogeo_cmc_mslug3h_cart::neogeo_cmc_mslug3h_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_cmc_mslug3h_cart::neogeo_cmc_mslug3h_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_MSLUG3H_CART, "Neo Geo Metal Slug 3 AES CMC42 Cart", tag, owner, clock, "neocart_mslug3h", __FILE__)
{}
@@ -93,7 +93,7 @@ void neogeo_cmc_mslug3h_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_GANRYU_CART = &device_creator<neogeo_cmc_ganryu_cart>;
-neogeo_cmc_ganryu_cart::neogeo_cmc_ganryu_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_cmc_ganryu_cart::neogeo_cmc_ganryu_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_GANRYU_CART, "Neo Geo Ganryu CMC42 Cart", tag, owner, clock, "neocart_ganryu", __FILE__)
{}
@@ -110,7 +110,7 @@ void neogeo_cmc_ganryu_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_S1945P_CART = &device_creator<neogeo_cmc_s1945p_cart>;
-neogeo_cmc_s1945p_cart::neogeo_cmc_s1945p_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_cmc_s1945p_cart::neogeo_cmc_s1945p_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_S1945P_CART, "Neo Geo Strikers 1945 Plus CMC42 Cart", tag, owner, clock, "neocart_s1945p", __FILE__)
{}
@@ -126,7 +126,7 @@ void neogeo_cmc_s1945p_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_PREISLE2_CART = &device_creator<neogeo_cmc_preisle2_cart>;
-neogeo_cmc_preisle2_cart::neogeo_cmc_preisle2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_cmc_preisle2_cart::neogeo_cmc_preisle2_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_PREISLE2_CART, "Neo Geo Prehistorik Isle 2 CMC42 Cart", tag, owner, clock, "neocart_preisle2", __FILE__)
{}
@@ -142,7 +142,7 @@ void neogeo_cmc_preisle2_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_BANGBEAD_CART = &device_creator<neogeo_cmc_bangbead_cart>;
-neogeo_cmc_bangbead_cart::neogeo_cmc_bangbead_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_cmc_bangbead_cart::neogeo_cmc_bangbead_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_BANGBEAD_CART, "Neo Geo Bangbead CMC42 Cart", tag, owner, clock, "neocart_bangbead", __FILE__)
{}
@@ -158,7 +158,7 @@ void neogeo_cmc_bangbead_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_NITD_CART = &device_creator<neogeo_cmc_nitd_cart>;
-neogeo_cmc_nitd_cart::neogeo_cmc_nitd_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_cmc_nitd_cart::neogeo_cmc_nitd_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_NITD_CART, "Neo Geo NITD CMC42 Cart", tag, owner, clock, "neocart_nitd", __FILE__)
{}
@@ -175,7 +175,7 @@ void neogeo_cmc_nitd_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_SENGOKU3_CART = &device_creator<neogeo_cmc_sengoku3_cart>;
-neogeo_cmc_sengoku3_cart::neogeo_cmc_sengoku3_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_cmc_sengoku3_cart::neogeo_cmc_sengoku3_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_SENGOKU3_CART, "Neo Geo Sengoku 3 CMC42 Cart", tag, owner, clock, "neocart_sengoku3", __FILE__)
{}
@@ -191,7 +191,7 @@ void neogeo_cmc_sengoku3_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_KOF99K_CART = &device_creator<neogeo_cmc_kof99k_cart>;
-neogeo_cmc_kof99k_cart::neogeo_cmc_kof99k_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_cmc_kof99k_cart::neogeo_cmc_kof99k_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF99K_CART, "Neo Geo KOF 99 Korea CMC42 Cart", tag, owner, clock, "neocart_kof99k", __FILE__)
{}
@@ -208,7 +208,7 @@ void neogeo_cmc_kof99k_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_KOF2001_CART = &device_creator<neogeo_cmc_kof2001_cart>;
-neogeo_cmc_kof2001_cart::neogeo_cmc_kof2001_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_cmc_kof2001_cart::neogeo_cmc_kof2001_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF2001_CART, "Neo Geo KOF 2001 CMC50 Cart", tag, owner, clock, "neocart_kof2001", __FILE__)
{}
@@ -225,7 +225,7 @@ void neogeo_cmc_kof2001_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_KOF2000N_CART = &device_creator<neogeo_cmc_kof2000n_cart>;
-neogeo_cmc_kof2000n_cart::neogeo_cmc_kof2000n_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_cmc_kof2000n_cart::neogeo_cmc_kof2000n_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_KOF2000N_CART, "Neo Geo KOF 2000 CMC50 Cart", tag, owner, clock, "neocart_kof2000n", __FILE__)
{}
@@ -243,7 +243,7 @@ void neogeo_cmc_kof2000n_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_CMC_JOCKEYGP_CART = &device_creator<neogeo_cmc_jockeygp_cart>;
-neogeo_cmc_jockeygp_cart::neogeo_cmc_jockeygp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_cmc_jockeygp_cart::neogeo_cmc_jockeygp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_cmc_cart(mconfig, NEOGEO_CMC_JOCKEYGP_CART, "Neo Geo Jockey GP CMC50 Cart", tag, owner, clock, "neocart_jockeygp", __FILE__)
{}
diff --git a/src/devices/bus/neogeo/cmc.h b/src/devices/bus/neogeo/cmc.h
index 43ea32e097b..7ee808ad08c 100644
--- a/src/devices/bus/neogeo/cmc.h
+++ b/src/devices/bus/neogeo/cmc.h
@@ -13,8 +13,8 @@ class neogeo_cmc_cart : public neogeo_rom_device
{
public:
// construction/destruction
- neogeo_cmc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_cmc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_cmc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source);
+ neogeo_cmc_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock);
// device-level overrides
virtual void device_start() override;
@@ -41,7 +41,7 @@ extern const device_type NEOGEO_CMC_CART;
class neogeo_cmc_zupapa_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_zupapa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_zupapa_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -54,7 +54,7 @@ extern const device_type NEOGEO_CMC_ZUPAPA_CART;
class neogeo_cmc_mslug3h_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_mslug3h_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_mslug3h_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -68,7 +68,7 @@ extern const device_type NEOGEO_CMC_MSLUG3H_CART;
class neogeo_cmc_ganryu_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_ganryu_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_ganryu_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -81,7 +81,7 @@ extern const device_type NEOGEO_CMC_GANRYU_CART;
class neogeo_cmc_s1945p_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_s1945p_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_s1945p_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -95,7 +95,7 @@ extern const device_type NEOGEO_CMC_S1945P_CART;
class neogeo_cmc_preisle2_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_preisle2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_preisle2_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -108,7 +108,7 @@ extern const device_type NEOGEO_CMC_PREISLE2_CART;
class neogeo_cmc_bangbead_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_bangbead_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_bangbead_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -122,7 +122,7 @@ extern const device_type NEOGEO_CMC_BANGBEAD_CART;
class neogeo_cmc_nitd_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_nitd_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_nitd_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -135,7 +135,7 @@ extern const device_type NEOGEO_CMC_NITD_CART;
class neogeo_cmc_sengoku3_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_sengoku3_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_sengoku3_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -148,7 +148,7 @@ extern const device_type NEOGEO_CMC_SENGOKU3_CART;
class neogeo_cmc_kof99k_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_kof99k_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_kof99k_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -161,7 +161,7 @@ extern const device_type NEOGEO_CMC_KOF99K_CART;
class neogeo_cmc_kof2001_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_kof2001_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_kof2001_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -174,7 +174,7 @@ extern const device_type NEOGEO_CMC_KOF2001_CART;
class neogeo_cmc_kof2000n_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_kof2000n_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_kof2000n_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 2; }
};
@@ -188,7 +188,7 @@ extern const device_type NEOGEO_CMC_KOF2000N_CART;
class neogeo_cmc_jockeygp_cart : public neogeo_cmc_cart
{
public:
- neogeo_cmc_jockeygp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_cmc_jockeygp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
@@ -199,7 +199,7 @@ public:
virtual void device_reset() override;
private:
- UINT16 m_ram[0x1000];
+ uint16_t m_ram[0x1000];
};
extern const device_type NEOGEO_CMC_JOCKEYGP_CART;
diff --git a/src/devices/bus/neogeo/fatfury2.cpp b/src/devices/bus/neogeo/fatfury2.cpp
index 3236e2f7574..64a2f44c6b1 100644
--- a/src/devices/bus/neogeo/fatfury2.cpp
+++ b/src/devices/bus/neogeo/fatfury2.cpp
@@ -19,7 +19,7 @@
const device_type NEOGEO_FATFURY2_CART = &device_creator<neogeo_fatfury2_cart>;
-neogeo_fatfury2_cart::neogeo_fatfury2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) :
+neogeo_fatfury2_cart::neogeo_fatfury2_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) :
neogeo_rom_device(mconfig, NEOGEO_FATFURY2_CART, "Neo Geo Fatal Fury 2 Cart", tag, owner, clock, "neocart_fatfury2", __FILE__),
m_prot(*this, "fatfury2_prot")
{}
diff --git a/src/devices/bus/neogeo/fatfury2.h b/src/devices/bus/neogeo/fatfury2.h
index 4870708ca0a..5579fe2b0bb 100644
--- a/src/devices/bus/neogeo/fatfury2.h
+++ b/src/devices/bus/neogeo/fatfury2.h
@@ -13,7 +13,7 @@ class neogeo_fatfury2_cart : public neogeo_rom_device
{
public:
// construction/destruction
- neogeo_fatfury2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_fatfury2_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/neogeo/kof2k2.cpp b/src/devices/bus/neogeo/kof2k2.cpp
index ac8235c471f..8848e7e68e0 100644
--- a/src/devices/bus/neogeo/kof2k2.cpp
+++ b/src/devices/bus/neogeo/kof2k2.cpp
@@ -19,14 +19,14 @@
const device_type NEOGEO_K2K2_CART = &device_creator<neogeo_kof2k2type_cart>;
-neogeo_kof2k2type_cart::neogeo_kof2k2type_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) :
+neogeo_kof2k2type_cart::neogeo_kof2k2type_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) :
neogeo_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_cmc_prot(*this, "cmc_prot"),
m_pcm2_prot(*this, "pcm2_prot"),
m_kof2k2_prot(*this, "kof2002_prot")
{}
-neogeo_kof2k2type_cart::neogeo_kof2k2type_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) :
+neogeo_kof2k2type_cart::neogeo_kof2k2type_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) :
neogeo_rom_device(mconfig, NEOGEO_K2K2_CART, "Neo Geo KOF2002-Type Cart", tag, owner, clock, "neocart_k2k2", __FILE__),
m_cmc_prot(*this, "cmc_prot"),
m_pcm2_prot(*this, "pcm2_prot"),
@@ -69,7 +69,7 @@ machine_config_constructor neogeo_kof2k2type_cart::device_mconfig_additions() co
const device_type NEOGEO_K2K2_KOF2002_CART = &device_creator<neogeo_kof2002_cart>;
-neogeo_kof2002_cart::neogeo_kof2002_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_kof2002_cart::neogeo_kof2002_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_kof2k2type_cart(mconfig, NEOGEO_K2K2_KOF2002_CART, "Neo Geo KOF2002 Cart", tag, owner, clock, "neocart_kof2002", __FILE__)
{}
@@ -89,7 +89,7 @@ const device_type NEOGEO_K2K2_KF2K2PLS_CART = &device_creator<neogeo_kf2k2pls_ca
kf2k2pls
**************************************************/
-neogeo_kf2k2pls_cart::neogeo_kf2k2pls_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_kf2k2pls_cart::neogeo_kf2k2pls_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_kof2k2type_cart(mconfig, NEOGEO_K2K2_KF2K2PLS_CART, "Neo Geo KOF2002 Plus Cart", tag, owner, clock, "neocart_kf2k2pls", __FILE__)
{}
@@ -108,7 +108,7 @@ void neogeo_kf2k2pls_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_K2K2_MATRIM_CART = &device_creator<neogeo_matrim_cart>;
-neogeo_matrim_cart::neogeo_matrim_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_matrim_cart::neogeo_matrim_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_kof2k2type_cart(mconfig, NEOGEO_K2K2_MATRIM_CART, "Neo Geo Matrimelee Cart", tag, owner, clock, "neocart_matrim", __FILE__)
{}
@@ -127,7 +127,7 @@ void neogeo_matrim_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_K2K2_SAMSHO5_CART = &device_creator<neogeo_samsho5_cart>;
-neogeo_samsho5_cart::neogeo_samsho5_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_samsho5_cart::neogeo_samsho5_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_kof2k2type_cart(mconfig, NEOGEO_K2K2_SAMSHO5_CART, "Neo Geo Samurai Shodown 5 Cart", tag, owner, clock, "neocart_samsho5", __FILE__)
{}
@@ -146,7 +146,7 @@ void neogeo_samsho5_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_K2K2_SAMSHO5SP_CART = &device_creator<neogeo_samsho5sp_cart>;
-neogeo_samsho5sp_cart::neogeo_samsho5sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_samsho5sp_cart::neogeo_samsho5sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_kof2k2type_cart(mconfig, NEOGEO_K2K2_SAMSHO5SP_CART, "Neo Geo Samurai Shodown 5 Special Cart", tag, owner, clock, "neocart_samsh5sp", __FILE__)
{}
diff --git a/src/devices/bus/neogeo/kof2k2.h b/src/devices/bus/neogeo/kof2k2.h
index d1939db17c3..067ffcd38f9 100644
--- a/src/devices/bus/neogeo/kof2k2.h
+++ b/src/devices/bus/neogeo/kof2k2.h
@@ -15,8 +15,8 @@ class neogeo_kof2k2type_cart : public neogeo_rom_device
{
public:
// construction/destruction
- neogeo_kof2k2type_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_kof2k2type_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_kof2k2type_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source);
+ neogeo_kof2k2type_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock);
// device-level overrides
virtual void device_start() override;
@@ -46,7 +46,7 @@ extern const device_type NEOGEO_K2K2_CART;
class neogeo_kof2002_cart : public neogeo_kof2k2type_cart
{
public:
- neogeo_kof2002_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kof2002_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
};
@@ -58,7 +58,7 @@ extern const device_type NEOGEO_K2K2_KOF2002_CART;
class neogeo_kf2k2pls_cart : public neogeo_kof2k2type_cart
{
public:
- neogeo_kf2k2pls_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kf2k2pls_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
};
@@ -73,7 +73,7 @@ extern const device_type NEOGEO_K2K2_KF2K2PLS_CART;
class neogeo_matrim_cart : public neogeo_kof2k2type_cart
{
public:
- neogeo_matrim_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_matrim_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 2; }
};
@@ -88,7 +88,7 @@ extern const device_type NEOGEO_K2K2_MATRIM_CART;
class neogeo_samsho5_cart : public neogeo_kof2k2type_cart
{
public:
- neogeo_samsho5_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_samsho5_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -103,7 +103,7 @@ extern const device_type NEOGEO_K2K2_SAMSHO5_CART;
class neogeo_samsho5sp_cart : public neogeo_kof2k2type_cart
{
public:
- neogeo_samsho5sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_samsho5sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
diff --git a/src/devices/bus/neogeo/kof98.cpp b/src/devices/bus/neogeo/kof98.cpp
index 38bd2445d96..1f7c5559ae0 100644
--- a/src/devices/bus/neogeo/kof98.cpp
+++ b/src/devices/bus/neogeo/kof98.cpp
@@ -19,7 +19,7 @@
const device_type NEOGEO_KOF98_CART = &device_creator<neogeo_kof98_cart>;
-neogeo_kof98_cart::neogeo_kof98_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) :
+neogeo_kof98_cart::neogeo_kof98_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) :
neogeo_rom_device(mconfig, NEOGEO_KOF98_CART, "Neo Geo KOF 98 Cart", tag, owner, clock, "neocart_kof98", __FILE__),
m_prot(*this, "kof98_prot")
{}
diff --git a/src/devices/bus/neogeo/kof98.h b/src/devices/bus/neogeo/kof98.h
index 2d51c77d9b3..fba3e40ff38 100644
--- a/src/devices/bus/neogeo/kof98.h
+++ b/src/devices/bus/neogeo/kof98.h
@@ -13,7 +13,7 @@ class neogeo_kof98_cart : public neogeo_rom_device
{
public:
// construction/destruction
- neogeo_kof98_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_kof98_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/neogeo/mslugx.cpp b/src/devices/bus/neogeo/mslugx.cpp
index b3b83fae1f7..85dcab3ddc9 100644
--- a/src/devices/bus/neogeo/mslugx.cpp
+++ b/src/devices/bus/neogeo/mslugx.cpp
@@ -19,7 +19,7 @@
const device_type NEOGEO_MSLUGX_CART = &device_creator<neogeo_mslugx_cart>;
-neogeo_mslugx_cart::neogeo_mslugx_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) :
+neogeo_mslugx_cart::neogeo_mslugx_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) :
neogeo_rom_device(mconfig, NEOGEO_MSLUGX_CART, "Neo Geo Metal Slug X Cart", tag, owner, clock, "neocart_mslugx", __FILE__),
m_prot(*this, "mslugx_prot")
{}
diff --git a/src/devices/bus/neogeo/mslugx.h b/src/devices/bus/neogeo/mslugx.h
index bdde18f6972..20a144917d9 100644
--- a/src/devices/bus/neogeo/mslugx.h
+++ b/src/devices/bus/neogeo/mslugx.h
@@ -13,7 +13,7 @@ class neogeo_mslugx_cart : public neogeo_rom_device
{
public:
// construction/destruction
- neogeo_mslugx_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_mslugx_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/neogeo/pcm2.cpp b/src/devices/bus/neogeo/pcm2.cpp
index a83cd966cb8..e49ebd06261 100644
--- a/src/devices/bus/neogeo/pcm2.cpp
+++ b/src/devices/bus/neogeo/pcm2.cpp
@@ -19,13 +19,13 @@
const device_type NEOGEO_PCM2_CART = &device_creator<neogeo_pcm2_cart>;
-neogeo_pcm2_cart::neogeo_pcm2_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) :
+neogeo_pcm2_cart::neogeo_pcm2_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) :
neogeo_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_cmc_prot(*this, "cmc_prot"),
m_pcm2_prot(*this, "pcm2_prot")
{}
-neogeo_pcm2_cart::neogeo_pcm2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) :
+neogeo_pcm2_cart::neogeo_pcm2_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) :
neogeo_rom_device(mconfig, NEOGEO_PCM2_CART, "Neo Geo PCM2 Cart", tag, owner, clock, "neocart_pcm2", __FILE__),
m_cmc_prot(*this, "cmc_prot"),
m_pcm2_prot(*this, "pcm2_prot")
@@ -66,7 +66,7 @@ machine_config_constructor neogeo_pcm2_cart::device_mconfig_additions() const
const device_type NEOGEO_PCM2_MSLUG4_CART = &device_creator<neogeo_pcm2_mslug4_cart>;
-neogeo_pcm2_mslug4_cart::neogeo_pcm2_mslug4_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_pcm2_mslug4_cart::neogeo_pcm2_mslug4_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_MSLUG4_CART, "Neo Geo Metal Slug 4 PCM2 Cart", tag, owner, clock, "neocart_mslug4", __FILE__)
{}
@@ -85,7 +85,7 @@ void neogeo_pcm2_mslug4_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_PCM2_MS4PLUS_CART = &device_creator<neogeo_pcm2_ms4plus_cart>;
-neogeo_pcm2_ms4plus_cart::neogeo_pcm2_ms4plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_pcm2_ms4plus_cart::neogeo_pcm2_ms4plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_MS4PLUS_CART, "Neo Geo Metal Slug 4 Plus PCM2 Cart", tag, owner, clock, "neocart_ms4plus", __FILE__)
{}
@@ -103,7 +103,7 @@ void neogeo_pcm2_ms4plus_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_PCM2_ROTD_CART = &device_creator<neogeo_pcm2_rotd_cart>;
-neogeo_pcm2_rotd_cart::neogeo_pcm2_rotd_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_pcm2_rotd_cart::neogeo_pcm2_rotd_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_ROTD_CART, "Neo Geo Rage of the Dragon PCM2 Cart", tag, owner, clock, "neocart_rotd", __FILE__)
{}
@@ -121,7 +121,7 @@ void neogeo_pcm2_rotd_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_PCM2_PNYAA_CART = &device_creator<neogeo_pcm2_pnyaa_cart>;
-neogeo_pcm2_pnyaa_cart::neogeo_pcm2_pnyaa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_pcm2_pnyaa_cart::neogeo_pcm2_pnyaa_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_pcm2_cart(mconfig, NEOGEO_PCM2_PNYAA_CART, "Neo Geo Pnyaa PCM2 Cart", tag, owner, clock, "neocart_pnyaa", __FILE__)
{}
diff --git a/src/devices/bus/neogeo/pcm2.h b/src/devices/bus/neogeo/pcm2.h
index fff3408eae3..30d5d627842 100644
--- a/src/devices/bus/neogeo/pcm2.h
+++ b/src/devices/bus/neogeo/pcm2.h
@@ -14,8 +14,8 @@ class neogeo_pcm2_cart : public neogeo_rom_device
{
public:
// construction/destruction
- neogeo_pcm2_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_pcm2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_pcm2_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source);
+ neogeo_pcm2_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock);
// device-level overrides
virtual void device_start() override;
@@ -44,7 +44,7 @@ extern const device_type NEOGEO_PCM2_CART;
class neogeo_pcm2_mslug4_cart : public neogeo_pcm2_cart
{
public:
- neogeo_pcm2_mslug4_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_pcm2_mslug4_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -59,7 +59,7 @@ extern const device_type NEOGEO_PCM2_MSLUG4_CART;
class neogeo_pcm2_ms4plus_cart : public neogeo_pcm2_cart
{
public:
- neogeo_pcm2_ms4plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_pcm2_ms4plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
};
@@ -74,7 +74,7 @@ extern const device_type NEOGEO_PCM2_MS4PLUS_CART;
class neogeo_pcm2_rotd_cart : public neogeo_pcm2_cart
{
public:
- neogeo_pcm2_rotd_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_pcm2_rotd_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -89,7 +89,7 @@ extern const device_type NEOGEO_PCM2_ROTD_CART;
class neogeo_pcm2_pnyaa_cart : public neogeo_pcm2_cart
{
public:
- neogeo_pcm2_pnyaa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_pcm2_pnyaa_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
diff --git a/src/devices/bus/neogeo/prot_cmc.cpp b/src/devices/bus/neogeo/prot_cmc.cpp
index 41aabd2447f..a08f9ede36b 100644
--- a/src/devices/bus/neogeo/prot_cmc.cpp
+++ b/src/devices/bus/neogeo/prot_cmc.cpp
@@ -7,7 +7,7 @@
extern const device_type CMC_PROT = &device_creator<cmc_prot_device>;
-cmc_prot_device::cmc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cmc_prot_device::cmc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CMC_PROT, "Neo Geo CMC42 & CMC50 Protection", tag, owner, clock, "cmc_prot", __FILE__),
type0_t03(nullptr),
type0_t12(nullptr),
@@ -89,7 +89,7 @@ analyzed, quickly leading to the algorithm.
***************************************************************************/
-static const UINT8 kof99_type0_t03[256] =
+static const uint8_t kof99_type0_t03[256] =
{
0xfb, 0x86, 0x9d, 0xf1, 0xbf, 0x80, 0xd5, 0x43, 0xab, 0xb3, 0x9f, 0x6a, 0x33, 0xd9, 0xdb, 0xb6,
0x66, 0x08, 0x69, 0x88, 0xcc, 0xb7, 0xde, 0x49, 0x97, 0x64, 0x1f, 0xa6, 0xc0, 0x2f, 0x52, 0x42,
@@ -110,7 +110,7 @@ static const UINT8 kof99_type0_t03[256] =
};
-static const UINT8 kof99_type0_t12[256] =
+static const uint8_t kof99_type0_t12[256] =
{
0x1f, 0xac, 0x4d, 0xcd, 0xca, 0x70, 0x02, 0x6b, 0x18, 0x40, 0x62, 0xb2, 0x3f, 0x9b, 0x5b, 0xef,
0x69, 0x68, 0x71, 0x3b, 0xcb, 0xd4, 0x30, 0xbc, 0x47, 0x72, 0x74, 0x5e, 0x84, 0x4c, 0x1b, 0xdb,
@@ -131,7 +131,7 @@ static const UINT8 kof99_type0_t12[256] =
};
-static const UINT8 kof99_type1_t03[256] =
+static const uint8_t kof99_type1_t03[256] =
{
0xa9, 0x17, 0xaf, 0x0d, 0x34, 0x6e, 0x53, 0xb6, 0x7f, 0x58, 0xe9, 0x14, 0x5f, 0x55, 0xdb, 0xd4,
0x42, 0x80, 0x99, 0x59, 0xa8, 0x3a, 0x57, 0x5d, 0xd5, 0x6f, 0x4c, 0x68, 0x35, 0x46, 0xa6, 0xe7,
@@ -152,7 +152,7 @@ static const UINT8 kof99_type1_t03[256] =
};
-static const UINT8 kof99_type1_t12[256] =
+static const uint8_t kof99_type1_t12[256] =
{
0xea, 0xe6, 0x5e, 0xa7, 0x8e, 0xac, 0x34, 0x03, 0x30, 0x97, 0x52, 0x53, 0x76, 0xf2, 0x62, 0x0b,
0x0a, 0xfc, 0x94, 0xb8, 0x67, 0x36, 0x11, 0xbc, 0xae, 0xca, 0xfa, 0x15, 0x04, 0x2b, 0x17, 0xc4,
@@ -175,7 +175,7 @@ static const UINT8 kof99_type1_t12[256] =
/* underlined values are wrong (not enough evidence, FF fill in kof99 and garou) */
/* they correspond to tiles 7d000-7efff */
-static const UINT8 kof99_address_8_15_xor1[256] =
+static const uint8_t kof99_address_8_15_xor1[256] =
{
0x00, 0xb1, 0x1e, 0xc5, 0x3d, 0x40, 0x45, 0x5e, 0xf2, 0xf8, 0x04, 0x63, 0x36, 0x87, 0x88, 0xbf,
0xab, 0xcc, 0x78, 0x08, 0xdd, 0x20, 0xd4, 0x35, 0x09, 0x8e, 0x44, 0xae, 0x33, 0xa9, 0x9e, 0xcd,
@@ -197,7 +197,7 @@ static const UINT8 kof99_address_8_15_xor1[256] =
};
-static const UINT8 kof99_address_8_15_xor2[256] =
+static const uint8_t kof99_address_8_15_xor2[256] =
{
0x9b, 0x9d, 0xc1, 0x3d, 0xa9, 0xb8, 0xf4, 0x6f, 0xf6, 0x25, 0xc7, 0x47, 0xd5, 0x97, 0xdf, 0x6b,
0xeb, 0x90, 0xa4, 0xb2, 0x5d, 0xf5, 0x66, 0xb0, 0xb9, 0x8b, 0x93, 0x64, 0xec, 0x7b, 0x65, 0x8c,
@@ -218,7 +218,7 @@ static const UINT8 kof99_address_8_15_xor2[256] =
};
-static const UINT8 kof99_address_16_23_xor1[256] =
+static const uint8_t kof99_address_16_23_xor1[256] =
{
0x00, 0x5f, 0x03, 0x52, 0xce, 0xe3, 0x7d, 0x8f, 0x6b, 0xf8, 0x20, 0xde, 0x7b, 0x7e, 0x39, 0xbe,
0xf5, 0x94, 0x18, 0x78, 0x80, 0xc9, 0x7f, 0x7a, 0x3e, 0x63, 0xf2, 0xe0, 0x4e, 0xf7, 0x87, 0x27,
@@ -239,7 +239,7 @@ static const UINT8 kof99_address_16_23_xor1[256] =
};
-static const UINT8 kof99_address_16_23_xor2[256] =
+static const uint8_t kof99_address_16_23_xor2[256] =
{
0x29, 0x97, 0x1a, 0x2c, 0x0b, 0x94, 0x3e, 0x75, 0x01, 0x0d, 0x1b, 0xe1, 0x4d, 0x38, 0x39, 0x8f,
0xe7, 0xd0, 0x60, 0x90, 0xb2, 0x0f, 0xbb, 0x70, 0x1f, 0xe6, 0x5b, 0x87, 0xb4, 0x43, 0xfd, 0xf5,
@@ -260,7 +260,7 @@ static const UINT8 kof99_address_16_23_xor2[256] =
};
-static const UINT8 kof99_address_0_7_xor[256] =
+static const uint8_t kof99_address_0_7_xor[256] =
{
0x74, 0xad, 0x5d, 0x1d, 0x9e, 0xc3, 0xfa, 0x4e, 0xf7, 0xdb, 0xca, 0xa2, 0x64, 0x36, 0x56, 0x0c,
0x4f, 0xcf, 0x43, 0x66, 0x1e, 0x91, 0xe3, 0xa5, 0x58, 0xc2, 0xc1, 0xd4, 0xb9, 0xdd, 0x76, 0x16,
@@ -281,7 +281,7 @@ static const UINT8 kof99_address_0_7_xor[256] =
};
-static const UINT8 kof2000_type0_t03[256] =
+static const uint8_t kof2000_type0_t03[256] =
{
0x10, 0x61, 0xf1, 0x78, 0x85, 0x52, 0x68, 0xe3, 0x12, 0x0d, 0xfa, 0xf0, 0xc9, 0x36, 0x5e, 0x3d,
0xf9, 0xa6, 0x01, 0x2e, 0xc7, 0x84, 0xea, 0x2b, 0x6d, 0x14, 0x38, 0x4f, 0x55, 0x1c, 0x9d, 0xa7,
@@ -302,7 +302,7 @@ static const UINT8 kof2000_type0_t03[256] =
};
-static const UINT8 kof2000_type0_t12[256] =
+static const uint8_t kof2000_type0_t12[256] =
{
0xf4, 0x28, 0xb4, 0x8f, 0xfa, 0xeb, 0x8e, 0x54, 0x2b, 0x49, 0xd1, 0x76, 0x71, 0x47, 0x8b, 0x57,
0x92, 0x85, 0x7c, 0xb8, 0x5c, 0x22, 0xf9, 0x26, 0xbc, 0x5b, 0x6d, 0x67, 0xae, 0x5f, 0x6f, 0xf5,
@@ -323,7 +323,7 @@ static const UINT8 kof2000_type0_t12[256] =
};
-static const UINT8 kof2000_type1_t03[256] =
+static const uint8_t kof2000_type1_t03[256] =
{
0x9a, 0x2f, 0xcc, 0x4e, 0x40, 0x69, 0xac, 0xca, 0xa5, 0x7b, 0x0a, 0x61, 0x91, 0x0d, 0x55, 0x74,
0xcd, 0x8b, 0x0b, 0x80, 0x09, 0x5e, 0x38, 0xc7, 0xda, 0xbf, 0xf5, 0x37, 0x23, 0x31, 0x33, 0xe9,
@@ -344,7 +344,7 @@ static const UINT8 kof2000_type1_t03[256] =
};
-static const UINT8 kof2000_type1_t12[256] =
+static const uint8_t kof2000_type1_t12[256] =
{
0xda, 0xa7, 0xd6, 0x6e, 0x2f, 0x5e, 0xf0, 0x3f, 0xa4, 0xce, 0xd3, 0xfd, 0x46, 0x2a, 0xac, 0xc9,
0xbe, 0xeb, 0x9f, 0xd5, 0x3c, 0x61, 0x96, 0x11, 0xd0, 0x38, 0xca, 0x06, 0xed, 0x1b, 0x65, 0xe7,
@@ -365,7 +365,7 @@ static const UINT8 kof2000_type1_t12[256] =
};
-static const UINT8 kof2000_address_8_15_xor1[256] =
+static const uint8_t kof2000_address_8_15_xor1[256] =
{
0xfc, 0x9b, 0x1c, 0x35, 0x72, 0x53, 0xd6, 0x7d, 0x84, 0xa4, 0xc5, 0x93, 0x7b, 0xe7, 0x47, 0xd5,
0x24, 0xa2, 0xfa, 0x19, 0x0c, 0xb1, 0x8c, 0xb9, 0x9d, 0xd8, 0x59, 0x4f, 0x3c, 0xb2, 0x78, 0x4a,
@@ -386,7 +386,7 @@ static const UINT8 kof2000_address_8_15_xor1[256] =
};
-static const UINT8 kof2000_address_8_15_xor2[256] =
+static const uint8_t kof2000_address_8_15_xor2[256] =
{
0x00, 0xbe, 0x06, 0x5a, 0xfa, 0x42, 0x15, 0xf2, 0x3f, 0x0a, 0x84, 0x93, 0x4e, 0x78, 0x3b, 0x89,
0x32, 0x98, 0xa2, 0x87, 0x73, 0xdd, 0x26, 0xe5, 0x05, 0x71, 0x08, 0x6e, 0x9b, 0xe0, 0xdf, 0x9e,
@@ -407,7 +407,7 @@ static const UINT8 kof2000_address_8_15_xor2[256] =
};
-static const UINT8 kof2000_address_16_23_xor1[256] =
+static const uint8_t kof2000_address_16_23_xor1[256] =
{
0x45, 0x9f, 0x6e, 0x2f, 0x28, 0xbc, 0x5e, 0x6d, 0xda, 0xb5, 0x0d, 0xb8, 0xc0, 0x8e, 0xa2, 0x32,
0xee, 0xcd, 0x8d, 0x48, 0x8c, 0x27, 0x14, 0xeb, 0x65, 0xd7, 0xf2, 0x93, 0x99, 0x90, 0x91, 0xfc,
@@ -428,7 +428,7 @@ static const UINT8 kof2000_address_16_23_xor1[256] =
};
-static const UINT8 kof2000_address_16_23_xor2[256] =
+static const uint8_t kof2000_address_16_23_xor2[256] =
{
0x00, 0xb8, 0xf0, 0x34, 0xca, 0x21, 0x3c, 0xf9, 0x01, 0x8e, 0x75, 0x70, 0xec, 0x13, 0x27, 0x96,
0xf4, 0x5b, 0x88, 0x1f, 0xeb, 0x4a, 0x7d, 0x9d, 0xbe, 0x02, 0x14, 0xaf, 0xa2, 0x06, 0xc6, 0xdb,
@@ -449,7 +449,7 @@ static const UINT8 kof2000_address_16_23_xor2[256] =
};
-static const UINT8 kof2000_address_0_7_xor[256] =
+static const uint8_t kof2000_address_0_7_xor[256] =
{
0x26, 0x48, 0x06, 0x9b, 0x21, 0xa9, 0x1b, 0x76, 0xc9, 0xf8, 0xb4, 0x67, 0xe4, 0xff, 0x99, 0xf7,
0x15, 0x9e, 0x62, 0x00, 0x72, 0x4d, 0xa0, 0x4f, 0x02, 0xf1, 0xea, 0xef, 0x0b, 0xf3, 0xeb, 0xa6,
@@ -471,15 +471,15 @@ static const UINT8 kof2000_address_0_7_xor[256] =
-void cmc_prot_device::decrypt(UINT8 *r0, UINT8 *r1,
- UINT8 c0, UINT8 c1,
- const UINT8 *table0hi,
- const UINT8 *table0lo,
- const UINT8 *table1,
+void cmc_prot_device::decrypt(uint8_t *r0, uint8_t *r1,
+ uint8_t c0, uint8_t c1,
+ const uint8_t *table0hi,
+ const uint8_t *table0lo,
+ const uint8_t *table1,
int base,
int invert)
{
- UINT8 tmp, xor0, xor1;
+ uint8_t tmp, xor0, xor1;
tmp = table1[(base & 0xff) ^ address_0_7_xor[(base >> 8) & 0xff]];
xor0 = (table0hi[(base >> 8) & 0xff] & 0xfe) | (tmp & 0x01);
@@ -498,10 +498,10 @@ void cmc_prot_device::decrypt(UINT8 *r0, UINT8 *r1,
}
-void cmc_prot_device::gfx_decrypt(UINT8* rom, UINT32 rom_size, int extra_xor)
+void cmc_prot_device::gfx_decrypt(uint8_t* rom, uint32_t rom_size, int extra_xor)
{
int rpos;
- std::vector<UINT8> buf(rom_size);
+ std::vector<uint8_t> buf(rom_size);
// Data xor
for (rpos = 0; rpos < rom_size/4; rpos++)
@@ -552,7 +552,7 @@ void cmc_prot_device::gfx_decrypt(UINT8* rom, UINT32 rom_size, int extra_xor)
/* CMC42 protection chip */
-void cmc_prot_device::cmc42_gfx_decrypt(UINT8* rom, UINT32 rom_size, int extra_xor)
+void cmc_prot_device::cmc42_gfx_decrypt(uint8_t* rom, uint32_t rom_size, int extra_xor)
{
type0_t03 = kof99_type0_t03;
type0_t12 = kof99_type0_t12;
@@ -567,7 +567,7 @@ void cmc_prot_device::cmc42_gfx_decrypt(UINT8* rom, UINT32 rom_size, int extra_x
}
// REMOVE ME!!!!
-void cmc_prot_device::kof99_neogeo_gfx_decrypt(UINT8* rom, UINT32 rom_size, UINT8* fixed, UINT32 fixed_size, int extra_xor)
+void cmc_prot_device::kof99_neogeo_gfx_decrypt(uint8_t* rom, uint32_t rom_size, uint8_t* fixed, uint32_t fixed_size, int extra_xor)
{
cmc42_gfx_decrypt(rom, rom_size, extra_xor);
sfix_decrypt(rom, rom_size, fixed, fixed_size);
@@ -575,7 +575,7 @@ void cmc_prot_device::kof99_neogeo_gfx_decrypt(UINT8* rom, UINT32 rom_size, UINT
/* CMC50 protection chip */
-void cmc_prot_device::cmc50_gfx_decrypt(UINT8* rom, UINT32 rom_size, int extra_xor)
+void cmc_prot_device::cmc50_gfx_decrypt(uint8_t* rom, uint32_t rom_size, int extra_xor)
{
type0_t03 = kof2000_type0_t03;
type0_t12 = kof2000_type0_t12;
@@ -592,7 +592,7 @@ void cmc_prot_device::cmc50_gfx_decrypt(UINT8* rom, UINT32 rom_size, int extra_x
// REMOVE ME!!!!
-void cmc_prot_device::kof2000_neogeo_gfx_decrypt(UINT8* rom, UINT32 rom_size, UINT8* fixed, UINT32 fixed_size, int extra_xor)
+void cmc_prot_device::kof2000_neogeo_gfx_decrypt(uint8_t* rom, uint32_t rom_size, uint8_t* fixed, uint32_t fixed_size, int extra_xor)
{
cmc50_gfx_decrypt(rom, rom_size, extra_xor);
sfix_decrypt(rom, rom_size, fixed, fixed_size);
@@ -601,11 +601,11 @@ void cmc_prot_device::kof2000_neogeo_gfx_decrypt(UINT8* rom, UINT32 rom_size, UI
/* the S data comes from the end of the C data */
-void cmc_prot_device::sfix_decrypt(UINT8* rom, UINT32 rom_size, UINT8* fixed, UINT32 fixed_size)
+void cmc_prot_device::sfix_decrypt(uint8_t* rom, uint32_t rom_size, uint8_t* fixed, uint32_t fixed_size)
{
int tx_size = fixed_size;
- UINT8 *src = rom + rom_size - tx_size;
- UINT8 *dst = fixed;
+ uint8_t *src = rom + rom_size - tx_size;
+ uint8_t *dst = fixed;
for (int i = 0; i < tx_size; i++)
dst[i] = src[(i & ~0x1f) + ((i & 7) << 2) + ((~i & 8) >> 2) + ((i & 0x10) >> 4)];
@@ -620,7 +620,7 @@ NeoGeo 'M' ROM encryption
***************************************************************************/
-static const UINT8 m1_address_8_15_xor[256] =
+static const uint8_t m1_address_8_15_xor[256] =
{
0x0a, 0x72, 0xb7, 0xaf, 0x67, 0xde, 0x1d, 0xb1, 0x78, 0xc4, 0x4f, 0xb5, 0x4b, 0x18, 0x76, 0xdd,
0x11, 0xe2, 0x36, 0xa1, 0x82, 0x03, 0x98, 0xa0, 0x10, 0x5f, 0x3f, 0xd6, 0x1f, 0x90, 0x6a, 0x0b,
@@ -640,7 +640,7 @@ static const UINT8 m1_address_8_15_xor[256] =
0x7d, 0x1a, 0x02, 0x65, 0x54, 0x5e, 0x19, 0xcc, 0xdc, 0xdb, 0x73, 0xed, 0xad, 0x59, 0x2f, 0xa3,
};
-static const UINT8 m1_address_0_7_xor[256] =
+static const uint8_t m1_address_0_7_xor[256] =
{
0xf4, 0xbc, 0x02, 0xf7, 0x2c, 0x3d, 0xe8, 0xd9, 0x50, 0x62, 0xec, 0xbd, 0x53, 0x73, 0x79, 0x61,
0x00, 0x34, 0xcf, 0xa2, 0x63, 0x28, 0x90, 0xaf, 0x44, 0x3b, 0xc5, 0x8d, 0x3a, 0x46, 0x07, 0x70,
@@ -663,9 +663,9 @@ static const UINT8 m1_address_0_7_xor[256] =
/* The CMC50 hardware does a checksum of the first 64kb of the M1 rom, and
uses this checksum as the basis of the key with which to decrypt the rom */
-UINT16 cmc_prot_device::generate_cs16(UINT8 *rom, int size)
+uint16_t cmc_prot_device::generate_cs16(uint8_t *rom, int size)
{
- UINT16 cs16 = 0x0000;
+ uint16_t cs16 = 0x0000;
for (int i = 0; i < size; i++)
cs16 += rom[i];
@@ -673,7 +673,7 @@ UINT16 cmc_prot_device::generate_cs16(UINT8 *rom, int size)
}
-int cmc_prot_device::m1_address_scramble(int address, UINT16 key)
+int cmc_prot_device::m1_address_scramble(int address, uint16_t key)
{
const int p1[8][16] = {
{15,14,10,7,1,2,3,8,0,12,11,13,6,9,5,4},
@@ -703,19 +703,19 @@ int cmc_prot_device::m1_address_scramble(int address, UINT16 key)
}
-void cmc_prot_device::cmc50_m1_decrypt(UINT8* romcrypt, UINT32 romcrypt_size, UINT8* romaudio, UINT32 romaudio_size)
+void cmc_prot_device::cmc50_m1_decrypt(uint8_t* romcrypt, uint32_t romcrypt_size, uint8_t* romaudio, uint32_t romaudio_size)
{
- UINT8* rom = romcrypt;
+ uint8_t* rom = romcrypt;
size_t rom_size = 0x80000;
- UINT8* rom2 = romaudio;
+ uint8_t* rom2 = romaudio;
- std::vector<UINT8> buffer(rom_size);
+ std::vector<uint8_t> buffer(rom_size);
- UINT16 key = generate_cs16(rom, 0x10000);
+ uint16_t key = generate_cs16(rom, 0x10000);
//printf("key %04x\n",key);
- for (UINT32 i = 0; i < rom_size; i++)
+ for (uint32_t i = 0; i < rom_size; i++)
buffer[i] = rom[m1_address_scramble(i,key)];
memcpy(rom, &buffer[0], rom_size);
diff --git a/src/devices/bus/neogeo/prot_cmc.h b/src/devices/bus/neogeo/prot_cmc.h
index 2b5a8e36b07..31e4262f70d 100644
--- a/src/devices/bus/neogeo/prot_cmc.h
+++ b/src/devices/bus/neogeo/prot_cmc.h
@@ -44,41 +44,41 @@ class cmc_prot_device : public device_t
{
public:
// construction/destruction
- cmc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cmc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- void decrypt(UINT8 *r0, UINT8 *r1,
- UINT8 c0, UINT8 c1,
- const UINT8 *table0hi,
- const UINT8 *table0lo,
- const UINT8 *table1,
+ void decrypt(uint8_t *r0, uint8_t *r1,
+ uint8_t c0, uint8_t c1,
+ const uint8_t *table0hi,
+ const uint8_t *table0lo,
+ const uint8_t *table1,
int base,
int invert);
- void gfx_decrypt(UINT8* rom, UINT32 rom_size, int extra_xor);
- void kof99_neogeo_gfx_decrypt(UINT8* rom, UINT32 rom_size, UINT8* fixed, UINT32 fixed_size, int extra_xor);
- void kof2000_neogeo_gfx_decrypt(UINT8* rom, UINT32 rom_size, UINT8* fixed, UINT32 fixed_size, int extra_xor);
- void cmc42_gfx_decrypt(UINT8* rom, UINT32 rom_size, int extra_xor);
- void cmc50_gfx_decrypt(UINT8* rom, UINT32 rom_size, int extra_xor);
+ void gfx_decrypt(uint8_t* rom, uint32_t rom_size, int extra_xor);
+ void kof99_neogeo_gfx_decrypt(uint8_t* rom, uint32_t rom_size, uint8_t* fixed, uint32_t fixed_size, int extra_xor);
+ void kof2000_neogeo_gfx_decrypt(uint8_t* rom, uint32_t rom_size, uint8_t* fixed, uint32_t fixed_size, int extra_xor);
+ void cmc42_gfx_decrypt(uint8_t* rom, uint32_t rom_size, int extra_xor);
+ void cmc50_gfx_decrypt(uint8_t* rom, uint32_t rom_size, int extra_xor);
- void sfix_decrypt(UINT8* rom, UINT32 rom_size, UINT8* fixed, UINT32 fixed_size);
+ void sfix_decrypt(uint8_t* rom, uint32_t rom_size, uint8_t* fixed, uint32_t fixed_size);
- UINT16 generate_cs16(UINT8 *rom, int size);
- int m1_address_scramble(int address, UINT16 key);
- void cmc50_m1_decrypt(UINT8* romcrypt, UINT32 romcrypt_size, UINT8* romaudio, UINT32 romaudio_size);
+ uint16_t generate_cs16(uint8_t *rom, int size);
+ int m1_address_scramble(int address, uint16_t key);
+ void cmc50_m1_decrypt(uint8_t* romcrypt, uint32_t romcrypt_size, uint8_t* romaudio, uint32_t romaudio_size);
protected:
virtual void device_start() override;
virtual void device_reset() override;
- const UINT8 *type0_t03;
- const UINT8 *type0_t12;
- const UINT8 *type1_t03;
- const UINT8 *type1_t12;
- const UINT8 *address_8_15_xor1;
- const UINT8 *address_8_15_xor2;
- const UINT8 *address_16_23_xor1;
- const UINT8 *address_16_23_xor2;
- const UINT8 *address_0_7_xor;
+ const uint8_t *type0_t03;
+ const uint8_t *type0_t12;
+ const uint8_t *type1_t03;
+ const uint8_t *type1_t12;
+ const uint8_t *address_8_15_xor1;
+ const uint8_t *address_8_15_xor2;
+ const uint8_t *address_16_23_xor1;
+ const uint8_t *address_16_23_xor2;
+ const uint8_t *address_0_7_xor;
};
#endif
diff --git a/src/devices/bus/neogeo/prot_cthd.cpp b/src/devices/bus/neogeo/prot_cthd.cpp
index a6ccee1a56d..f94993d1228 100644
--- a/src/devices/bus/neogeo/prot_cthd.cpp
+++ b/src/devices/bus/neogeo/prot_cthd.cpp
@@ -7,7 +7,7 @@
extern const device_type CTHD_PROT = &device_creator<cthd_prot_device>;
-cthd_prot_device::cthd_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cthd_prot_device::cthd_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CTHD_PROT, "Neo Geo CTHD Protection (Bootleg)", tag, owner, clock, "cthd_prot", __FILE__)
{}
@@ -31,12 +31,12 @@ void cthd_prot_device::device_reset()
**************************/
// descrambling information from razoola
-void cthd_prot_device::fix_do(UINT8* sprrom, UINT32 sprrom_size, int start, int end, int bit3shift, int bit2shift, int bit1shift, int bit0shift)
+void cthd_prot_device::fix_do(uint8_t* sprrom, uint32_t sprrom_size, int start, int end, int bit3shift, int bit2shift, int bit1shift, int bit0shift)
{
int tilesize = 128;
- std::vector<UINT8> rom(16 * tilesize); // 16 tiles buffer
- UINT8* realrom = sprrom + start * tilesize;
+ std::vector<uint8_t> rom(16 * tilesize); // 16 tiles buffer
+ uint8_t* realrom = sprrom + start * tilesize;
for (int i = 0; i < (end-start)/16; i++)
{
@@ -53,7 +53,7 @@ void cthd_prot_device::fix_do(UINT8* sprrom, UINT32 sprrom_size, int start, int
}
}
-void cthd_prot_device::gfx_address_fix(UINT8* sprrom, UINT32 sprrom_size, int start, int end)
+void cthd_prot_device::gfx_address_fix(uint8_t* sprrom, uint32_t sprrom_size, int start, int end)
{
fix_do(sprrom, sprrom_size, start + 512 * 0, end + 512 * 0, 0,3,2,1);
fix_do(sprrom, sprrom_size, start + 512 * 1, end + 512 * 1, 1,0,3,2);
@@ -64,7 +64,7 @@ void cthd_prot_device::gfx_address_fix(UINT8* sprrom, UINT32 sprrom_size, int st
fix_do(sprrom, sprrom_size, start + 512 * 7, end + 512 * 7, 0,2,3,1);
}
-void cthd_prot_device::cthd2003_c(UINT8* sprrom, UINT32 sprrom_size, int pow)
+void cthd_prot_device::cthd2003_c(uint8_t* sprrom, uint32_t sprrom_size, int pow)
{
for (int i = 0; i <= 192; i += 8)
gfx_address_fix(sprrom, sprrom_size, i * 512, i * 512 + 512);
@@ -91,10 +91,10 @@ void cthd_prot_device::cthd2003_c(UINT8* sprrom, UINT32 sprrom_size, int pow)
**************************/
-void cthd_prot_device::decrypt_cthd2003(UINT8* sprrom, UINT32 sprrom_size, UINT8* audiorom, UINT32 audiorom_size, UINT8* fixedrom, UINT32 fixedrom_size)
+void cthd_prot_device::decrypt_cthd2003(uint8_t* sprrom, uint32_t sprrom_size, uint8_t* audiorom, uint32_t audiorom_size, uint8_t* fixedrom, uint32_t fixedrom_size)
{
- UINT8 *romdata = fixedrom;
- std::vector<UINT8> tmp(8 * 128 * 128);
+ uint8_t *romdata = fixedrom;
+ std::vector<uint8_t> tmp(8 * 128 * 128);
memcpy(&tmp[8 * 0 * 128], romdata + 8 * 0 * 128, 8 * 32 * 128);
memcpy(&tmp[8 * 32 * 128], romdata + 8 * 64 * 128, 8 * 32 * 128);
@@ -132,17 +132,17 @@ WRITE16_MEMBER( ngbootleg_prot_device::cthd2003_bankswitch_w )
}
*/
-UINT32 cthd_prot_device::get_bank_base(UINT16 sel)
+uint32_t cthd_prot_device::get_bank_base(uint16_t sel)
{
static const int cthd2003_banks[8] = { 1, 0, 1, 0, 1, 0, 3, 2 };
return (cthd2003_banks[sel & 7] + 1) * 0x100000;
}
-void cthd_prot_device::patch_cthd2003(UINT8* cpurom, UINT32 cpurom_size)
+void cthd_prot_device::patch_cthd2003(uint8_t* cpurom, uint32_t cpurom_size)
{
// patches thanks to razoola
- UINT16 *mem16 = (UINT16 *)cpurom;
+ uint16_t *mem16 = (uint16_t *)cpurom;
// theres still a problem on the character select screen but it seems to be related to cpu core timing issues,
// overclocking the 68k prevents it.
@@ -178,11 +178,11 @@ void cthd_prot_device::patch_cthd2003(UINT8* cpurom, UINT32 cpurom_size)
/* Crouching Tiger Hidden Dragon 2003 Super Plus (bootleg of King of Fighters 2001) */
-void cthd_prot_device::ct2k3sp_sx_decrypt( UINT8* fixedrom, UINT32 fixedrom_size )
+void cthd_prot_device::ct2k3sp_sx_decrypt( uint8_t* fixedrom, uint32_t fixedrom_size )
{
int rom_size = fixedrom_size;
- UINT8 *rom = fixedrom;
- std::vector<UINT8> buf(rom_size);
+ uint8_t *rom = fixedrom;
+ std::vector<uint8_t> buf(rom_size);
memcpy(&buf[0], rom, rom_size);
@@ -203,10 +203,10 @@ void cthd_prot_device::ct2k3sp_sx_decrypt( UINT8* fixedrom, UINT32 fixedrom_size
memcpy(&rom[0x30000], &buf[0x28000], 0x8000);
}
-void cthd_prot_device::decrypt_ct2k3sp(UINT8* sprrom, UINT32 sprrom_size, UINT8* audiorom, UINT32 audiorom_size, UINT8* fixedrom, UINT32 fixedrom_size)
+void cthd_prot_device::decrypt_ct2k3sp(uint8_t* sprrom, uint32_t sprrom_size, uint8_t* audiorom, uint32_t audiorom_size, uint8_t* fixedrom, uint32_t fixedrom_size)
{
- UINT8 *romdata = audiorom + 0x10000;
- std::vector<UINT8> tmp(8 * 128 * 128);
+ uint8_t *romdata = audiorom + 0x10000;
+ std::vector<uint8_t> tmp(8 * 128 * 128);
memcpy(&tmp[8 * 0 * 128], romdata + 8 * 0 * 128, 8 * 32 * 128);
memcpy(&tmp[8 * 32 * 128], romdata + 8 * 64 * 128, 8 * 32 * 128);
memcpy(&tmp[8 * 64 * 128], romdata + 8 * 32 * 128, 8 * 32 * 128);
@@ -222,10 +222,10 @@ void cthd_prot_device::decrypt_ct2k3sp(UINT8* sprrom, UINT32 sprrom_size, UINT8*
/* Crouching Tiger Hidden Dragon 2003 Super Plus alternate (bootleg of King of Fighters 2001) */
-void cthd_prot_device::decrypt_ct2k3sa(UINT8* sprrom, UINT32 sprrom_size, UINT8* audiorom, UINT32 audiorom_size )
+void cthd_prot_device::decrypt_ct2k3sa(uint8_t* sprrom, uint32_t sprrom_size, uint8_t* audiorom, uint32_t audiorom_size )
{
- UINT8 *romdata = audiorom + 0x10000;
- std::vector<UINT8> tmp(8 * 128 * 128);
+ uint8_t *romdata = audiorom + 0x10000;
+ std::vector<uint8_t> tmp(8 * 128 * 128);
memcpy(&tmp[8 * 0 * 128], romdata + 8 * 0 * 128, 8 * 32 * 128);
memcpy(&tmp[8 * 32 * 128], romdata + 8 * 64 * 128, 8 * 32 * 128);
memcpy(&tmp[8 * 64 * 128], romdata + 8 * 32 * 128, 8 * 32 * 128);
@@ -237,10 +237,10 @@ void cthd_prot_device::decrypt_ct2k3sa(UINT8* sprrom, UINT32 sprrom_size, UINT8*
}
-void cthd_prot_device::patch_ct2k3sa(UINT8* cpurom, UINT32 cpurom_size)
+void cthd_prot_device::patch_ct2k3sa(uint8_t* cpurom, uint32_t cpurom_size)
{
/* patches thanks to razoola - same as for cthd2003*/
- UINT16 *mem16 = (UINT16 *)cpurom;
+ uint16_t *mem16 = (uint16_t *)cpurom;
// theres still a problem on the character select screen but it seems to be related to cpu core timing issues,
// overclocking the 68k prevents it.
@@ -276,11 +276,11 @@ void cthd_prot_device::patch_ct2k3sa(UINT8* cpurom, UINT32 cpurom_size)
/* Matrimelee / Shin Gouketsuji Ichizoku Toukon (bootleg) */
#define MATRIMBLZ80(i) (i ^ (BITSWAP8(i & 0x3,4,3,1,2,0,7,6,5) << 8))
-void cthd_prot_device::matrimbl_decrypt(UINT8* sprrom, UINT32 sprrom_size, UINT8* audiorom, UINT32 audiorom_size)
+void cthd_prot_device::matrimbl_decrypt(uint8_t* sprrom, uint32_t sprrom_size, uint8_t* audiorom, uint32_t audiorom_size)
{
// decrypt Z80
- UINT8 *rom = audiorom + 0x10000;
- std::vector<UINT8> buf(0x20000);
+ uint8_t *rom = audiorom + 0x10000;
+ std::vector<uint8_t> buf(0x20000);
memcpy(&buf[0], rom, 0x20000);
int j;
diff --git a/src/devices/bus/neogeo/prot_cthd.h b/src/devices/bus/neogeo/prot_cthd.h
index 8adc5fec705..69b4dbfa850 100644
--- a/src/devices/bus/neogeo/prot_cthd.h
+++ b/src/devices/bus/neogeo/prot_cthd.h
@@ -16,24 +16,24 @@ class cthd_prot_device : public device_t
{
public:
// construction/destruction
- cthd_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cthd_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- void fix_do(UINT8* sprrom, UINT32 sprrom_size, int start, int end, int bit3shift, int bit2shift, int bit1shift, int bit0shift);
- void gfx_address_fix(UINT8* sprrom, UINT32 sprrom_size, int start, int end);
- void cthd2003_c(UINT8* sprrom, UINT32 sprrom_size, int pow);
+ void fix_do(uint8_t* sprrom, uint32_t sprrom_size, int start, int end, int bit3shift, int bit2shift, int bit1shift, int bit0shift);
+ void gfx_address_fix(uint8_t* sprrom, uint32_t sprrom_size, int start, int end);
+ void cthd2003_c(uint8_t* sprrom, uint32_t sprrom_size, int pow);
- void decrypt_cthd2003(UINT8* sprrom, UINT32 sprrom_size, UINT8* audiorom, UINT32 audiorom_size, UINT8* fixedrom, UINT32 fixedrom_size);
- void patch_cthd2003(UINT8* cpurom, UINT32 cpurom_size);
+ void decrypt_cthd2003(uint8_t* sprrom, uint32_t sprrom_size, uint8_t* audiorom, uint32_t audiorom_size, uint8_t* fixedrom, uint32_t fixedrom_size);
+ void patch_cthd2003(uint8_t* cpurom, uint32_t cpurom_size);
//DECLARE_WRITE16_MEMBER(cthd2003_bankswitch_w);
- UINT32 get_bank_base(UINT16 sel);
+ uint32_t get_bank_base(uint16_t sel);
- void ct2k3sp_sx_decrypt(UINT8* fixedrom, UINT32 fixedrom_size);
- void decrypt_ct2k3sp(UINT8* sprrom, UINT32 sprrom_size, UINT8* audiorom, UINT32 audiorom_size, UINT8* fixedrom, UINT32 fixedrom_size);
+ void ct2k3sp_sx_decrypt(uint8_t* fixedrom, uint32_t fixedrom_size);
+ void decrypt_ct2k3sp(uint8_t* sprrom, uint32_t sprrom_size, uint8_t* audiorom, uint32_t audiorom_size, uint8_t* fixedrom, uint32_t fixedrom_size);
- void patch_ct2k3sa(UINT8* cpurom, UINT32 cpurom_size);
- void decrypt_ct2k3sa(UINT8* sprrom, UINT32 sprrom_size, UINT8* audiorom, UINT32 audiorom_size);
+ void patch_ct2k3sa(uint8_t* cpurom, uint32_t cpurom_size);
+ void decrypt_ct2k3sa(uint8_t* sprrom, uint32_t sprrom_size, uint8_t* audiorom, uint32_t audiorom_size);
- void matrimbl_decrypt(UINT8* sprrom, UINT32 sprrom_size, UINT8* audiorom, UINT32 audiorom_size);
+ void matrimbl_decrypt(uint8_t* sprrom, uint32_t sprrom_size, uint8_t* audiorom, uint32_t audiorom_size);
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/neogeo/prot_fatfury2.cpp b/src/devices/bus/neogeo/prot_fatfury2.cpp
index 7a04e4cefe8..6398a0db2e5 100644
--- a/src/devices/bus/neogeo/prot_fatfury2.cpp
+++ b/src/devices/bus/neogeo/prot_fatfury2.cpp
@@ -9,7 +9,7 @@
extern const device_type FATFURY2_PROT = &device_creator<fatfury2_prot_device>;
-fatfury2_prot_device::fatfury2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+fatfury2_prot_device::fatfury2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, FATFURY2_PROT, "Neo Geo Fatal Fury 2 Protection", tag, owner, clock, "fatfury2_prot", __FILE__),
m_prot_data(0)
{
@@ -33,7 +33,7 @@ void fatfury2_prot_device::device_reset()
/* 0x2xxxxx range. There are several checks all around the code. */
READ16_MEMBER( fatfury2_prot_device::protection_r )
{
- UINT16 res = m_prot_data >> 24;
+ uint16_t res = m_prot_data >> 24;
switch (offset)
{
diff --git a/src/devices/bus/neogeo/prot_fatfury2.h b/src/devices/bus/neogeo/prot_fatfury2.h
index d594f01e112..daa2d147faf 100644
--- a/src/devices/bus/neogeo/prot_fatfury2.h
+++ b/src/devices/bus/neogeo/prot_fatfury2.h
@@ -16,12 +16,12 @@ class fatfury2_prot_device : public device_t
{
public:
// construction/destruction
- fatfury2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fatfury2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ16_MEMBER( protection_r );
DECLARE_WRITE16_MEMBER( protection_w );
- UINT32 m_prot_data;
+ uint32_t m_prot_data;
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/neogeo/prot_kof2k2.cpp b/src/devices/bus/neogeo/prot_kof2k2.cpp
index 5ec8c31f979..4fc088adc53 100644
--- a/src/devices/bus/neogeo/prot_kof2k2.cpp
+++ b/src/devices/bus/neogeo/prot_kof2k2.cpp
@@ -7,7 +7,7 @@
extern const device_type KOF2002_PROT = &device_creator<kof2002_prot_device>;
-kof2002_prot_device::kof2002_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+kof2002_prot_device::kof2002_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, KOF2002_PROT, "Neo Geo KOF 2002 Protection", tag, owner, clock, "kof2002_prot", __FILE__)
{
}
@@ -23,11 +23,11 @@ void kof2002_prot_device::device_reset()
/* kof2002, matrim, samsho5, samsh5sp have some simple block swapping */
-void kof2002_prot_device::kof2002_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size)
+void kof2002_prot_device::kof2002_decrypt_68k(uint8_t* cpurom, uint32_t cpurom_size)
{
static const int sec[]={0x100000,0x280000,0x300000,0x180000,0x000000,0x380000,0x200000,0x080000};
- UINT8 *src = cpurom + 0x100000;
- std::vector<UINT8> dst(0x400000);
+ uint8_t *src = cpurom + 0x100000;
+ std::vector<uint8_t> dst(0x400000);
memcpy(&dst[0], src, 0x400000);
for (int i = 0; i < 8; ++i)
@@ -35,11 +35,11 @@ void kof2002_prot_device::kof2002_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size)
}
-void kof2002_prot_device::matrim_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size)
+void kof2002_prot_device::matrim_decrypt_68k(uint8_t* cpurom, uint32_t cpurom_size)
{
static const int sec[]={0x100000,0x280000,0x300000,0x180000,0x000000,0x380000,0x200000,0x080000};
- UINT8 *src = cpurom + 0x100000;
- std::vector<UINT8> dst(0x400000);
+ uint8_t *src = cpurom + 0x100000;
+ std::vector<uint8_t> dst(0x400000);
memcpy(&dst[0], src, 0x400000);
for (int i = 0; i < 8; ++i)
@@ -47,22 +47,22 @@ void kof2002_prot_device::matrim_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size)
}
-void kof2002_prot_device::samsho5_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size)
+void kof2002_prot_device::samsho5_decrypt_68k(uint8_t* cpurom, uint32_t cpurom_size)
{
static const int sec[]={0x000000,0x080000,0x700000,0x680000,0x500000,0x180000,0x200000,0x480000,0x300000,0x780000,0x600000,0x280000,0x100000,0x580000,0x400000,0x380000};
- UINT8 *src = cpurom;
- std::vector<UINT8> dst(0x800000);
+ uint8_t *src = cpurom;
+ std::vector<uint8_t> dst(0x800000);
memcpy(&dst[0], src, 0x800000);
for (int i = 0; i < 16; ++i)
memcpy(src + i * 0x80000, &dst[sec[i]], 0x80000);
}
-void kof2002_prot_device::samsh5sp_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size)
+void kof2002_prot_device::samsh5sp_decrypt_68k(uint8_t* cpurom, uint32_t cpurom_size)
{
static const int sec[]={0x000000,0x080000,0x500000,0x480000,0x600000,0x580000,0x700000,0x280000,0x100000,0x680000,0x400000,0x780000,0x200000,0x380000,0x300000,0x180000};
- UINT8 *src = cpurom;
- std::vector<UINT8> dst(0x800000);
+ uint8_t *src = cpurom;
+ std::vector<uint8_t> dst(0x800000);
memcpy(&dst[0], src, 0x800000);
for (int i = 0; i < 16; ++i)
diff --git a/src/devices/bus/neogeo/prot_kof2k2.h b/src/devices/bus/neogeo/prot_kof2k2.h
index e6991f443ea..f732a1704c0 100644
--- a/src/devices/bus/neogeo/prot_kof2k2.h
+++ b/src/devices/bus/neogeo/prot_kof2k2.h
@@ -17,12 +17,12 @@ class kof2002_prot_device : public device_t
{
public:
// construction/destruction
- kof2002_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kof2002_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- void kof2002_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size);
- void matrim_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size);
- void samsho5_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size);
- void samsh5sp_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size);
+ void kof2002_decrypt_68k(uint8_t* cpurom, uint32_t cpurom_size);
+ void matrim_decrypt_68k(uint8_t* cpurom, uint32_t cpurom_size);
+ void samsho5_decrypt_68k(uint8_t* cpurom, uint32_t cpurom_size);
+ void samsh5sp_decrypt_68k(uint8_t* cpurom, uint32_t cpurom_size);
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/neogeo/prot_kof2k3bl.cpp b/src/devices/bus/neogeo/prot_kof2k3bl.cpp
index 35c2272fb3d..2806af3a45b 100644
--- a/src/devices/bus/neogeo/prot_kof2k3bl.cpp
+++ b/src/devices/bus/neogeo/prot_kof2k3bl.cpp
@@ -7,7 +7,7 @@
extern const device_type KOF2K3BL_PROT = &device_creator<kof2k3bl_prot_device>;
-kof2k3bl_prot_device::kof2k3bl_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+kof2k3bl_prot_device::kof2k3bl_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, KOF2K3BL_PROT, "Neo Geo KOF 2003 Bootleg Protection", tag, owner, clock, "kof2k3bl_prot", __FILE__)
{}
@@ -45,10 +45,10 @@ WRITE16_MEMBER(kof2k3bl_prot_device::kof2003_w)
data = COMBINE_DATA(&m_cartridge_ram[offset]);
if (offset == 0x1ff0/2 || offset == 0x1ff2/2)
{
- UINT8* cr = (UINT8 *)m_cartridge_ram;
- UINT8 prt = cr[BYTE_XOR_LE(0x1ff2)];
+ uint8_t* cr = (uint8_t *)m_cartridge_ram;
+ uint8_t prt = cr[BYTE_XOR_LE(0x1ff2)];
m_bank_base = 0x100000 + ((cr[BYTE_XOR_LE(0x1ff3)] << 16) | (cr[BYTE_XOR_LE(0x1ff2)] << 8) | cr[BYTE_XOR_LE(0x1ff1)]);
- //UINT32 address = (cr[BYTE_XOR_LE(0x1ff3)] << 16) | (cr[BYTE_XOR_LE(0x1ff2)] << 8) | cr[BYTE_XOR_LE(0x1ff1)];
+ //uint32_t address = (cr[BYTE_XOR_LE(0x1ff3)] << 16) | (cr[BYTE_XOR_LE(0x1ff2)] << 8) | cr[BYTE_XOR_LE(0x1ff1)];
//m_bankdev->neogeo_set_main_cpu_bank_address(address+0x100000);
cr[BYTE_XOR_LE(0x1ff0)] = 0xa0;
@@ -64,10 +64,10 @@ WRITE16_MEMBER(kof2k3bl_prot_device::kof2003p_w)
data = COMBINE_DATA(&m_cartridge_ram[offset]);
if (offset == 0x1ff0/2 || offset == 0x1ff2/2)
{
- UINT8* cr = (UINT8 *)m_cartridge_ram;
- UINT8 prt = cr[BYTE_XOR_LE(0x1ff2)];
+ uint8_t* cr = (uint8_t *)m_cartridge_ram;
+ uint8_t prt = cr[BYTE_XOR_LE(0x1ff2)];
m_bank_base = 0x100000 + ((cr[BYTE_XOR_LE(0x1ff3)] << 16) | (cr[BYTE_XOR_LE(0x1ff2)] << 8) | cr[BYTE_XOR_LE(0x1ff0)]);
- //UINT32 address = (cr[BYTE_XOR_LE(0x1ff3)] << 16) | (cr[BYTE_XOR_LE(0x1ff2)] << 8) | cr[BYTE_XOR_LE(0x1ff0)];
+ //uint32_t address = (cr[BYTE_XOR_LE(0x1ff3)] << 16) | (cr[BYTE_XOR_LE(0x1ff2)] << 8) | cr[BYTE_XOR_LE(0x1ff0)];
//m_bankdev->neogeo_set_main_cpu_bank_address(address+0x100000);
cr[BYTE_XOR_LE(0x1ff0)] &= 0xfe;
@@ -77,12 +77,12 @@ WRITE16_MEMBER(kof2k3bl_prot_device::kof2003p_w)
}
}
-void kof2k3bl_prot_device::bl_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
+void kof2k3bl_prot_device::bl_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size)
{
- static const UINT8 sec[] = { 0x07, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
+ static const uint8_t sec[] = { 0x07, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
int rom_size = 0x800000;
- UINT8 *rom = cpurom;
- std::vector<UINT8> buf(rom_size);
+ uint8_t *rom = cpurom;
+ std::vector<uint8_t> buf(rom_size);
memcpy(&buf[0], rom, rom_size);
for (int i = 0; i < rom_size / 0x100000; i++)
@@ -92,10 +92,10 @@ void kof2k3bl_prot_device::bl_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
/* The King of Fighters 2004 Plus / Hero (The King of Fighters 2003 bootleg) */
-void kof2k3bl_prot_device::pl_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
+void kof2k3bl_prot_device::pl_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size)
{
- std::vector<UINT16> tmp(0x100000/2);
- UINT16*rom16 = (UINT16*)cpurom;
+ std::vector<uint16_t> tmp(0x100000/2);
+ uint16_t*rom16 = (uint16_t*)cpurom;
for (int i = 0; i < 0x700000/2; i += 0x100000/2)
{
@@ -113,20 +113,20 @@ void kof2k3bl_prot_device::pl_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
/* The King of Fighters 2004 Ultra Plus (The King of Fighters 2003 bootleg) */
-void kof2k3bl_prot_device::upl_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
+void kof2k3bl_prot_device::upl_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size)
{
- UINT8 *src = cpurom;
+ uint8_t *src = cpurom;
memmove(src + 0x100000, src, 0x600000);
memmove(src, src + 0x700000, 0x100000);
- UINT8 *rom = cpurom + 0xfe000;
- UINT8 *buf = cpurom + 0xd0610;
+ uint8_t *rom = cpurom + 0xfe000;
+ uint8_t *buf = cpurom + 0xd0610;
for (int i = 0; i < 0x2000 / 2; i++)
{
int ofst = (i & 0xff00) + BITSWAP8((i & 0x00ff), 7, 6, 0, 4, 3, 2, 1, 5);
memcpy(&rom[i * 2], &buf[ofst * 2], 2);
}
- UINT16* rom16 = (UINT16*)cpurom;
+ uint16_t* rom16 = (uint16_t*)cpurom;
m_overlay = rom16[0x58196 / 2];
}
diff --git a/src/devices/bus/neogeo/prot_kof2k3bl.h b/src/devices/bus/neogeo/prot_kof2k3bl.h
index 02debee0128..23bba22c89a 100644
--- a/src/devices/bus/neogeo/prot_kof2k3bl.h
+++ b/src/devices/bus/neogeo/prot_kof2k3bl.h
@@ -16,25 +16,25 @@ class kof2k3bl_prot_device : public device_t
{
public:
// construction/destruction
- kof2k3bl_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kof2k3bl_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ16_MEMBER(protection_r);
DECLARE_WRITE16_MEMBER(kof2003_w);
DECLARE_WRITE16_MEMBER(kof2003p_w);
DECLARE_READ16_MEMBER(overlay_r);
- void bl_px_decrypt(UINT8* cpurom, UINT32 cpurom_size);
- void pl_px_decrypt(UINT8* cpurom, UINT32 cpurom_size);
- void upl_px_decrypt(UINT8* cpurom, UINT32 cpurom_size);
- UINT32 get_bank_base() {return m_bank_base; }
+ void bl_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size);
+ void pl_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size);
+ void upl_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size);
+ uint32_t get_bank_base() {return m_bank_base; }
protected:
virtual void device_start() override;
virtual void device_reset() override;
private:
- UINT16 m_overlay;
- UINT32 m_bank_base;
- UINT16 m_cartridge_ram[0x1000]; // bootlegs
+ uint16_t m_overlay;
+ uint32_t m_bank_base;
+ uint16_t m_cartridge_ram[0x1000]; // bootlegs
};
#endif
diff --git a/src/devices/bus/neogeo/prot_kof98.cpp b/src/devices/bus/neogeo/prot_kof98.cpp
index 86da8a1b7f4..ee72c203273 100644
--- a/src/devices/bus/neogeo/prot_kof98.cpp
+++ b/src/devices/bus/neogeo/prot_kof98.cpp
@@ -8,7 +8,7 @@
extern const device_type KOF98_PROT = &device_creator<kof98_prot_device>;
-kof98_prot_device::kof98_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+kof98_prot_device::kof98_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, KOF98_PROT, "Neo Geo KOF 98 Protection", tag, owner, clock, "kof98_prot", __FILE__),
m_prot_state(0)
{}
@@ -25,13 +25,13 @@ void kof98_prot_device::device_reset()
/* Kof98 uses an early encryption, quite different from the others */
-void kof98_prot_device::decrypt_68k(UINT8* cpurom, UINT32 cpurom_size)
+void kof98_prot_device::decrypt_68k(uint8_t* cpurom, uint32_t cpurom_size)
{
- UINT8 *src = cpurom;
- std::vector<UINT8> dst(0x200000);
+ uint8_t *src = cpurom;
+ std::vector<uint8_t> dst(0x200000);
int i, j, k;
- static const UINT32 sec[]={ 0x000000, 0x100000, 0x000004, 0x100004, 0x10000a, 0x00000a, 0x10000e, 0x00000e };
- static const UINT32 pos[]={ 0x000, 0x004, 0x00a, 0x00e };
+ static const uint32_t sec[]={ 0x000000, 0x100000, 0x000004, 0x100004, 0x10000a, 0x00000a, 0x10000e, 0x00000e };
+ static const uint32_t pos[]={ 0x000, 0x004, 0x00a, 0x00e };
memcpy(&dst[0], src, 0x200000);
for (i = 0x800; i < 0x100000; i += 0x200)
@@ -67,7 +67,7 @@ void kof98_prot_device::decrypt_68k(UINT8* cpurom, UINT32 cpurom_size)
}
memmove(&src[0x100000], &src[0x200000], 0x400000);
- UINT16* mem16 = (UINT16*)cpurom;
+ uint16_t* mem16 = (uint16_t*)cpurom;
m_default_rom[0] = mem16[0x100/2];
m_default_rom[1] = mem16[0x102/2];
}
diff --git a/src/devices/bus/neogeo/prot_kof98.h b/src/devices/bus/neogeo/prot_kof98.h
index 39263dd9cf4..76ed3386db9 100644
--- a/src/devices/bus/neogeo/prot_kof98.h
+++ b/src/devices/bus/neogeo/prot_kof98.h
@@ -17,13 +17,13 @@ class kof98_prot_device : public device_t
{
public:
// construction/destruction
- kof98_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kof98_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- void decrypt_68k(UINT8* cpurom, UINT32 cpurom_size);
+ void decrypt_68k(uint8_t* cpurom, uint32_t cpurom_size);
DECLARE_WRITE16_MEMBER(protection_w);
DECLARE_READ16_MEMBER(protection_r);
int m_prot_state;
- UINT16 m_default_rom[2];
+ uint16_t m_default_rom[2];
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/neogeo/prot_misc.cpp b/src/devices/bus/neogeo/prot_misc.cpp
index 70ded6a0f7f..825d630e1d9 100644
--- a/src/devices/bus/neogeo/prot_misc.cpp
+++ b/src/devices/bus/neogeo/prot_misc.cpp
@@ -26,7 +26,7 @@
extern const device_type NEOBOOT_PROT = &device_creator<neoboot_prot_device>;
-neoboot_prot_device::neoboot_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neoboot_prot_device::neoboot_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NEOBOOT_PROT, "Neo Geo Bootleg Protection(s)", tag, owner, clock, "ngboot_prot", __FILE__)
{}
@@ -44,11 +44,11 @@ void neoboot_prot_device::device_reset()
/* General Bootleg Functions - used by more than 1 game */
-void neoboot_prot_device::cx_decrypt(UINT8*sprrom, UINT32 sprrom_size)
+void neoboot_prot_device::cx_decrypt(uint8_t*sprrom, uint32_t sprrom_size)
{
int cx_size = sprrom_size;
- UINT8 *rom = sprrom;
- std::vector<UINT8> buf(cx_size);
+ uint8_t *rom = sprrom;
+ std::vector<uint8_t> buf(cx_size);
memcpy(&buf[0], rom, cx_size);
@@ -57,14 +57,14 @@ void neoboot_prot_device::cx_decrypt(UINT8*sprrom, UINT32 sprrom_size)
}
-void neoboot_prot_device::sx_decrypt(UINT8* fixed, UINT32 fixed_size, int value)
+void neoboot_prot_device::sx_decrypt(uint8_t* fixed, uint32_t fixed_size, int value)
{
int sx_size = fixed_size;
- UINT8 *rom = fixed;
+ uint8_t *rom = fixed;
if (value == 1)
{
- std::vector<UINT8> buf(sx_size);
+ std::vector<uint8_t> buf(sx_size);
memcpy(&buf[0], rom, sx_size);
for (int i = 0; i < sx_size; i += 0x10)
@@ -84,10 +84,10 @@ void neoboot_prot_device::sx_decrypt(UINT8* fixed, UINT32 fixed_size, int value)
/* The King of Fighters '97 Oroshi Plus 2003 (bootleg) */
-void neoboot_prot_device::kof97oro_px_decode(UINT8* cpurom, UINT32 cpurom_size)
+void neoboot_prot_device::kof97oro_px_decode(uint8_t* cpurom, uint32_t cpurom_size)
{
- std::vector<UINT16> tmp(0x500000);
- UINT16 *src = (UINT16*)cpurom;
+ std::vector<uint16_t> tmp(0x500000);
+ uint16_t *src = (uint16_t*)cpurom;
for (int i = 0; i < 0x500000/2; i++)
tmp[i] = src[i ^ 0x7ffef];
@@ -99,10 +99,10 @@ void neoboot_prot_device::kof97oro_px_decode(UINT8* cpurom, UINT32 cpurom_size)
/* The King of Fighters 10th Anniversary Extra Plus (The King of Fighters 2002 bootleg) */
-void neoboot_prot_device::kf10thep_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
+void neoboot_prot_device::kf10thep_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size)
{
- UINT16 *rom = (UINT16*)cpurom;
- std::vector<UINT16> buf(0x100000/2);
+ uint16_t *rom = (uint16_t*)cpurom;
+ std::vector<uint16_t> buf(0x100000/2);
memcpy(&buf[0x000000/2], &rom[0x060000/2], 0x20000);
memcpy(&buf[0x020000/2], &rom[0x100000/2], 0x20000);
@@ -129,10 +129,10 @@ void neoboot_prot_device::kf10thep_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
/* The King of Fighters 10th Anniversary 2005 Unique (The King of Fighters 2002 bootleg) */
-void neoboot_prot_device::kf2k5uni_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
+void neoboot_prot_device::kf2k5uni_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size)
{
- UINT8 *src = cpurom;
- UINT8 dst[0x80];
+ uint8_t *src = cpurom;
+ uint8_t dst[0x80];
for (int i = 0; i < 0x800000; i += 0x80)
{
@@ -148,17 +148,17 @@ void neoboot_prot_device::kf2k5uni_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
}
-void neoboot_prot_device::kf2k5uni_sx_decrypt(UINT8* fixedrom, UINT32 fixedrom_size)
+void neoboot_prot_device::kf2k5uni_sx_decrypt(uint8_t* fixedrom, uint32_t fixedrom_size)
{
- UINT8 *srom = fixedrom;
+ uint8_t *srom = fixedrom;
for (int i = 0; i < 0x20000; i++)
srom[i] = BITSWAP8(srom[i], 4, 5, 6, 7, 0, 1, 2, 3);
}
-void neoboot_prot_device::kf2k5uni_mx_decrypt(UINT8* audiorom, UINT32 audiorom_size)
+void neoboot_prot_device::kf2k5uni_mx_decrypt(uint8_t* audiorom, uint32_t audiorom_size)
{
- UINT8 *mrom = audiorom;
+ uint8_t *mrom = audiorom;
for (int i = 0; i < 0x30000; i++)
mrom[i] = BITSWAP8(mrom[i], 4, 5, 6, 7, 0, 1, 2, 3);
@@ -168,10 +168,10 @@ void neoboot_prot_device::kf2k5uni_mx_decrypt(UINT8* audiorom, UINT32 audiorom_s
/* King of Fighters Special Edition 2004 (bootleg of King of Fighters 2002) */
-void neoboot_prot_device::decrypt_kof2k4se_68k(UINT8* cpurom, UINT32 cpurom_size)
+void neoboot_prot_device::decrypt_kof2k4se_68k(uint8_t* cpurom, uint32_t cpurom_size)
{
- UINT8 *src = cpurom + 0x100000;
- std::vector<UINT8> dst(0x400000);
+ uint8_t *src = cpurom + 0x100000;
+ std::vector<uint8_t> dst(0x400000);
static const int sec[] = {0x300000,0x200000,0x100000,0x000000};
memcpy(&dst[0], src, 0x400000);
@@ -182,21 +182,21 @@ void neoboot_prot_device::decrypt_kof2k4se_68k(UINT8* cpurom, UINT32 cpurom_size
/* Lansquenet 2004 (Shock Troopers - 2nd Squad bootleg) */
-void neoboot_prot_device::lans2004_vx_decrypt(UINT8* ymsndrom, UINT32 ymsndrom_size)
+void neoboot_prot_device::lans2004_vx_decrypt(uint8_t* ymsndrom, uint32_t ymsndrom_size)
{
- UINT8 *rom = ymsndrom;
+ uint8_t *rom = ymsndrom;
for (int i = 0; i < 0xA00000; i++)
rom[i] = BITSWAP8(rom[i], 0, 1, 5, 4, 3, 2, 6, 7);
}
-void neoboot_prot_device::lans2004_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size)
+void neoboot_prot_device::lans2004_decrypt_68k(uint8_t* cpurom, uint32_t cpurom_size)
{
// Descrambling P ROMs - Thanks to Razoola for the info
- UINT8 *src = cpurom;
- UINT16 *rom = (UINT16*)cpurom;
+ uint8_t *src = cpurom;
+ uint16_t *rom = (uint16_t*)cpurom;
static const int sec[] = { 0x3, 0x8, 0x7, 0xc, 0x1, 0xa, 0x6, 0xd };
- std::vector<UINT8> dst(0x600000);
+ std::vector<uint8_t> dst(0x600000);
for (int i = 0; i < 8; i++)
memcpy (&dst[i * 0x20000], src + sec[i] * 0x20000, 0x20000);
@@ -228,11 +228,11 @@ void neoboot_prot_device::lans2004_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size
/* Samurai Shodown V / Samurai Spirits Zero (bootleg) */
-void neoboot_prot_device::samsho5b_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
+void neoboot_prot_device::samsho5b_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size)
{
int px_size = cpurom_size;
- UINT8 *rom = cpurom;
- std::vector<UINT8> buf(px_size);
+ uint8_t *rom = cpurom;
+ std::vector<uint8_t> buf(px_size);
memcpy(&buf[0], rom, px_size);
@@ -252,10 +252,10 @@ void neoboot_prot_device::samsho5b_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
}
-void neoboot_prot_device::samsho5b_vx_decrypt(UINT8* ymsndrom, UINT32 ymsndrom_size)
+void neoboot_prot_device::samsho5b_vx_decrypt(uint8_t* ymsndrom, uint32_t ymsndrom_size)
{
int vx_size = ymsndrom_size;
- UINT8 *rom = ymsndrom;
+ uint8_t *rom = ymsndrom;
for (int i = 0; i < vx_size; i++)
rom[i] = BITSWAP8(rom[i], 0, 1, 5, 4, 3, 2, 6, 7);
@@ -295,7 +295,7 @@ WRITE16_MEMBER( neoboot_prot_device::ms5plus_bankswitch_w )
}
*/
-UINT32 neoboot_prot_device::mslug5p_bank_base(UINT16 sel)
+uint32_t neoboot_prot_device::mslug5p_bank_base(uint16_t sel)
{
sel = sel >> 4;
//sel = sel & 7;
@@ -307,12 +307,12 @@ UINT32 neoboot_prot_device::mslug5p_bank_base(UINT16 sel)
// The protection patching here may be incomplete - Thanks to Razoola for the info
-void neoboot_prot_device::kog_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
+void neoboot_prot_device::kog_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size)
{
// the protection chip does some *very* strange things to the rom
- UINT8 *src = cpurom;
- std::vector<UINT8> dst(0x600000);
- UINT16 *rom = (UINT16 *)cpurom;
+ uint8_t *src = cpurom;
+ std::vector<uint8_t> dst(0x600000);
+ uint16_t *rom = (uint16_t *)cpurom;
static const int sec[] = { 0x3, 0x8, 0x7, 0xc, 0x1, 0xa, 0x6, 0xd };
for (int i = 0; i < 8; i++)
@@ -368,12 +368,12 @@ void neoboot_prot_device::kog_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
/* SNK vs. CAPCOM SVC CHAOS (bootleg) */
-void neoboot_prot_device::svcboot_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
+void neoboot_prot_device::svcboot_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size)
{
- static const UINT8 sec[] = { 0x06, 0x07, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00 };
+ static const uint8_t sec[] = { 0x06, 0x07, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00 };
int size = cpurom_size;
- UINT8 *src = cpurom;
- std::vector<UINT8> dst(size);
+ uint8_t *src = cpurom;
+ std::vector<uint8_t> dst(size);
for (int i = 0; i < size / 0x100000; i++)
memcpy(&dst[i * 0x100000], &src[sec[i] * 0x100000], 0x100000);
@@ -386,10 +386,10 @@ void neoboot_prot_device::svcboot_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
}
}
-void neoboot_prot_device::svcboot_cx_decrypt(UINT8* sprrom, UINT32 sprrom_size)
+void neoboot_prot_device::svcboot_cx_decrypt(uint8_t* sprrom, uint32_t sprrom_size)
{
- static const UINT8 idx_tbl[ 0x10 ] = { 0, 1, 0, 1, 2, 3, 2, 3, 3, 4, 3, 4, 4, 5, 4, 5, };
- static const UINT8 bitswap4_tbl[ 6 ][ 4 ] = {
+ static const uint8_t idx_tbl[ 0x10 ] = { 0, 1, 0, 1, 2, 3, 2, 3, 3, 4, 3, 4, 4, 5, 4, 5, };
+ static const uint8_t bitswap4_tbl[ 6 ][ 4 ] = {
{ 3, 0, 1, 2 },
{ 2, 3, 0, 1 },
{ 1, 2, 3, 0 },
@@ -398,8 +398,8 @@ void neoboot_prot_device::svcboot_cx_decrypt(UINT8* sprrom, UINT32 sprrom_size)
{ 3, 0, 2, 1 },
};
int size = sprrom_size;
- UINT8 *src = sprrom;
- std::vector<UINT8> dst(size);
+ uint8_t *src = sprrom;
+ std::vector<uint8_t> dst(size);
memcpy(&dst[0], src, size);
for (int i = 0; i < size / 0x80; i++)
@@ -418,12 +418,12 @@ void neoboot_prot_device::svcboot_cx_decrypt(UINT8* sprrom, UINT32 sprrom_size)
/* SNK vs. CAPCOM SVC CHAOS Plus (bootleg set 1) */
-void neoboot_prot_device::svcplus_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
+void neoboot_prot_device::svcplus_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size)
{
static const int sec[] = { 0x00, 0x03, 0x02, 0x05, 0x04, 0x01 };
int size = cpurom_size;
- UINT8 *src = cpurom;
- std::vector<UINT8> dst(size);
+ uint8_t *src = cpurom;
+ std::vector<uint8_t> dst(size);
memcpy(&dst[0], src, size);
for (int i = 0; i < size / 2; i++)
@@ -442,22 +442,22 @@ void neoboot_prot_device::svcplus_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
}
-void neoboot_prot_device::svcplus_px_hack(UINT8* cpurom, UINT32 cpurom_size)
+void neoboot_prot_device::svcplus_px_hack(uint8_t* cpurom, uint32_t cpurom_size)
{
/* patched by the protection chip? */
- UINT16 *mem16 = (UINT16 *)cpurom;
+ uint16_t *mem16 = (uint16_t *)cpurom;
mem16[0x0f8016/2] = 0x33c1;
}
/* SNK vs. CAPCOM SVC CHAOS Plus (bootleg set 2) */
-void neoboot_prot_device::svcplusa_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
+void neoboot_prot_device::svcplusa_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size)
{
static const int sec[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x00 };
int size = cpurom_size;
- UINT8 *src = cpurom;
- std::vector<UINT8> dst(size);
+ uint8_t *src = cpurom;
+ std::vector<uint8_t> dst(size);
memcpy(&dst[0], src, size);
for (int i = 0; i < 6; i++)
@@ -467,12 +467,12 @@ void neoboot_prot_device::svcplusa_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
/* SNK vs. CAPCOM SVC CHAOS Super Plus (bootleg) */
-void neoboot_prot_device::svcsplus_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
+void neoboot_prot_device::svcsplus_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size)
{
static const int sec[] = { 0x06, 0x07, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00 };
int size = cpurom_size;
- UINT8 *src = cpurom;
- std::vector<UINT8> dst(size);
+ uint8_t *src = cpurom;
+ std::vector<uint8_t> dst(size);
memcpy(&dst[0], src, size);
for (int i = 0; i < size / 2; i++)
@@ -486,10 +486,10 @@ void neoboot_prot_device::svcsplus_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
}
}
-void neoboot_prot_device::svcsplus_px_hack(UINT8* cpurom, UINT32 cpurom_size)
+void neoboot_prot_device::svcsplus_px_hack(uint8_t* cpurom, uint32_t cpurom_size)
{
/* patched by the protection chip? */
- UINT16 *mem16 = (UINT16 *)cpurom;
+ uint16_t *mem16 = (uint16_t *)cpurom;
mem16[0x9e90/2] = 0x000f;
mem16[0x9e92/2] = 0xc9c0;
mem16[0xa10c/2] = 0x4eb9;
@@ -500,9 +500,9 @@ void neoboot_prot_device::svcsplus_px_hack(UINT8* cpurom, UINT32 cpurom_size)
/* The King of Fighters 2002 (bootleg) */
-void neoboot_prot_device::kof2002b_gfx_decrypt(UINT8 *src, int size)
+void neoboot_prot_device::kof2002b_gfx_decrypt(uint8_t *src, int size)
{
- static const UINT8 t[8][6] =
+ static const uint8_t t[8][6] =
{
{ 0, 8, 7, 6, 2, 1 },
{ 1, 0, 8, 7, 6, 2 },
@@ -514,7 +514,7 @@ void neoboot_prot_device::kof2002b_gfx_decrypt(UINT8 *src, int size)
{ 8, 0, 7, 6, 2, 1 },
};
- std::vector<UINT8> dst(0x10000);
+ std::vector<uint8_t> dst(0x10000);
for (int i = 0; i < size; i += 0x10000)
{
@@ -532,10 +532,10 @@ void neoboot_prot_device::kof2002b_gfx_decrypt(UINT8 *src, int size)
/* The King of Fighters 2002 Magic Plus (bootleg) */
-void neoboot_prot_device::kf2k2mp_decrypt(UINT8* cpurom, UINT32 cpurom_size)
+void neoboot_prot_device::kf2k2mp_decrypt(uint8_t* cpurom, uint32_t cpurom_size)
{
- UINT8 *src = cpurom;
- UINT8 dst[0x80];
+ uint8_t *src = cpurom;
+ uint8_t dst[0x80];
memmove(src, src + 0x300000, 0x500000);
@@ -553,10 +553,10 @@ void neoboot_prot_device::kf2k2mp_decrypt(UINT8* cpurom, UINT32 cpurom_size)
/* The King of Fighters 2002 Magic Plus II (bootleg) */
-void neoboot_prot_device::kf2k2mp2_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
+void neoboot_prot_device::kf2k2mp2_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size)
{
- UINT8 *src = cpurom;
- std::vector<UINT8> dst(0x600000);
+ uint8_t *src = cpurom;
+ std::vector<uint8_t> dst(0x600000);
memcpy(&dst[0x000000], &src[0x1C0000], 0x040000);
memcpy(&dst[0x040000], &src[0x140000], 0x080000);
@@ -569,10 +569,10 @@ void neoboot_prot_device::kf2k2mp2_px_decrypt(UINT8* cpurom, UINT32 cpurom_size)
/* The King of Fighters 10th Anniversary (The King of Fighters 2002 bootleg) */
-void neoboot_prot_device::kof10th_decrypt(UINT8* cpurom, UINT32 cpurom_size)
+void neoboot_prot_device::kof10th_decrypt(uint8_t* cpurom, uint32_t cpurom_size)
{
- std::vector<UINT8> dst(0x900000);
- UINT8 *src = cpurom;
+ std::vector<uint8_t> dst(0x900000);
+ uint8_t *src = cpurom;
memcpy(&dst[0x000000], src + 0x700000, 0x100000); // Correct (Verified in Uni-bios)
memcpy(&dst[0x100000], src + 0x000000, 0x800000);
@@ -584,10 +584,10 @@ void neoboot_prot_device::kof10th_decrypt(UINT8* cpurom, UINT32 cpurom_size)
}
// Altera protection chip patches these over P ROM
- ((UINT16*)src)[0x0124/2] = 0x000d; // Enables XOR for RAM moves, forces SoftDIPs, and USA region
- ((UINT16*)src)[0x0126/2] = 0xf7a8;
+ ((uint16_t*)src)[0x0124/2] = 0x000d; // Enables XOR for RAM moves, forces SoftDIPs, and USA region
+ ((uint16_t*)src)[0x0126/2] = 0xf7a8;
- ((UINT16*)src)[0x8bf4/2] = 0x4ef9; // Run code to change "S" data
- ((UINT16*)src)[0x8bf6/2] = 0x000d;
- ((UINT16*)src)[0x8bf8/2] = 0xf980;
+ ((uint16_t*)src)[0x8bf4/2] = 0x4ef9; // Run code to change "S" data
+ ((uint16_t*)src)[0x8bf6/2] = 0x000d;
+ ((uint16_t*)src)[0x8bf8/2] = 0xf980;
}
diff --git a/src/devices/bus/neogeo/prot_misc.h b/src/devices/bus/neogeo/prot_misc.h
index ba4681aa640..85a22fd638f 100644
--- a/src/devices/bus/neogeo/prot_misc.h
+++ b/src/devices/bus/neogeo/prot_misc.h
@@ -16,46 +16,46 @@ class neoboot_prot_device : public device_t
{
public:
// construction/destruction
- neoboot_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neoboot_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- void cx_decrypt(UINT8* sprrom, UINT32 sprrom_size);
- void sx_decrypt(UINT8* fixed, UINT32 fixed_size, int value);
+ void cx_decrypt(uint8_t* sprrom, uint32_t sprrom_size);
+ void sx_decrypt(uint8_t* fixed, uint32_t fixed_size, int value);
- void kof97oro_px_decode(UINT8* cpurom, UINT32 cpurom_size);
+ void kof97oro_px_decode(uint8_t* cpurom, uint32_t cpurom_size);
- void kf10thep_px_decrypt(UINT8* cpurom, UINT32 cpurom_size);
+ void kf10thep_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size);
- void kf2k5uni_px_decrypt(UINT8* cpurom, UINT32 cpurom_size);
- void kf2k5uni_sx_decrypt(UINT8* fixedrom, UINT32 fixedrom_size);
- void kf2k5uni_mx_decrypt(UINT8* audiorom, UINT32 audiorom_size);
+ void kf2k5uni_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size);
+ void kf2k5uni_sx_decrypt(uint8_t* fixedrom, uint32_t fixedrom_size);
+ void kf2k5uni_mx_decrypt(uint8_t* audiorom, uint32_t audiorom_size);
- void decrypt_kof2k4se_68k(UINT8* cpurom, UINT32 cpurom_size);
+ void decrypt_kof2k4se_68k(uint8_t* cpurom, uint32_t cpurom_size);
- void lans2004_vx_decrypt(UINT8* ymsndrom, UINT32 ymsndrom_size);
- void lans2004_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size);
+ void lans2004_vx_decrypt(uint8_t* ymsndrom, uint32_t ymsndrom_size);
+ void lans2004_decrypt_68k(uint8_t* cpurom, uint32_t cpurom_size);
- void samsho5b_px_decrypt(UINT8* cpurom, UINT32 cpurom_size);
- void samsho5b_vx_decrypt(UINT8* ymsndrom, UINT32 ymsndrom_size);
+ void samsho5b_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size);
+ void samsho5b_vx_decrypt(uint8_t* ymsndrom, uint32_t ymsndrom_size);
DECLARE_READ16_MEMBER(mslug5p_prot_r);
//DECLARE_WRITE16_MEMBER(ms5plus_bankswitch_w);
- UINT32 mslug5p_bank_base(UINT16 sel);
+ uint32_t mslug5p_bank_base(uint16_t sel);
- void kog_px_decrypt(UINT8* cpurom, UINT32 cpurom_size);
+ void kog_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size);
- void svcboot_px_decrypt(UINT8* cpurom, UINT32 cpurom_size);
- void svcboot_cx_decrypt(UINT8*sprrom, UINT32 sprrom_size);
- void svcplus_px_decrypt(UINT8* cpurom, UINT32 cpurom_size);
- void svcplus_px_hack(UINT8* cpurom, UINT32 cpurom_size);
- void svcplusa_px_decrypt(UINT8* cpurom, UINT32 cpurom_size);
- void svcsplus_px_decrypt(UINT8* cpurom, UINT32 cpurom_size);
- void svcsplus_px_hack(UINT8* cpurom, UINT32 cpurom_size);
+ void svcboot_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size);
+ void svcboot_cx_decrypt(uint8_t*sprrom, uint32_t sprrom_size);
+ void svcplus_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size);
+ void svcplus_px_hack(uint8_t* cpurom, uint32_t cpurom_size);
+ void svcplusa_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size);
+ void svcsplus_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size);
+ void svcsplus_px_hack(uint8_t* cpurom, uint32_t cpurom_size);
- void kof2002b_gfx_decrypt(UINT8 *src, int size);
- void kf2k2mp_decrypt(UINT8* cpurom, UINT32 cpurom_size);
- void kf2k2mp2_px_decrypt(UINT8* cpurom, UINT32 cpurom_size);
+ void kof2002b_gfx_decrypt(uint8_t *src, int size);
+ void kf2k2mp_decrypt(uint8_t* cpurom, uint32_t cpurom_size);
+ void kf2k2mp2_px_decrypt(uint8_t* cpurom, uint32_t cpurom_size);
- void kof10th_decrypt(UINT8* cpurom, UINT32 cpurom_size);
+ void kof10th_decrypt(uint8_t* cpurom, uint32_t cpurom_size);
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/neogeo/prot_mslugx.cpp b/src/devices/bus/neogeo/prot_mslugx.cpp
index e54007c4a2e..85321f8c92c 100644
--- a/src/devices/bus/neogeo/prot_mslugx.cpp
+++ b/src/devices/bus/neogeo/prot_mslugx.cpp
@@ -7,7 +7,7 @@
extern const device_type MSLUGX_PROT = &device_creator<mslugx_prot_device>;
-mslugx_prot_device::mslugx_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+mslugx_prot_device::mslugx_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, MSLUGX_PROT, "Neo Geo Metal Slug X Protection", tag, owner, clock, "mslugx_prot", __FILE__),
m_counter(0),
m_command(0)
@@ -61,7 +61,7 @@ WRITE16_MEMBER( mslugx_prot_device::protection_w )
READ16_MEMBER( mslugx_prot_device::protection_r )
{
- UINT16 res = 0;
+ uint16_t res = 0;
switch (m_command)
{
@@ -72,7 +72,7 @@ READ16_MEMBER( mslugx_prot_device::protection_r )
break;
case 0x0fff: { // All other accesses (Register D2)
- INT32 select = space.read_word(0x10f00a) - 1; // How should this be calculated?
+ int32_t select = space.read_word(0x10f00a) - 1; // How should this be calculated?
res = (space.read_byte(0xdedd2 + ((select >> 3) & 0x0fff)) >> (~select & 0x07)) & 1;
}
break;
diff --git a/src/devices/bus/neogeo/prot_mslugx.h b/src/devices/bus/neogeo/prot_mslugx.h
index 3223f62bb68..a18a2777f5c 100644
--- a/src/devices/bus/neogeo/prot_mslugx.h
+++ b/src/devices/bus/neogeo/prot_mslugx.h
@@ -17,7 +17,7 @@ class mslugx_prot_device : public device_t
{
public:
// construction/destruction
- mslugx_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mslugx_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_WRITE16_MEMBER( protection_w );
DECLARE_READ16_MEMBER( protection_r );
@@ -27,8 +27,8 @@ protected:
virtual void device_reset() override;
private:
- UINT16 m_counter;
- UINT16 m_command;
+ uint16_t m_counter;
+ uint16_t m_command;
};
#endif
diff --git a/src/devices/bus/neogeo/prot_pcm2.cpp b/src/devices/bus/neogeo/prot_pcm2.cpp
index 2417075509a..36d5557d817 100644
--- a/src/devices/bus/neogeo/prot_pcm2.cpp
+++ b/src/devices/bus/neogeo/prot_pcm2.cpp
@@ -9,7 +9,7 @@
extern const device_type PCM2_PROT = &device_creator<pcm2_prot_device>;
-pcm2_prot_device::pcm2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pcm2_prot_device::pcm2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, PCM2_PROT, "Neo Geo NEOPCM2 Protection", tag, owner, clock, "pcm2_prot", __FILE__)
{
}
@@ -32,16 +32,16 @@ NeoGeo 'V' (PCM) ROM encryption
***************************************************************************/
// Neo-Pcm2 Drivers for Encrypted V Roms
-void pcm2_prot_device::decrypt(UINT8* ymrom, UINT32 ymsize, int value)
+void pcm2_prot_device::decrypt(uint8_t* ymrom, uint32_t ymsize, int value)
{
// thanks to Elsemi for the NEO-PCM2 info
- UINT16 *rom = (UINT16 *)ymrom;
+ uint16_t *rom = (uint16_t *)ymrom;
int size = ymsize;
if (rom != nullptr)
{
// swap address lines on the whole ROMs
- std::vector<UINT16> buffer(value / 2);
+ std::vector<uint16_t> buffer(value / 2);
for (int i = 0; i < size / 2; i += (value / 2))
{
@@ -56,9 +56,9 @@ void pcm2_prot_device::decrypt(UINT8* ymrom, UINT32 ymsize, int value)
// the later PCM2 games have additional scrambling
-void pcm2_prot_device::swap(UINT8* ymrom, UINT32 ymsize, int value)
+void pcm2_prot_device::swap(uint8_t* ymrom, uint32_t ymsize, int value)
{
- static const UINT32 addrs[7][2]={
+ static const uint32_t addrs[7][2]={
{0x000000,0xa5000},
{0xffce20,0x01000},
{0xfe2cf6,0x4e001},
@@ -66,7 +66,7 @@ void pcm2_prot_device::swap(UINT8* ymrom, UINT32 ymsize, int value)
{0xfeb2c0,0x0a000},
{0xff14ea,0xa7001},
{0xffb440,0x02000}};
- static const UINT8 xordata[7][8]={
+ static const uint8_t xordata[7][8]={
{0xf9,0xe0,0x5d,0xf3,0xea,0x92,0xbe,0xef},
{0xc4,0x83,0xa8,0x5f,0x21,0x27,0x64,0xaf},
{0xc3,0xfd,0x81,0xac,0x6d,0xe7,0xbf,0x9e},
@@ -75,9 +75,9 @@ void pcm2_prot_device::swap(UINT8* ymrom, UINT32 ymsize, int value)
{0x4b,0xa4,0x63,0x46,0xf0,0x91,0xea,0x62},
{0x4b,0xa4,0x63,0x46,0xf0,0x91,0xea,0x62}};
- std::vector<UINT8> buf(0x1000000);
+ std::vector<uint8_t> buf(0x1000000);
int j, d;
- UINT8* src = ymrom;
+ uint8_t* src = ymrom;
memcpy(&buf[0], src, 0x1000000);
for (int i = 0; i < 0x1000000; i++)
diff --git a/src/devices/bus/neogeo/prot_pcm2.h b/src/devices/bus/neogeo/prot_pcm2.h
index 01909d19ce2..cd06a3e06d8 100644
--- a/src/devices/bus/neogeo/prot_pcm2.h
+++ b/src/devices/bus/neogeo/prot_pcm2.h
@@ -17,10 +17,10 @@ class pcm2_prot_device : public device_t
{
public:
// construction/destruction
- pcm2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pcm2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- void decrypt(UINT8* ymrom, UINT32 ymsize, int value);
- void swap(UINT8* ymrom, UINT32 ymsize, int value);
+ void decrypt(uint8_t* ymrom, uint32_t ymsize, int value);
+ void swap(uint8_t* ymrom, uint32_t ymsize, int value);
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/neogeo/prot_pvc.cpp b/src/devices/bus/neogeo/prot_pvc.cpp
index 8abdeb3ceb6..82ca811a111 100644
--- a/src/devices/bus/neogeo/prot_pvc.cpp
+++ b/src/devices/bus/neogeo/prot_pvc.cpp
@@ -10,7 +10,7 @@
extern const device_type PVC_PROT = &device_creator<pvc_prot_device>;
-pvc_prot_device::pvc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pvc_prot_device::pvc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PVC_PROT, "Neo Geo PVC Protection", tag, owner, clock, "pvc_prot", __FILE__)
{}
@@ -30,12 +30,12 @@ void pvc_prot_device::device_reset()
void pvc_prot_device::pvc_write_unpack_color()
{
- UINT16 pen = m_cart_ram[0xff0];
+ uint16_t pen = m_cart_ram[0xff0];
- UINT8 b = ((pen & 0x000f) << 1) | ((pen & 0x1000) >> 12);
- UINT8 g = ((pen & 0x00f0) >> 3) | ((pen & 0x2000) >> 13);
- UINT8 r = ((pen & 0x0f00) >> 7) | ((pen & 0x4000) >> 14);
- UINT8 s = (pen & 0x8000) >> 15;
+ uint8_t b = ((pen & 0x000f) << 1) | ((pen & 0x1000) >> 12);
+ uint8_t g = ((pen & 0x00f0) >> 3) | ((pen & 0x2000) >> 13);
+ uint8_t r = ((pen & 0x0f00) >> 7) | ((pen & 0x4000) >> 14);
+ uint8_t s = (pen & 0x8000) >> 15;
m_cart_ram[0xff1] = (g << 8) | b;
m_cart_ram[0xff2] = (s << 8) | r;
@@ -44,8 +44,8 @@ void pvc_prot_device::pvc_write_unpack_color()
void pvc_prot_device::pvc_write_pack_color()
{
- UINT16 gb = m_cart_ram[0xff4];
- UINT16 sr = m_cart_ram[0xff5];
+ uint16_t gb = m_cart_ram[0xff4];
+ uint16_t sr = m_cart_ram[0xff5];
m_cart_ram[0xff6] = ((gb & 0x001e) >> 1) |
((gb & 0x1e00) >> 5) |
@@ -59,16 +59,16 @@ void pvc_prot_device::pvc_write_pack_color()
/*void pvc_prot_device::pvc_write_bankswitch()
{
- UINT32 bankaddress = ((m_cart_ram[0xff8] >> 8)|(m_cart_ram[0xff9] << 8));
+ uint32_t bankaddress = ((m_cart_ram[0xff8] >> 8)|(m_cart_ram[0xff9] << 8));
m_cart_ram[0xff8] = (m_cart_ram[0xff8] & 0xfe00) | 0x00a0;
m_cart_ram[0xff9] &= 0x7fff;
m_bankdev->neogeo_set_main_cpu_bank_address(bankaddress + 0x100000);
}
*/
-UINT32 pvc_prot_device::get_bank_base()
+uint32_t pvc_prot_device::get_bank_base()
{
- UINT32 bankaddress = ((m_cart_ram[0xff8] >> 8)|(m_cart_ram[0xff9] << 8));
+ uint32_t bankaddress = ((m_cart_ram[0xff8] >> 8)|(m_cart_ram[0xff9] << 8));
m_cart_ram[0xff8] = (m_cart_ram[0xff8] & 0xfe00) | 0x00a0;
m_cart_ram[0xff9] &= 0x7fff;
return bankaddress + 0x100000;
@@ -95,12 +95,12 @@ WRITE16_MEMBER( pvc_prot_device::protection_w )
/* kf2k3pcb, kof2003, kof2003h, mslug5 and svc have updated P rom scramble */
-void pvc_prot_device::mslug5_decrypt_68k(UINT8* rom, UINT32 size)
+void pvc_prot_device::mslug5_decrypt_68k(uint8_t* rom, uint32_t size)
{
- static const UINT8 xor1[0x20] = { 0xc2, 0x4b, 0x74, 0xfd, 0x0b, 0x34, 0xeb, 0xd7, 0x10, 0x6d, 0xf9, 0xce, 0x5d, 0xd5, 0x61, 0x29, 0xf5, 0xbe, 0x0d, 0x82, 0x72, 0x45, 0x0f, 0x24, 0xb3, 0x34, 0x1b, 0x99, 0xea, 0x09, 0xf3, 0x03 };
- static const UINT8 xor2[0x20] = { 0x36, 0x09, 0xb0, 0x64, 0x95, 0x0f, 0x90, 0x42, 0x6e, 0x0f, 0x30, 0xf6, 0xe5, 0x08, 0x30, 0x64, 0x08, 0x04, 0x00, 0x2f, 0x72, 0x09, 0xa0, 0x13, 0xc9, 0x0b, 0xa0, 0x3e, 0xc2, 0x00, 0x40, 0x2b };
+ static const uint8_t xor1[0x20] = { 0xc2, 0x4b, 0x74, 0xfd, 0x0b, 0x34, 0xeb, 0xd7, 0x10, 0x6d, 0xf9, 0xce, 0x5d, 0xd5, 0x61, 0x29, 0xf5, 0xbe, 0x0d, 0x82, 0x72, 0x45, 0x0f, 0x24, 0xb3, 0x34, 0x1b, 0x99, 0xea, 0x09, 0xf3, 0x03 };
+ static const uint8_t xor2[0x20] = { 0x36, 0x09, 0xb0, 0x64, 0x95, 0x0f, 0x90, 0x42, 0x6e, 0x0f, 0x30, 0xf6, 0xe5, 0x08, 0x30, 0x64, 0x08, 0x04, 0x00, 0x2f, 0x72, 0x09, 0xa0, 0x13, 0xc9, 0x0b, 0xa0, 0x3e, 0xc2, 0x00, 0x40, 0x2b };
int rom_size = 0x800000;
- std::vector<UINT8> buf(rom_size);
+ std::vector<uint8_t> buf(rom_size);
for (int i = 0; i < 0x100000; i++)
rom[i] ^= xor1[(BYTE_XOR_LE(i) % 0x20)];
@@ -110,7 +110,7 @@ void pvc_prot_device::mslug5_decrypt_68k(UINT8* rom, UINT32 size)
for (int i = 0x100000; i < 0x0800000; i += 4)
{
- UINT16 rom16 = rom[BYTE_XOR_LE(i+1)] | rom[BYTE_XOR_LE(i+2)] << 8;
+ uint16_t rom16 = rom[BYTE_XOR_LE(i+1)] | rom[BYTE_XOR_LE(i+2)] << 8;
rom16 = BITSWAP16(rom16, 15, 14, 13, 12, 10, 11, 8, 9, 6, 7, 4, 5, 3, 2, 1, 0);
rom[BYTE_XOR_LE(i+1)] = rom16 & 0xff;
rom[BYTE_XOR_LE(i+2)] = rom16 >> 8;
@@ -134,12 +134,12 @@ void pvc_prot_device::mslug5_decrypt_68k(UINT8* rom, UINT32 size)
}
-void pvc_prot_device::svc_px_decrypt(UINT8* rom, UINT32 size)
+void pvc_prot_device::svc_px_decrypt(uint8_t* rom, uint32_t size)
{
- static const UINT8 xor1[0x20] = { 0x3b, 0x6a, 0xf7, 0xb7, 0xe8, 0xa9, 0x20, 0x99, 0x9f, 0x39, 0x34, 0x0c, 0xc3, 0x9a, 0xa5, 0xc8, 0xb8, 0x18, 0xce, 0x56, 0x94, 0x44, 0xe3, 0x7a, 0xf7, 0xdd, 0x42, 0xf0, 0x18, 0x60, 0x92, 0x9f };
- static const UINT8 xor2[0x20] = { 0x69, 0x0b, 0x60, 0xd6, 0x4f, 0x01, 0x40, 0x1a, 0x9f, 0x0b, 0xf0, 0x75, 0x58, 0x0e, 0x60, 0xb4, 0x14, 0x04, 0x20, 0xe4, 0xb9, 0x0d, 0x10, 0x89, 0xeb, 0x07, 0x30, 0x90, 0x50, 0x0e, 0x20, 0x26 };
+ static const uint8_t xor1[0x20] = { 0x3b, 0x6a, 0xf7, 0xb7, 0xe8, 0xa9, 0x20, 0x99, 0x9f, 0x39, 0x34, 0x0c, 0xc3, 0x9a, 0xa5, 0xc8, 0xb8, 0x18, 0xce, 0x56, 0x94, 0x44, 0xe3, 0x7a, 0xf7, 0xdd, 0x42, 0xf0, 0x18, 0x60, 0x92, 0x9f };
+ static const uint8_t xor2[0x20] = { 0x69, 0x0b, 0x60, 0xd6, 0x4f, 0x01, 0x40, 0x1a, 0x9f, 0x0b, 0xf0, 0x75, 0x58, 0x0e, 0x60, 0xb4, 0x14, 0x04, 0x20, 0xe4, 0xb9, 0x0d, 0x10, 0x89, 0xeb, 0x07, 0x30, 0x90, 0x50, 0x0e, 0x20, 0x26 };
int rom_size = 0x800000;
- std::vector<UINT8> buf(rom_size);
+ std::vector<uint8_t> buf(rom_size);
for (int i = 0; i < 0x100000; i++)
rom[i] ^= xor1[(BYTE_XOR_LE(i) % 0x20)];
@@ -149,7 +149,7 @@ void pvc_prot_device::svc_px_decrypt(UINT8* rom, UINT32 size)
for (int i = 0x100000; i < 0x0800000; i += 4)
{
- UINT16 rom16 = rom[BYTE_XOR_LE(i+1)] | rom[BYTE_XOR_LE(i+2)] << 8;
+ uint16_t rom16 = rom[BYTE_XOR_LE(i+1)] | rom[BYTE_XOR_LE(i+2)] << 8;
rom16 = BITSWAP16(rom16, 15, 14, 13, 12, 10, 11, 8, 9, 6, 7, 4, 5, 3, 2, 1, 0);
rom[BYTE_XOR_LE(i+1)] = rom16 & 0xff;
rom[BYTE_XOR_LE(i+2)] = rom16 >> 8;
@@ -173,11 +173,11 @@ void pvc_prot_device::svc_px_decrypt(UINT8* rom, UINT32 size)
}
-void pvc_prot_device::kf2k3pcb_decrypt_68k(UINT8* rom, UINT32 size)
+void pvc_prot_device::kf2k3pcb_decrypt_68k(uint8_t* rom, uint32_t size)
{
- static const UINT8 xor2[ 0x20 ] = { 0xb4, 0x0f, 0x40, 0x6c, 0x38, 0x07, 0xd0, 0x3f, 0x53, 0x08, 0x80, 0xaa, 0xbe, 0x07, 0xc0, 0xfa, 0xd0, 0x08, 0x10, 0xd2, 0xf1, 0x03, 0x70, 0x7e, 0x87, 0x0b, 0x40, 0xf6, 0x2a, 0x0a, 0xe0, 0xf9 };
+ static const uint8_t xor2[ 0x20 ] = { 0xb4, 0x0f, 0x40, 0x6c, 0x38, 0x07, 0xd0, 0x3f, 0x53, 0x08, 0x80, 0xaa, 0xbe, 0x07, 0xc0, 0xfa, 0xd0, 0x08, 0x10, 0xd2, 0xf1, 0x03, 0x70, 0x7e, 0x87, 0x0b, 0x40, 0xf6, 0x2a, 0x0a, 0xe0, 0xf9 };
int rom_size = 0x900000;
- std::vector<UINT8> buf(rom_size);
+ std::vector<uint8_t> buf(rom_size);
for (int i = 0; i < 0x100000; i++)
rom[0x800000 + i] ^= rom[0x100002 | i];
@@ -187,7 +187,7 @@ void pvc_prot_device::kf2k3pcb_decrypt_68k(UINT8* rom, UINT32 size)
for (int i = 0x100000; i < 0x800000; i += 4)
{
- UINT16 rom16 = rom[BYTE_XOR_LE(i+1)] | rom[BYTE_XOR_LE(i+2)] << 8;
+ uint16_t rom16 = rom[BYTE_XOR_LE(i+1)] | rom[BYTE_XOR_LE(i+2)] << 8;
rom16 = BITSWAP16(rom16, 15, 14, 13, 12, 4, 5, 6, 7, 8, 9, 10, 11, 3, 2, 1, 0);
rom[BYTE_XOR_LE(i+1)] = rom16 & 0xff;
rom[BYTE_XOR_LE(i+2)] = rom16 >> 8;
@@ -210,12 +210,12 @@ void pvc_prot_device::kf2k3pcb_decrypt_68k(UINT8* rom, UINT32 size)
}
-void pvc_prot_device::kof2003_decrypt_68k(UINT8* rom, UINT32 size)
+void pvc_prot_device::kof2003_decrypt_68k(uint8_t* rom, uint32_t size)
{
- static const UINT8 xor1[0x20] = { 0x3b, 0x6a, 0xf7, 0xb7, 0xe8, 0xa9, 0x20, 0x99, 0x9f, 0x39, 0x34, 0x0c, 0xc3, 0x9a, 0xa5, 0xc8, 0xb8, 0x18, 0xce, 0x56, 0x94, 0x44, 0xe3, 0x7a, 0xf7, 0xdd, 0x42, 0xf0, 0x18, 0x60, 0x92, 0x9f };
- static const UINT8 xor2[0x20] = { 0x2f, 0x02, 0x60, 0xbb, 0x77, 0x01, 0x30, 0x08, 0xd8, 0x01, 0xa0, 0xdf, 0x37, 0x0a, 0xf0, 0x65, 0x28, 0x03, 0xd0, 0x23, 0xd3, 0x03, 0x70, 0x42, 0xbb, 0x06, 0xf0, 0x28, 0xba, 0x0f, 0xf0, 0x7a };
+ static const uint8_t xor1[0x20] = { 0x3b, 0x6a, 0xf7, 0xb7, 0xe8, 0xa9, 0x20, 0x99, 0x9f, 0x39, 0x34, 0x0c, 0xc3, 0x9a, 0xa5, 0xc8, 0xb8, 0x18, 0xce, 0x56, 0x94, 0x44, 0xe3, 0x7a, 0xf7, 0xdd, 0x42, 0xf0, 0x18, 0x60, 0x92, 0x9f };
+ static const uint8_t xor2[0x20] = { 0x2f, 0x02, 0x60, 0xbb, 0x77, 0x01, 0x30, 0x08, 0xd8, 0x01, 0xa0, 0xdf, 0x37, 0x0a, 0xf0, 0x65, 0x28, 0x03, 0xd0, 0x23, 0xd3, 0x03, 0x70, 0x42, 0xbb, 0x06, 0xf0, 0x28, 0xba, 0x0f, 0xf0, 0x7a };
int rom_size = 0x900000;
- std::vector<UINT8> buf(rom_size);
+ std::vector<uint8_t> buf(rom_size);
for (int i = 0; i < 0x100000; i++)
rom[0x800000 + i] ^= rom[0x100002 | i];
@@ -228,7 +228,7 @@ void pvc_prot_device::kof2003_decrypt_68k(UINT8* rom, UINT32 size)
for (int i = 0x100000; i < 0x800000; i += 4)
{
- UINT16 rom16 = rom[BYTE_XOR_LE(i+1)] | rom[BYTE_XOR_LE(i+2)] << 8;
+ uint16_t rom16 = rom[BYTE_XOR_LE(i+1)] | rom[BYTE_XOR_LE(i+2)] << 8;
rom16 = BITSWAP16(rom16, 15, 14, 13, 12, 5, 4, 7, 6, 9, 8, 11, 10, 3, 2, 1, 0);
rom[BYTE_XOR_LE(i+1)] = rom16 & 0xff;
rom[BYTE_XOR_LE(i+2)] = rom16 >> 8;
@@ -251,12 +251,12 @@ void pvc_prot_device::kof2003_decrypt_68k(UINT8* rom, UINT32 size)
}
-void pvc_prot_device::kof2003h_decrypt_68k(UINT8* rom, UINT32 size)
+void pvc_prot_device::kof2003h_decrypt_68k(uint8_t* rom, uint32_t size)
{
- static const UINT8 xor1[0x20] = { 0xc2, 0x4b, 0x74, 0xfd, 0x0b, 0x34, 0xeb, 0xd7, 0x10, 0x6d, 0xf9, 0xce, 0x5d, 0xd5, 0x61, 0x29, 0xf5, 0xbe, 0x0d, 0x82, 0x72, 0x45, 0x0f, 0x24, 0xb3, 0x34, 0x1b, 0x99, 0xea, 0x09, 0xf3, 0x03 };
- static const UINT8 xor2[0x20] = { 0x2b, 0x09, 0xd0, 0x7f, 0x51, 0x0b, 0x10, 0x4c, 0x5b, 0x07, 0x70, 0x9d, 0x3e, 0x0b, 0xb0, 0xb6, 0x54, 0x09, 0xe0, 0xcc, 0x3d, 0x0d, 0x80, 0x99, 0x87, 0x03, 0x90, 0x82, 0xfe, 0x04, 0x20, 0x18 };
+ static const uint8_t xor1[0x20] = { 0xc2, 0x4b, 0x74, 0xfd, 0x0b, 0x34, 0xeb, 0xd7, 0x10, 0x6d, 0xf9, 0xce, 0x5d, 0xd5, 0x61, 0x29, 0xf5, 0xbe, 0x0d, 0x82, 0x72, 0x45, 0x0f, 0x24, 0xb3, 0x34, 0x1b, 0x99, 0xea, 0x09, 0xf3, 0x03 };
+ static const uint8_t xor2[0x20] = { 0x2b, 0x09, 0xd0, 0x7f, 0x51, 0x0b, 0x10, 0x4c, 0x5b, 0x07, 0x70, 0x9d, 0x3e, 0x0b, 0xb0, 0xb6, 0x54, 0x09, 0xe0, 0xcc, 0x3d, 0x0d, 0x80, 0x99, 0x87, 0x03, 0x90, 0x82, 0xfe, 0x04, 0x20, 0x18 };
int rom_size = 0x900000;
- std::vector<UINT8> buf(rom_size);
+ std::vector<uint8_t> buf(rom_size);
for (int i = 0; i < 0x100000; i++)
rom[0x800000 + i] ^= rom[0x100002 | i];
@@ -269,7 +269,7 @@ void pvc_prot_device::kof2003h_decrypt_68k(UINT8* rom, UINT32 size)
for (int i = 0x100000; i < 0x800000; i += 4)
{
- UINT16 rom16 = rom[BYTE_XOR_LE(i+1)] | rom[BYTE_XOR_LE(i+2)] << 8;
+ uint16_t rom16 = rom[BYTE_XOR_LE(i+1)] | rom[BYTE_XOR_LE(i+2)] << 8;
rom16 = BITSWAP16(rom16, 15, 14, 13, 12, 10, 11, 8, 9, 6, 7, 4, 5, 3, 2, 1, 0);
rom[BYTE_XOR_LE(i+1)] = rom16 & 0xff;
rom[BYTE_XOR_LE(i+2)] = rom16 >> 8;
diff --git a/src/devices/bus/neogeo/prot_pvc.h b/src/devices/bus/neogeo/prot_pvc.h
index e14983c197a..d5bfee9bf2f 100644
--- a/src/devices/bus/neogeo/prot_pvc.h
+++ b/src/devices/bus/neogeo/prot_pvc.h
@@ -16,22 +16,22 @@ class pvc_prot_device : public device_t
{
public:
// construction/destruction
- pvc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pvc_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void pvc_write_unpack_color();
void pvc_write_pack_color();
// void pvc_write_bankswitch(address_space &space);
- UINT32 get_bank_base();
+ uint32_t get_bank_base();
DECLARE_READ16_MEMBER(protection_r);
DECLARE_WRITE16_MEMBER(protection_w);
- UINT16 m_cart_ram[0x1000];
+ uint16_t m_cart_ram[0x1000];
- void mslug5_decrypt_68k(UINT8* rom, UINT32 size);
- void svc_px_decrypt(UINT8* rom, UINT32 size);
- void kf2k3pcb_decrypt_68k(UINT8* rom, UINT32 size);
- void kof2003_decrypt_68k(UINT8* rom, UINT32 size);
- void kof2003h_decrypt_68k(UINT8* rom, UINT32 size);
+ void mslug5_decrypt_68k(uint8_t* rom, uint32_t size);
+ void svc_px_decrypt(uint8_t* rom, uint32_t size);
+ void kf2k3pcb_decrypt_68k(uint8_t* rom, uint32_t size);
+ void kof2003_decrypt_68k(uint8_t* rom, uint32_t size);
+ void kof2003h_decrypt_68k(uint8_t* rom, uint32_t size);
protected:
virtual void device_start() override;
diff --git a/src/devices/bus/neogeo/prot_sma.cpp b/src/devices/bus/neogeo/prot_sma.cpp
index f18481d51be..9262178be4f 100644
--- a/src/devices/bus/neogeo/prot_sma.cpp
+++ b/src/devices/bus/neogeo/prot_sma.cpp
@@ -8,7 +8,7 @@
extern const device_type SMA_PROT = &device_creator<sma_prot_device>;
-sma_prot_device::sma_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sma_prot_device::sma_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SMA_PROT, "Neo Geo SMA Protection", tag, owner, clock, "sma_prot", __FILE__),
m_sma_rng(0)
{}
@@ -201,7 +201,7 @@ WRITE16_MEMBER( sma_prot_device::kof2000_bankswitch_w )
}
#endif
-UINT32 sma_prot_device::kof99_bank_base(UINT16 sel)
+uint32_t sma_prot_device::kof99_bank_base(uint16_t sel)
{
static const int bankoffset[64] =
{
@@ -229,7 +229,7 @@ UINT32 sma_prot_device::kof99_bank_base(UINT16 sel)
return bankaddress;
}
-UINT32 sma_prot_device::garou_bank_base(UINT16 sel)
+uint32_t sma_prot_device::garou_bank_base(uint16_t sel)
{
// thanks to Razoola and Mr K for the info
static const int bankoffset[64] =
@@ -263,7 +263,7 @@ UINT32 sma_prot_device::garou_bank_base(UINT16 sel)
return bankaddress;
}
-UINT32 sma_prot_device::garouh_bank_base(UINT16 sel)
+uint32_t sma_prot_device::garouh_bank_base(uint16_t sel)
{
// thanks to Razoola and Mr K for the info
static const int bankoffset[64] =
@@ -299,7 +299,7 @@ UINT32 sma_prot_device::garouh_bank_base(UINT16 sel)
return bankaddress;
}
-UINT32 sma_prot_device::mslug3_bank_base(UINT16 sel)
+uint32_t sma_prot_device::mslug3_bank_base(uint16_t sel)
{
// thanks to Razoola and Mr K for the info
static const int bankoffset[64] =
@@ -332,7 +332,7 @@ UINT32 sma_prot_device::mslug3_bank_base(UINT16 sel)
return bankaddress;
}
-UINT32 sma_prot_device::kof2000_bank_base(UINT16 sel)
+uint32_t sma_prot_device::kof2000_bank_base(uint16_t sel)
{
// thanks to Razoola and Mr K for the info
static const int bankoffset[64] =
@@ -374,8 +374,8 @@ READ16_MEMBER( sma_prot_device::prot_9a37_r )
READ16_MEMBER( sma_prot_device::random_r )
{
- UINT16 old = m_sma_rng;
- UINT16 newbit = ((m_sma_rng >> 2) ^
+ uint16_t old = m_sma_rng;
+ uint16_t newbit = ((m_sma_rng >> 2) ^
(m_sma_rng >> 3) ^
(m_sma_rng >> 5) ^
(m_sma_rng >> 6) ^
@@ -391,9 +391,9 @@ READ16_MEMBER( sma_prot_device::random_r )
// kof99, garou, garouh, mslug3 and kof2000 have an SMA chip which contains program code and decrypts the 68k roms
-void sma_prot_device::kof99_decrypt_68k(UINT8* base)
+void sma_prot_device::kof99_decrypt_68k(uint8_t* base)
{
- UINT16 *rom = (UINT16 *)(base + 0x100000);
+ uint16_t *rom = (uint16_t *)(base + 0x100000);
// swap data lines on the whole ROMs
for (int i = 0; i < 0x800000/2; i++)
@@ -402,38 +402,38 @@ void sma_prot_device::kof99_decrypt_68k(UINT8* base)
// swap address lines for the banked part
for (int i = 0; i < 0x600000/2; i += 0x800/2)
{
- UINT16 buffer[0x800/2];
+ uint16_t buffer[0x800/2];
memcpy(buffer, &rom[i], 0x800);
for (int j = 0; j < 0x800/2; j++)
rom[i+j] = buffer[BITSWAP24(j,23,22,21,20,19,18,17,16,15,14,13,12,11,10,6,2,4,9,8,3,1,7,0,5)];
}
// swap address lines & relocate fixed part
- rom = (UINT16 *)base;
+ rom = (uint16_t *)base;
for (int i = 0; i < 0x0c0000/2; i++)
rom[i] = rom[0x700000/2 + BITSWAP24(i,23,22,21,20,19,18,11,6,14,17,16,5,8,10,12,0,4,3,2,7,9,15,13,1)];
}
-void sma_prot_device::garou_decrypt_68k(UINT8* base)
+void sma_prot_device::garou_decrypt_68k(uint8_t* base)
{
// thanks to Razoola and Mr K for the info
- UINT16 *rom = (UINT16 *)(base + 0x100000);
+ uint16_t *rom = (uint16_t *)(base + 0x100000);
// swap data lines on the whole ROMs
for (int i = 0; i < 0x800000/2; i++)
rom[i] = BITSWAP16(rom[i],13,12,14,10,8,2,3,1,5,9,11,4,15,0,6,7);
// swap address lines & relocate fixed part
- rom = (UINT16 *)base;
+ rom = (uint16_t *)base;
for (int i = 0; i < 0x0c0000/2; i++)
rom[i] = rom[0x710000/2 + BITSWAP24(i,23,22,21,20,19,18,4,5,16,14,7,9,6,13,17,15,3,1,2,12,11,8,10,0)];
// swap address lines for the banked part
- rom = (UINT16 *)(base + 0x100000);
+ rom = (uint16_t *)(base + 0x100000);
for (int i = 0; i < 0x800000/2; i += 0x8000/2)
{
- UINT16 buffer[0x8000/2];
+ uint16_t buffer[0x8000/2];
memcpy(buffer, &rom[i], 0x8000);
for (int j = 0; j < 0x8000/2; j++)
rom[i+j] = buffer[BITSWAP24(j,23,22,21,20,19,18,17,16,15,14,9,4,8,3,13,6,2,7,0,12,1,11,10,5)];
@@ -441,25 +441,25 @@ void sma_prot_device::garou_decrypt_68k(UINT8* base)
}
-void sma_prot_device::garouh_decrypt_68k(UINT8* base)
+void sma_prot_device::garouh_decrypt_68k(uint8_t* base)
{
// thanks to Razoola and Mr K for the info
- UINT16 *rom = (UINT16 *)(base + 0x100000);
+ uint16_t *rom = (uint16_t *)(base + 0x100000);
// swap data lines on the whole ROMs
for (int i = 0; i < 0x800000/2; i++)
rom[i] = BITSWAP16(rom[i],14,5,1,11,7,4,10,15,3,12,8,13,0,2,9,6);
// swap address lines & relocate fixed part
- rom = (UINT16 *)base;
+ rom = (uint16_t *)base;
for (int i = 0; i < 0x0c0000/2; i++)
rom[i] = rom[0x7f8000/2 + BITSWAP24(i,23,22,21,20,19,18,5,16,11,2,6,7,17,3,12,8,14,4,0,9,1,10,15,13)];
// swap address lines for the banked part
- rom = (UINT16 *)(base + 0x100000);
+ rom = (uint16_t *)(base + 0x100000);
for (int i = 0; i < 0x800000/2; i += 0x8000/2)
{
- UINT16 buffer[0x8000/2];
+ uint16_t buffer[0x8000/2];
memcpy(buffer, &rom[i], 0x8000);
for (int j = 0; j < 0x8000/2; j++)
rom[i+j] = buffer[BITSWAP24(j,23,22,21,20,19,18,17,16,15,14,12,8,1,7,11,3,13,10,6,9,5,4,0,2)];
@@ -467,25 +467,25 @@ void sma_prot_device::garouh_decrypt_68k(UINT8* base)
}
-void sma_prot_device::mslug3_decrypt_68k(UINT8* base)
+void sma_prot_device::mslug3_decrypt_68k(uint8_t* base)
{
// thanks to Razoola and Mr K for the info
- UINT16 *rom = (UINT16 *)(base + 0x100000);
+ uint16_t *rom = (uint16_t *)(base + 0x100000);
// swap data lines on the whole ROMs
for (int i = 0; i < 0x800000/2; i++)
rom[i] = BITSWAP16(rom[i],4,11,14,3,1,13,0,7,2,8,12,15,10,9,5,6);
// swap address lines & relocate fixed part
- rom = (UINT16 *)base;
+ rom = (uint16_t *)base;
for (int i = 0; i < 0x0c0000/2; i++)
rom[i] = rom[0x5d0000/2 + BITSWAP24(i,23,22,21,20,19,18,15,2,1,13,3,0,9,6,16,4,11,5,7,12,17,14,10,8)];
// swap address lines for the banked part
- rom = (UINT16 *)(base + 0x100000);
+ rom = (uint16_t *)(base + 0x100000);
for (int i = 0; i < 0x800000/2; i += 0x10000/2)
{
- UINT16 buffer[0x10000/2];
+ uint16_t buffer[0x10000/2];
memcpy(buffer, &rom[i], 0x10000);
for (int j = 0; j < 0x10000/2; j++)
rom[i+j] = buffer[BITSWAP24(j,23,22,21,20,19,18,17,16,15,2,11,0,14,6,4,13,8,9,3,10,7,5,12,1)];
@@ -493,10 +493,10 @@ void sma_prot_device::mslug3_decrypt_68k(UINT8* base)
}
-void sma_prot_device::kof2000_decrypt_68k(UINT8* base)
+void sma_prot_device::kof2000_decrypt_68k(uint8_t* base)
{
// thanks to Razoola and Mr K for the info
- UINT16 *rom = (UINT16 *)(base + 0x100000);
+ uint16_t *rom = (uint16_t *)(base + 0x100000);
// swap data lines on the whole ROMs
for (int i = 0; i < 0x800000/2; i++)
@@ -505,14 +505,14 @@ void sma_prot_device::kof2000_decrypt_68k(UINT8* base)
// swap address lines for the banked part
for (int i = 0; i < 0x63a000/2; i += 0x800/2)
{
- UINT16 buffer[0x800/2];
+ uint16_t buffer[0x800/2];
memcpy(buffer, &rom[i], 0x800);
for (int j = 0; j < 0x800/2; j++)
rom[i+j] = buffer[BITSWAP24(j,23,22,21,20,19,18,17,16,15,14,13,12,11,10,4,1,3,8,6,2,7,0,9,5)];
}
// swap address lines & relocate fixed part
- rom = (UINT16 *)base;
+ rom = (uint16_t *)base;
for (int i = 0; i < 0x0c0000/2; i++)
rom[i] = rom[0x73a000/2 + BITSWAP24(i,23,22,21,20,19,18,8,4,15,13,3,14,16,2,6,17,7,12,10,0,5,11,1,9)];
}
diff --git a/src/devices/bus/neogeo/prot_sma.h b/src/devices/bus/neogeo/prot_sma.h
index 1e0053ede42..1cb7d7d9e4c 100644
--- a/src/devices/bus/neogeo/prot_sma.h
+++ b/src/devices/bus/neogeo/prot_sma.h
@@ -17,7 +17,7 @@ class sma_prot_device : public device_t
{
public:
// construction/destruction
- sma_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sma_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
//DECLARE_WRITE16_MEMBER( kof99_bankswitch_w );
//DECLARE_WRITE16_MEMBER( garou_bankswitch_w );
@@ -26,23 +26,23 @@ public:
//DECLARE_WRITE16_MEMBER( kof2000_bankswitch_w );
DECLARE_READ16_MEMBER( prot_9a37_r );
DECLARE_READ16_MEMBER( random_r );
- UINT32 kof99_bank_base(UINT16 sel);
- UINT32 garou_bank_base(UINT16 sel);
- UINT32 garouh_bank_base(UINT16 sel);
- UINT32 mslug3_bank_base(UINT16 sel);
- UINT32 kof2000_bank_base(UINT16 sel);
- void kof99_decrypt_68k(UINT8* base);
- void garou_decrypt_68k(UINT8* base);
- void garouh_decrypt_68k(UINT8* base);
- void mslug3_decrypt_68k(UINT8* base);
- void kof2000_decrypt_68k(UINT8* base);
+ uint32_t kof99_bank_base(uint16_t sel);
+ uint32_t garou_bank_base(uint16_t sel);
+ uint32_t garouh_bank_base(uint16_t sel);
+ uint32_t mslug3_bank_base(uint16_t sel);
+ uint32_t kof2000_bank_base(uint16_t sel);
+ void kof99_decrypt_68k(uint8_t* base);
+ void garou_decrypt_68k(uint8_t* base);
+ void garouh_decrypt_68k(uint8_t* base);
+ void mslug3_decrypt_68k(uint8_t* base);
+ void kof2000_decrypt_68k(uint8_t* base);
protected:
virtual void device_start() override;
virtual void device_reset() override;
private:
- UINT16 m_sma_rng;
+ uint16_t m_sma_rng;
};
#endif
diff --git a/src/devices/bus/neogeo/pvc.cpp b/src/devices/bus/neogeo/pvc.cpp
index fbf2cc9b2d8..4787aee080f 100644
--- a/src/devices/bus/neogeo/pvc.cpp
+++ b/src/devices/bus/neogeo/pvc.cpp
@@ -19,14 +19,14 @@
const device_type NEOGEO_PVC_CART = &device_creator<neogeo_pvc_cart>;
-neogeo_pvc_cart::neogeo_pvc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) :
+neogeo_pvc_cart::neogeo_pvc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) :
neogeo_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_cmc_prot(*this, "cmc_prot"),
m_pcm2_prot(*this, "pcm2_prot"),
m_pvc_prot(*this, "pvc_prot")
{}
-neogeo_pvc_cart::neogeo_pvc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) :
+neogeo_pvc_cart::neogeo_pvc_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) :
neogeo_rom_device(mconfig, NEOGEO_PVC_CART, "Neo Geo PVC Cart", tag, owner, clock, "neocart_pvc", __FILE__),
m_cmc_prot(*this, "cmc_prot"),
m_pcm2_prot(*this, "pcm2_prot"),
@@ -71,7 +71,7 @@ machine_config_constructor neogeo_pvc_cart::device_mconfig_additions() const
const device_type NEOGEO_PVC_MSLUG5_CART = &device_creator<neogeo_pvc_mslug5_cart>;
-neogeo_pvc_mslug5_cart::neogeo_pvc_mslug5_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_pvc_mslug5_cart::neogeo_pvc_mslug5_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_pvc_cart(mconfig, NEOGEO_PVC_MSLUG5_CART, "Neo Geo Metal Slug 5 PVC Cart", tag, owner, clock, "neocart_mslug5", __FILE__) {}
void neogeo_pvc_mslug5_cart::decrypt_all(DECRYPT_ALL_PARAMS)
@@ -89,7 +89,7 @@ void neogeo_pvc_mslug5_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_PVC_SVC_CART = &device_creator<neogeo_pvc_svc_cart>;
-neogeo_pvc_svc_cart::neogeo_pvc_svc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_pvc_svc_cart::neogeo_pvc_svc_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_pvc_cart(mconfig, NEOGEO_PVC_SVC_CART, "Neo Geo SNK vs Capcom PVC Cart", tag, owner, clock, "neocart_svc", __FILE__)
{}
@@ -109,7 +109,7 @@ void neogeo_pvc_svc_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_PVC_KOF2003_CART = &device_creator<neogeo_pvc_kof2003_cart>;
-neogeo_pvc_kof2003_cart::neogeo_pvc_kof2003_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_pvc_kof2003_cart::neogeo_pvc_kof2003_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_pvc_cart(mconfig, NEOGEO_PVC_KOF2003_CART, "Neo Geo KOF 2003 PVC Cart", tag, owner, clock, "neocart_kof2003", __FILE__)
{}
@@ -128,7 +128,7 @@ void neogeo_pvc_kof2003_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_PVC_KOF2003H_CART = &device_creator<neogeo_pvc_kof2003h_cart>;
-neogeo_pvc_kof2003h_cart::neogeo_pvc_kof2003h_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_pvc_kof2003h_cart::neogeo_pvc_kof2003h_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_pvc_cart(mconfig, NEOGEO_PVC_KOF2003H_CART, "Neo Geo KOF 2003 AES PVC Cart", tag, owner, clock, "neocart_kof2003h", __FILE__)
{}
diff --git a/src/devices/bus/neogeo/pvc.h b/src/devices/bus/neogeo/pvc.h
index 6dcf17479c4..064efef717a 100644
--- a/src/devices/bus/neogeo/pvc.h
+++ b/src/devices/bus/neogeo/pvc.h
@@ -15,8 +15,8 @@ class neogeo_pvc_cart : public neogeo_rom_device
{
public:
// construction/destruction
- neogeo_pvc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_pvc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_pvc_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source);
+ neogeo_pvc_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock);
// device-level overrides
virtual void device_start() override;
@@ -24,7 +24,7 @@ public:
virtual machine_config_constructor device_mconfig_additions() const override;
// reading and writing
- virtual UINT32 get_bank_base(UINT16 sel) override { return m_pvc_prot->get_bank_base(); }
+ virtual uint32_t get_bank_base(uint16_t sel) override { return m_pvc_prot->get_bank_base(); }
virtual DECLARE_READ16_MEMBER(protection_r) override { return m_pvc_prot->protection_r(space, offset, mem_mask); }
virtual DECLARE_WRITE16_MEMBER(protection_w) override { m_pvc_prot->protection_w(space, offset, data, mem_mask); }
@@ -48,7 +48,7 @@ extern const device_type NEOGEO_PVC_CART;
class neogeo_pvc_mslug5_cart : public neogeo_pvc_cart
{
public:
- neogeo_pvc_mslug5_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_pvc_mslug5_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
};
@@ -63,7 +63,7 @@ extern const device_type NEOGEO_PVC_MSLUG5_CART;
class neogeo_pvc_svc_cart : public neogeo_pvc_cart
{
public:
- neogeo_pvc_svc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_pvc_svc_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 2; }
};
@@ -78,7 +78,7 @@ extern const device_type NEOGEO_PVC_SVC_CART;
class neogeo_pvc_kof2003_cart : public neogeo_pvc_cart
{
public:
- neogeo_pvc_kof2003_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_pvc_kof2003_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 2; }
};
@@ -93,7 +93,7 @@ extern const device_type NEOGEO_PVC_KOF2003_CART;
class neogeo_pvc_kof2003h_cart : public neogeo_pvc_cart
{
public:
- neogeo_pvc_kof2003h_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_pvc_kof2003h_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 2; }
};
diff --git a/src/devices/bus/neogeo/rom.cpp b/src/devices/bus/neogeo/rom.cpp
index 9804ba89e2c..ddfdb18213d 100644
--- a/src/devices/bus/neogeo/rom.cpp
+++ b/src/devices/bus/neogeo/rom.cpp
@@ -20,12 +20,12 @@
const device_type NEOGEO_ROM = &device_creator<neogeo_rom_device>;
-neogeo_rom_device::neogeo_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) :
+neogeo_rom_device::neogeo_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_neogeo_cart_interface(mconfig, *this)
{}
-neogeo_rom_device::neogeo_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) :
+neogeo_rom_device::neogeo_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) :
device_t(mconfig, NEOGEO_ROM, "Neo Geo Standard Carts", tag, owner, clock, "neocart_rom", __FILE__),
device_neogeo_cart_interface(mconfig, *this)
{}
@@ -52,7 +52,7 @@ READ16_MEMBER(neogeo_rom_device::rom_r)
{
// to speed up access to ROM, the access to ROM are actually replaced in the driver
// by accesses to the maincpu rom region, where we have anyway copied the rom content
- UINT16* rom = (get_rom_size()) ? get_rom_base() : get_region_rom_base();
+ uint16_t* rom = (get_rom_size()) ? get_rom_base() : get_region_rom_base();
return rom[offset];
}
@@ -71,7 +71,7 @@ WRITE16_MEMBER(neogeo_rom_device::banksel_w)
const device_type NEOGEO_VLINER_CART = &device_creator<neogeo_vliner_cart>;
-neogeo_vliner_cart::neogeo_vliner_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_vliner_cart::neogeo_vliner_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_rom_device(mconfig, NEOGEO_VLINER_CART, "Neo Geo V-Liner Cart", tag, owner, clock, "neocart_vliner", __FILE__)
{}
diff --git a/src/devices/bus/neogeo/rom.h b/src/devices/bus/neogeo/rom.h
index 99609e2d198..600db5cc7fe 100644
--- a/src/devices/bus/neogeo/rom.h
+++ b/src/devices/bus/neogeo/rom.h
@@ -12,8 +12,8 @@ class neogeo_rom_device : public device_t,
{
public:
// construction/destruction
- neogeo_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source);
+ neogeo_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock);
// device-level overrides
virtual void device_start() override;
@@ -38,7 +38,7 @@ extern const device_type NEOGEO_ROM;
class neogeo_vliner_cart : public neogeo_rom_device
{
public:
- neogeo_vliner_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_vliner_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_READ16_MEMBER(ram_r) override { return m_cart_ram[offset]; }
virtual DECLARE_WRITE16_MEMBER(ram_w) override { COMBINE_DATA(&m_cart_ram[offset]); }
@@ -49,7 +49,7 @@ public:
virtual void device_reset() override;
private:
- UINT16 m_cart_ram[0x1000];
+ uint16_t m_cart_ram[0x1000];
};
extern const device_type NEOGEO_VLINER_CART;
diff --git a/src/devices/bus/neogeo/sbp.cpp b/src/devices/bus/neogeo/sbp.cpp
index 805aeff1214..5947bab07da 100644
--- a/src/devices/bus/neogeo/sbp.cpp
+++ b/src/devices/bus/neogeo/sbp.cpp
@@ -16,7 +16,7 @@
extern const device_type NEOGEO_SBP_CART = &device_creator<neogeo_sbp_cart>;
-neogeo_sbp_cart::neogeo_sbp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_sbp_cart::neogeo_sbp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_rom_device(mconfig, NEOGEO_SBP_CART, "Neo Geo Super Bubble Pop Cart", tag, owner, clock, "neocart_sbp", __FILE__)
{}
@@ -33,9 +33,9 @@ void neogeo_sbp_cart::device_reset()
READ16_MEMBER( neogeo_sbp_cart::protection_r )
{
- UINT16* rom = (get_rom_size()) ? get_rom_base() : get_region_rom_base();
- UINT16 origdata = rom[offset + (0x200/2)];
- UINT16 data = BITSWAP16(origdata, 11,10,9,8,15,14,13,12,3,2,1,0,7,6,5,4);
+ uint16_t* rom = (get_rom_size()) ? get_rom_base() : get_region_rom_base();
+ uint16_t origdata = rom[offset + (0x200/2)];
+ uint16_t data = BITSWAP16(origdata, 11,10,9,8,15,14,13,12,3,2,1,0,7,6,5,4);
int realoffset = 0x200 + (offset * 2);
logerror("sbp_lowerrom_r offset %08x data %04x\n", realoffset, data);
@@ -71,10 +71,10 @@ WRITE16_MEMBER( neogeo_sbp_cart::protection_w )
}
-void neogeo_sbp_cart::patch(UINT8* cpurom, UINT32 cpurom_size)
+void neogeo_sbp_cart::patch(uint8_t* cpurom, uint32_t cpurom_size)
{
/* the game code clears the text overlay used ingame immediately after writing it.. why? protection? sloppy code that the hw ignores? imperfect emulation? */
- UINT16* rom = (UINT16*)cpurom;
+ uint16_t* rom = (uint16_t*)cpurom;
rom[0x2a6f8/2] = 0x4e71;
rom[0x2a6fa/2] = 0x4e71;
diff --git a/src/devices/bus/neogeo/sbp.h b/src/devices/bus/neogeo/sbp.h
index a46fef86ecf..e6cf0e9aa77 100644
--- a/src/devices/bus/neogeo/sbp.h
+++ b/src/devices/bus/neogeo/sbp.h
@@ -15,7 +15,7 @@
class neogeo_sbp_cart : public neogeo_rom_device
{
public:
- neogeo_sbp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_sbp_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -26,7 +26,7 @@ public:
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 0; }
- void patch(UINT8* cpurom, UINT32 cpurom_size);
+ void patch(uint8_t* cpurom, uint32_t cpurom_size);
};
extern const device_type NEOGEO_SBP_CART;
diff --git a/src/devices/bus/neogeo/slot.cpp b/src/devices/bus/neogeo/slot.cpp
index f8664001112..6c1f1906039 100644
--- a/src/devices/bus/neogeo/slot.cpp
+++ b/src/devices/bus/neogeo/slot.cpp
@@ -39,13 +39,13 @@ device_neogeo_cart_interface::~device_neogeo_cart_interface()
{
}
-UINT32 device_neogeo_cart_interface::get_region_mask(UINT8* rgn, UINT32 rgn_size)
+uint32_t device_neogeo_cart_interface::get_region_mask(uint8_t* rgn, uint32_t rgn_size)
{
// get mask based on the length rounded up to the nearest power of 2
- UINT32 mask = 0xffffffff;
- UINT32 len = rgn_size;
+ uint32_t mask = 0xffffffff;
+ uint32_t len = rgn_size;
- for (UINT32 bit = 0x80000000; bit != 0; bit >>= 1)
+ for (uint32_t bit = 0x80000000; bit != 0; bit >>= 1)
{
if ((len * 2 - 1) & bit)
break;
@@ -56,14 +56,14 @@ UINT32 device_neogeo_cart_interface::get_region_mask(UINT8* rgn, UINT32 rgn_size
return mask;
}
-void device_neogeo_cart_interface::optimize_sprites(UINT8* region_sprites, UINT32 region_sprites_size)
+void device_neogeo_cart_interface::optimize_sprites(uint8_t* region_sprites, uint32_t region_sprites_size)
{
// convert the sprite graphics data into a format that allows faster blitting
- UINT32 spritegfx_address_mask = get_region_mask(region_sprites, region_sprites_size);
- UINT8 *src = region_sprites;
+ uint32_t spritegfx_address_mask = get_region_mask(region_sprites, region_sprites_size);
+ uint8_t *src = region_sprites;
m_sprites_opt.resize(spritegfx_address_mask + 1);
- UINT8 *dest = &m_sprites_opt[0];
+ uint8_t *dest = &m_sprites_opt[0];
for (unsigned i = 0; i < region_sprites_size; i += 0x80, src += 0x80)
{
@@ -96,7 +96,7 @@ void device_neogeo_cart_interface::optimize_sprites(UINT8* region_sprites, UINT3
//-------------------------------------------------
// neogeo_cart_slot_device - constructor
//-------------------------------------------------
-neogeo_cart_slot_device::neogeo_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) :
+neogeo_cart_slot_device::neogeo_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) :
device_t(mconfig, NEOGEO_CART_SLOT, "Neo Geo Cartridge Slot", tag, owner, clock, "neogeo_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -240,9 +240,9 @@ image_init_result neogeo_cart_slot_device::call_load()
{
if (software_entry() != nullptr)
{
- UINT16 *ROM16;
- UINT8 *ROM8;
- UINT32 len;
+ uint16_t *ROM16;
+ uint8_t *ROM8;
+ uint32_t len;
const char *pcb_name = get_feature("slot");
if (pcb_name)
@@ -302,7 +302,7 @@ image_init_result neogeo_cart_slot_device::call_load()
}
m_cart->decrypt_all(
- (UINT8*)m_cart->get_rom_base(), m_cart->get_rom_size(),
+ (uint8_t*)m_cart->get_rom_base(), m_cart->get_rom_size(),
m_cart->get_sprites_base(), m_cart->get_sprites_size(),
m_cart->get_fixed_base(), m_cart->get_fixed_size(),
m_cart->get_ym_base(), m_cart->get_ym_size(),
diff --git a/src/devices/bus/neogeo/slot.h b/src/devices/bus/neogeo/slot.h
index 83de22b0a4b..a2413d81589 100644
--- a/src/devices/bus/neogeo/slot.h
+++ b/src/devices/bus/neogeo/slot.h
@@ -81,7 +81,7 @@ enum
// ======================> device_neogeo_cart_interface
#define DECRYPT_ALL_PARAMS \
- UINT8* cpuregion, UINT32 cpuregion_size,UINT8* spr_region, UINT32 spr_region_size,UINT8* fix_region, UINT32 fix_region_size,UINT8* ym_region, UINT32 ym_region_size,UINT8* ymdelta_region, UINT32 ymdelta_region_size,UINT8* audiocpu_region, UINT32 audio_region_size, UINT8* audiocrypt_region, UINT32 audiocrypt_region_size
+ uint8_t* cpuregion, uint32_t cpuregion_size,uint8_t* spr_region, uint32_t spr_region_size,uint8_t* fix_region, uint32_t fix_region_size,uint8_t* ym_region, uint32_t ym_region_size,uint8_t* ymdelta_region, uint32_t ymdelta_region_size,uint8_t* audiocpu_region, uint32_t audio_region_size, uint8_t* audiocrypt_region, uint32_t audiocrypt_region_size
class device_neogeo_cart_interface : public device_slot_card_interface
{
@@ -98,73 +98,73 @@ public:
virtual DECLARE_READ16_MEMBER(protection_r) { return 0xffff; }
virtual DECLARE_WRITE16_MEMBER(protection_w) { };
virtual DECLARE_READ16_MEMBER(addon_r) { return 0xffff; }
- virtual UINT32 get_bank_base(UINT16 sel) { return 0; }
- virtual UINT32 get_special_bank() { return 0; }
- virtual UINT16 get_helper() { return 0; }
+ virtual uint32_t get_bank_base(uint16_t sel) { return 0; }
+ virtual uint32_t get_special_bank() { return 0; }
+ virtual uint16_t get_helper() { return 0; }
virtual void decrypt_all(DECRYPT_ALL_PARAMS) { };
virtual int get_fixed_bank_type(void) { return 0; }
- void rom_alloc(UINT32 size) { m_rom.resize(size/sizeof(UINT16)); }
- UINT16* get_rom_base() { return &m_rom[0]; }
- UINT32 get_rom_size() { return m_rom.size() * sizeof(UINT16); }
- UINT16* get_region_rom_base() { if (m_region_rom.found()) return &m_region_rom->u16(0); return nullptr; }
- UINT32 get_region_rom_size() { if (m_region_rom.found()) return m_region_rom->bytes(); return 0; }
-
- void fixed_alloc(UINT32 size) { m_fixed.resize(size); }
- UINT8* get_fixed_base() { return &m_fixed[0]; }
- UINT32 get_fixed_size() { return m_fixed.size(); }
- UINT8* get_region_fixed_base() { if (m_region_fixed.found()) return m_region_fixed->base(); return nullptr; }
- UINT32 get_region_fixed_size() { if (m_region_fixed.found()) return m_region_fixed->bytes(); return 0; }
-
- void audio_alloc(UINT32 size) { m_audio.resize(size); }
- UINT8* get_audio_base() { return &m_audio[0]; }
- UINT32 get_audio_size() { return m_audio.size(); }
- UINT8* get_region_audio_base() { if (m_region_audio.found()) return m_region_audio->base(); return nullptr; }
- UINT32 get_region_audio_size() { if (m_region_audio.found()) return m_region_audio->bytes(); return 0; }
-
- void audiocrypt_alloc(UINT32 size) { m_audiocrypt.resize(size); }
- UINT8* get_audiocrypt_base() { if (m_audiocrypt.size() == 0) return nullptr; else return &m_audiocrypt[0]; }
- UINT32 get_audiocrypt_size() { return m_audiocrypt.size(); }
- UINT8* get_region_audiocrypt_base() { if (m_region_audiocrypt.found()) return m_region_audiocrypt->base(); return nullptr; }
- UINT32 get_region_audiocrypt_size() { if (m_region_audiocrypt.found()) return m_region_audiocrypt->bytes(); return 0; }
+ void rom_alloc(uint32_t size) { m_rom.resize(size/sizeof(uint16_t)); }
+ uint16_t* get_rom_base() { return &m_rom[0]; }
+ uint32_t get_rom_size() { return m_rom.size() * sizeof(uint16_t); }
+ uint16_t* get_region_rom_base() { if (m_region_rom.found()) return &m_region_rom->u16(0); return nullptr; }
+ uint32_t get_region_rom_size() { if (m_region_rom.found()) return m_region_rom->bytes(); return 0; }
+
+ void fixed_alloc(uint32_t size) { m_fixed.resize(size); }
+ uint8_t* get_fixed_base() { return &m_fixed[0]; }
+ uint32_t get_fixed_size() { return m_fixed.size(); }
+ uint8_t* get_region_fixed_base() { if (m_region_fixed.found()) return m_region_fixed->base(); return nullptr; }
+ uint32_t get_region_fixed_size() { if (m_region_fixed.found()) return m_region_fixed->bytes(); return 0; }
+
+ void audio_alloc(uint32_t size) { m_audio.resize(size); }
+ uint8_t* get_audio_base() { return &m_audio[0]; }
+ uint32_t get_audio_size() { return m_audio.size(); }
+ uint8_t* get_region_audio_base() { if (m_region_audio.found()) return m_region_audio->base(); return nullptr; }
+ uint32_t get_region_audio_size() { if (m_region_audio.found()) return m_region_audio->bytes(); return 0; }
+
+ void audiocrypt_alloc(uint32_t size) { m_audiocrypt.resize(size); }
+ uint8_t* get_audiocrypt_base() { if (m_audiocrypt.size() == 0) return nullptr; else return &m_audiocrypt[0]; }
+ uint32_t get_audiocrypt_size() { return m_audiocrypt.size(); }
+ uint8_t* get_region_audiocrypt_base() { if (m_region_audiocrypt.found()) return m_region_audiocrypt->base(); return nullptr; }
+ uint32_t get_region_audiocrypt_size() { if (m_region_audiocrypt.found()) return m_region_audiocrypt->bytes(); return 0; }
// TODO: review sprite code later!!
- void sprites_alloc(UINT32 size) { m_sprites.resize(size); }
- UINT8* get_sprites_base() { return &m_sprites[0]; }
- UINT32 get_sprites_size() { return m_sprites.size(); }
- UINT8* get_region_sprites_base() { if (m_region_spr.found()) return m_region_spr->base(); return nullptr; }
- UINT32 get_region_sprites_size() { if (m_region_spr.found()) return m_region_spr->bytes(); return 0; }
-
- void ym_alloc(UINT32 size) { m_ym.resize(size); }
- UINT8* get_ym_base() { return &m_ym[0]; }
- UINT32 get_ym_size() { return m_ym.size(); }
- UINT8* get_region_ym_base() { if (m_region_ym.found()) return m_region_ym->base(); return nullptr; }
- UINT32 get_region_ym_size() { if (m_region_ym.found()) return m_region_ym->bytes(); return 0; }
-
- void ymdelta_alloc(UINT32 size) { m_ymdelta.resize(size); }
- UINT8* get_ymdelta_base() { return &m_ymdelta[0]; }
- UINT32 get_ymdelta_size() { return m_ymdelta.size(); }
- UINT8* get_region_ymdelta_base() { if (m_region_ymd.found()) return m_region_ymd->base(); return nullptr; }
- UINT32 get_region_ymdelta_size() { if (m_region_ymd.found()) return m_region_ymd->bytes(); return 0; }
+ void sprites_alloc(uint32_t size) { m_sprites.resize(size); }
+ uint8_t* get_sprites_base() { return &m_sprites[0]; }
+ uint32_t get_sprites_size() { return m_sprites.size(); }
+ uint8_t* get_region_sprites_base() { if (m_region_spr.found()) return m_region_spr->base(); return nullptr; }
+ uint32_t get_region_sprites_size() { if (m_region_spr.found()) return m_region_spr->bytes(); return 0; }
+
+ void ym_alloc(uint32_t size) { m_ym.resize(size); }
+ uint8_t* get_ym_base() { return &m_ym[0]; }
+ uint32_t get_ym_size() { return m_ym.size(); }
+ uint8_t* get_region_ym_base() { if (m_region_ym.found()) return m_region_ym->base(); return nullptr; }
+ uint32_t get_region_ym_size() { if (m_region_ym.found()) return m_region_ym->bytes(); return 0; }
+
+ void ymdelta_alloc(uint32_t size) { m_ymdelta.resize(size); }
+ uint8_t* get_ymdelta_base() { return &m_ymdelta[0]; }
+ uint32_t get_ymdelta_size() { return m_ymdelta.size(); }
+ uint8_t* get_region_ymdelta_base() { if (m_region_ymd.found()) return m_region_ymd->base(); return nullptr; }
+ uint32_t get_region_ymdelta_size() { if (m_region_ymd.found()) return m_region_ymd->bytes(); return 0; }
// this is only used to setup optimized sprites when loading on multi-slot drivers from softlist
// therefore, we do not need a separate region accessor!
- UINT8* get_sprites_opt_base() { return &m_sprites_opt[0]; }
- UINT32 get_sprites_opt_size() { return m_sprites_opt.size(); }
- void optimize_sprites(UINT8* region_sprites, UINT32 region_sprites_size);
+ uint8_t* get_sprites_opt_base() { return &m_sprites_opt[0]; }
+ uint32_t get_sprites_opt_size() { return m_sprites_opt.size(); }
+ void optimize_sprites(uint8_t* region_sprites, uint32_t region_sprites_size);
protected:
// these are allocated when loading from softlist
- std::vector<UINT16> m_rom;
- std::vector<UINT8> m_fixed;
- std::vector<UINT8> m_audio;
- std::vector<UINT8> m_sprites;
- std::vector<UINT8> m_ym;
- std::vector<UINT8> m_ymdelta;
- std::vector<UINT8> m_audiocrypt;
+ std::vector<uint16_t> m_rom;
+ std::vector<uint8_t> m_fixed;
+ std::vector<uint8_t> m_audio;
+ std::vector<uint8_t> m_sprites;
+ std::vector<uint8_t> m_ym;
+ std::vector<uint8_t> m_ymdelta;
+ std::vector<uint8_t> m_audiocrypt;
- std::vector<UINT8> m_sprites_opt;
+ std::vector<uint8_t> m_sprites_opt;
// these replace m_rom, etc. above for non-user configurable carts!
optional_memory_region m_region_rom;
@@ -175,7 +175,7 @@ protected:
optional_memory_region m_region_ym;
optional_memory_region m_region_ymd;
- UINT32 get_region_mask(UINT8* rgn, UINT32 rgn_size);
+ uint32_t get_region_mask(uint8_t* rgn, uint32_t rgn_size);
};
@@ -187,7 +187,7 @@ class neogeo_cart_slot_device : public device_t,
{
public:
// construction/destruction
- neogeo_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock);
virtual ~neogeo_cart_slot_device();
// device-level overrides
@@ -223,105 +223,105 @@ public:
void set_cart_type(const char *slot);
int get_type() { return m_type; }
- UINT16* get_rom_base() {
+ uint16_t* get_rom_base() {
if (m_cart) {
if (!user_loadable()) return m_cart->get_region_rom_base(); else return m_cart->get_rom_base();
}
return nullptr;
}
- UINT32 get_rom_size() {
+ uint32_t get_rom_size() {
if (m_cart) {
if (!user_loadable()) return m_cart->get_region_rom_size(); else return m_cart->get_rom_size();
}
return 0;
}
- UINT8* get_fixed_base() {
+ uint8_t* get_fixed_base() {
if (m_cart) {
if (!user_loadable()) return m_cart->get_region_fixed_base(); else return m_cart->get_fixed_base();
}
return nullptr;
}
- UINT32 get_fixed_size() {
+ uint32_t get_fixed_size() {
if (m_cart) {
if (!user_loadable()) return m_cart->get_region_fixed_size(); else return m_cart->get_fixed_size();
}
return 0;
}
- UINT8* get_sprites_base() {
+ uint8_t* get_sprites_base() {
if (m_cart) {
if (!user_loadable()) return m_cart->get_region_sprites_base(); else return m_cart->get_sprites_base();
}
return nullptr;
}
- UINT32 get_sprites_size() {
+ uint32_t get_sprites_size() {
if (m_cart) {
if (!user_loadable()) return m_cart->get_region_sprites_size(); else return m_cart->get_sprites_size();
}
return 0;
}
- UINT8* get_audio_base() {
+ uint8_t* get_audio_base() {
if (m_cart) {
if (!user_loadable()) return m_cart->get_region_audio_base(); else return m_cart->get_audio_base();
}
return nullptr;
}
- UINT32 get_audio_size() {
+ uint32_t get_audio_size() {
if (m_cart) {
if (!user_loadable()) return m_cart->get_region_audio_size(); else return m_cart->get_audio_size();
}
return 0;
}
- UINT8* get_audiocrypt_base() {
+ uint8_t* get_audiocrypt_base() {
if (m_cart) {
if (!user_loadable()) return m_cart->get_region_audiocrypt_base(); else return m_cart->get_audiocrypt_base();
}
return nullptr;
}
- UINT32 get_audiocrypt_size() {
+ uint32_t get_audiocrypt_size() {
if (m_cart) {
if (!user_loadable()) return m_cart->get_region_audiocrypt_size(); else return m_cart->get_audiocrypt_size();
}
return 0;
}
- UINT8* get_ym_base() {
+ uint8_t* get_ym_base() {
if (m_cart) {
if (!user_loadable()) return m_cart->get_region_ym_base(); else return m_cart->get_ym_base();
}
return nullptr;
}
- UINT32 get_ym_size() {
+ uint32_t get_ym_size() {
if (m_cart) {
if (!user_loadable()) return m_cart->get_region_ym_size(); else return m_cart->get_ym_size();
}
return 0;
}
- UINT8* get_ymdelta_base() {
+ uint8_t* get_ymdelta_base() {
if (m_cart) {
if (!user_loadable()) return m_cart->get_region_ymdelta_base(); else return m_cart->get_ymdelta_base();
}
return nullptr;
}
- UINT32 get_ymdelta_size() {
+ uint32_t get_ymdelta_size() {
if (m_cart) {
if (!user_loadable()) return m_cart->get_region_ymdelta_size(); else return m_cart->get_ymdelta_size();
}
return 0;
}
- UINT8* get_sprites_opt_base() {
+ uint8_t* get_sprites_opt_base() {
if (m_cart) return m_cart->get_sprites_opt_base(); else return nullptr;
}
- UINT32 get_sprites_opt_size() {
+ uint32_t get_sprites_opt_size() {
if (m_cart) return m_cart->get_sprites_opt_size(); else return 0;
}
int get_fixed_bank_type(void) { if (m_cart) return m_cart->get_fixed_bank_type(); return 0; }
- UINT32 get_bank_base(UINT16 sel) { if (m_cart) return m_cart->get_bank_base(sel); return 0; }
- UINT32 get_special_bank() { if (m_cart) return m_cart->get_special_bank(); return 0; }
- UINT16 get_helper() { if (m_cart) return m_cart->get_helper(); return 0; }
+ uint32_t get_bank_base(uint16_t sel) { if (m_cart) return m_cart->get_bank_base(sel); return 0; }
+ uint32_t get_special_bank() { if (m_cart) return m_cart->get_special_bank(); return 0; }
+ uint16_t get_helper() { if (m_cart) return m_cart->get_helper(); return 0; }
void late_decrypt_all() { if (m_cart) m_cart->decrypt_all(
- (UINT8*)get_rom_base(), get_rom_size(),
+ (uint8_t*)get_rom_base(), get_rom_size(),
get_sprites_base(), get_sprites_size(),
get_fixed_base(), get_fixed_size(),
get_ym_base(), get_ym_size(),
diff --git a/src/devices/bus/neogeo/sma.cpp b/src/devices/bus/neogeo/sma.cpp
index d63d3b2bfbf..f376297b24d 100644
--- a/src/devices/bus/neogeo/sma.cpp
+++ b/src/devices/bus/neogeo/sma.cpp
@@ -19,13 +19,13 @@
const device_type NEOGEO_SMA_CART = &device_creator<neogeo_sma_cart>;
-neogeo_sma_cart::neogeo_sma_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source) :
+neogeo_sma_cart::neogeo_sma_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source) :
neogeo_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_sma_prot(*this, "sma_prot"),
m_cmc_prot(*this, "cmc_prot")
{}
-neogeo_sma_cart::neogeo_sma_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock) :
+neogeo_sma_cart::neogeo_sma_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock) :
neogeo_rom_device(mconfig, NEOGEO_SMA_CART, "Neo Geo SMA Cart", tag, owner, clock, "neocart_sma", __FILE__),
m_sma_prot(*this, "sma_prot"),
m_cmc_prot(*this, "cmc_prot")
@@ -66,7 +66,7 @@ machine_config_constructor neogeo_sma_cart::device_mconfig_additions() const
const device_type NEOGEO_SMA_KOF99_CART = &device_creator<neogeo_sma_kof99_cart>;
-neogeo_sma_kof99_cart::neogeo_sma_kof99_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_sma_kof99_cart::neogeo_sma_kof99_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_sma_cart(mconfig, NEOGEO_SMA_KOF99_CART, "Neo Geo KOF 99 SMA Cart", tag, owner, clock, "neocart_kof99", __FILE__)
{}
@@ -84,7 +84,7 @@ void neogeo_sma_kof99_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_SMA_GAROU_CART = &device_creator<neogeo_sma_garou_cart>;
-neogeo_sma_garou_cart::neogeo_sma_garou_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_sma_garou_cart::neogeo_sma_garou_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_sma_cart(mconfig, NEOGEO_SMA_GAROU_CART, "Neo Geo Garou SMA Cart", tag, owner, clock, "neocart_garou", __FILE__)
{}
@@ -102,7 +102,7 @@ void neogeo_sma_garou_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_SMA_GAROUH_CART = &device_creator<neogeo_sma_garouh_cart>;
-neogeo_sma_garouh_cart::neogeo_sma_garouh_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_sma_garouh_cart::neogeo_sma_garouh_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_sma_cart(mconfig, NEOGEO_SMA_GAROUH_CART, "Neo Geo Garou AES SMA Cart", tag, owner, clock, "neocart_garouh", __FILE__)
{}
@@ -120,7 +120,7 @@ void neogeo_sma_garouh_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_SMA_MSLUG3_CART = &device_creator<neogeo_sma_mslug3_cart>;
-neogeo_sma_mslug3_cart::neogeo_sma_mslug3_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_sma_mslug3_cart::neogeo_sma_mslug3_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_sma_cart(mconfig, NEOGEO_SMA_MSLUG3_CART, "Neo Geo Metal Slug 3 SMA Cart", tag, owner, clock, "neocart_mslug3", __FILE__)
{}
@@ -138,7 +138,7 @@ void neogeo_sma_mslug3_cart::decrypt_all(DECRYPT_ALL_PARAMS)
const device_type NEOGEO_SMA_KOF2000_CART = &device_creator<neogeo_sma_kof2000_cart>;
-neogeo_sma_kof2000_cart::neogeo_sma_kof2000_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_sma_kof2000_cart::neogeo_sma_kof2000_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_sma_cart(mconfig, NEOGEO_SMA_KOF2000_CART, "Neo Geo KOF 2000 SMA Cart", tag, owner, clock, "neocart_kof2000", __FILE__)
{}
diff --git a/src/devices/bus/neogeo/sma.h b/src/devices/bus/neogeo/sma.h
index 341b82bea48..6c1631b4cea 100644
--- a/src/devices/bus/neogeo/sma.h
+++ b/src/devices/bus/neogeo/sma.h
@@ -14,8 +14,8 @@ class neogeo_sma_cart : public neogeo_rom_device
{
public:
// construction/destruction
- neogeo_sma_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT16 clock, const char *shortname, const char *source);
- neogeo_sma_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock);
+ neogeo_sma_cart(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint16_t clock, const char *shortname, const char *source);
+ neogeo_sma_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint16_t clock);
// device-level overrides
virtual void device_start() override;
@@ -25,7 +25,7 @@ public:
// reading and writing
virtual DECLARE_READ16_MEMBER(protection_r) override { return m_sma_prot->prot_9a37_r(space, offset, mem_mask); }
virtual DECLARE_READ16_MEMBER(addon_r) override { return m_sma_prot->random_r(space, offset, mem_mask); }
- virtual UINT32 get_bank_base(UINT16 sel) override { return 0; }
+ virtual uint32_t get_bank_base(uint16_t sel) override { return 0; }
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override {}
virtual int get_fixed_bank_type(void) override { return 0; }
@@ -47,10 +47,10 @@ extern const device_type NEOGEO_SMA_CART;
class neogeo_sma_kof99_cart : public neogeo_sma_cart
{
public:
- neogeo_sma_kof99_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_sma_kof99_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
- virtual UINT32 get_bank_base(UINT16 sel) override { return m_sma_prot->kof99_bank_base(sel); }
+ virtual uint32_t get_bank_base(uint16_t sel) override { return m_sma_prot->kof99_bank_base(sel); }
};
extern const device_type NEOGEO_SMA_KOF99_CART;
@@ -63,10 +63,10 @@ extern const device_type NEOGEO_SMA_KOF99_CART;
class neogeo_sma_garou_cart : public neogeo_sma_cart
{
public:
- neogeo_sma_garou_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_sma_garou_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
- virtual UINT32 get_bank_base(UINT16 sel) override { return m_sma_prot->garou_bank_base(sel); }
+ virtual uint32_t get_bank_base(uint16_t sel) override { return m_sma_prot->garou_bank_base(sel); }
};
extern const device_type NEOGEO_SMA_GAROU_CART;
@@ -79,10 +79,10 @@ extern const device_type NEOGEO_SMA_GAROU_CART;
class neogeo_sma_garouh_cart : public neogeo_sma_cart
{
public:
- neogeo_sma_garouh_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_sma_garouh_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
- virtual UINT32 get_bank_base(UINT16 sel) override { return m_sma_prot->garouh_bank_base(sel); }
+ virtual uint32_t get_bank_base(uint16_t sel) override { return m_sma_prot->garouh_bank_base(sel); }
};
extern const device_type NEOGEO_SMA_GAROUH_CART;
@@ -95,10 +95,10 @@ extern const device_type NEOGEO_SMA_GAROUH_CART;
class neogeo_sma_mslug3_cart : public neogeo_sma_cart
{
public:
- neogeo_sma_mslug3_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_sma_mslug3_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 1; }
- virtual UINT32 get_bank_base(UINT16 sel) override { return m_sma_prot->mslug3_bank_base(sel); }
+ virtual uint32_t get_bank_base(uint16_t sel) override { return m_sma_prot->mslug3_bank_base(sel); }
};
extern const device_type NEOGEO_SMA_MSLUG3_CART;
@@ -111,10 +111,10 @@ extern const device_type NEOGEO_SMA_MSLUG3_CART;
class neogeo_sma_kof2000_cart : public neogeo_sma_cart
{
public:
- neogeo_sma_kof2000_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_sma_kof2000_cart(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void decrypt_all(DECRYPT_ALL_PARAMS) override;
virtual int get_fixed_bank_type(void) override { return 2; }
- virtual UINT32 get_bank_base(UINT16 sel) override { return m_sma_prot->kof2000_bank_base(sel); }
+ virtual uint32_t get_bank_base(uint16_t sel) override { return m_sma_prot->kof2000_bank_base(sel); }
};
extern const device_type NEOGEO_SMA_KOF2000_CART;
diff --git a/src/devices/bus/neogeo_ctrl/ctrl.cpp b/src/devices/bus/neogeo_ctrl/ctrl.cpp
index d79410c060b..6bca8e540b6 100644
--- a/src/devices/bus/neogeo_ctrl/ctrl.cpp
+++ b/src/devices/bus/neogeo_ctrl/ctrl.cpp
@@ -84,7 +84,7 @@ device_neogeo_ctrl_edge_interface::~device_neogeo_ctrl_edge_interface()
// neogeo_control_port_device - constructor
//-------------------------------------------------
-neogeo_control_port_device::neogeo_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_control_port_device::neogeo_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NEOGEO_CONTROL_PORT, "SNK Neo Geo control port", tag, owner, clock, "neogeo_control_port", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr)
{
@@ -110,24 +110,24 @@ void neogeo_control_port_device::device_start()
}
-UINT8 neogeo_control_port_device::read_ctrl()
+uint8_t neogeo_control_port_device::read_ctrl()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_device)
data &= m_device->read_ctrl();
return data;
}
-UINT8 neogeo_control_port_device::read_start_sel()
+uint8_t neogeo_control_port_device::read_start_sel()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_device)
data &= m_device->read_start_sel();
return data;
}
-void neogeo_control_port_device::write_ctrlsel(UINT8 data)
+void neogeo_control_port_device::write_ctrlsel(uint8_t data)
{
if (m_device)
m_device->write_ctrlsel(data);
@@ -138,7 +138,7 @@ void neogeo_control_port_device::write_ctrlsel(UINT8 data)
// neogeo_ctrl_edge_port_device - constructor
//-------------------------------------------------
-neogeo_ctrl_edge_port_device::neogeo_ctrl_edge_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_ctrl_edge_port_device::neogeo_ctrl_edge_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NEOGEO_CTRL_EDGE_CONNECTOR, "SNK Neo Geo Edge Connector (Controller)", tag, owner, clock, "neogeo_ctrl_edge", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr)
{
@@ -166,7 +166,7 @@ void neogeo_ctrl_edge_port_device::device_start()
READ8_MEMBER(neogeo_ctrl_edge_port_device::in0_r)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_device)
data &= m_device->in0_r(space, offset, mem_mask);
return data;
@@ -174,21 +174,21 @@ READ8_MEMBER(neogeo_ctrl_edge_port_device::in0_r)
READ8_MEMBER(neogeo_ctrl_edge_port_device::in1_r)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_device)
data &= m_device->in1_r(space, offset, mem_mask);
return data;
}
-UINT8 neogeo_ctrl_edge_port_device::read_start_sel()
+uint8_t neogeo_ctrl_edge_port_device::read_start_sel()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_device)
data &= m_device->read_start_sel();
return data;
}
-void neogeo_ctrl_edge_port_device::write_ctrlsel(UINT8 data)
+void neogeo_ctrl_edge_port_device::write_ctrlsel(uint8_t data)
{
if (m_device)
m_device->write_ctrlsel(data);
diff --git a/src/devices/bus/neogeo_ctrl/ctrl.h b/src/devices/bus/neogeo_ctrl/ctrl.h
index 1d61e6753d1..678e9871cfa 100644
--- a/src/devices/bus/neogeo_ctrl/ctrl.h
+++ b/src/devices/bus/neogeo_ctrl/ctrl.h
@@ -30,9 +30,9 @@ public:
device_neogeo_control_port_interface(const machine_config &mconfig, device_t &device);
virtual ~device_neogeo_control_port_interface();
- virtual UINT8 read_ctrl() { return 0xff; };
- virtual UINT8 read_start_sel() { return 0xff; };
- virtual void write_ctrlsel(UINT8 data) { };
+ virtual uint8_t read_ctrl() { return 0xff; };
+ virtual uint8_t read_start_sel() { return 0xff; };
+ virtual void write_ctrlsel(uint8_t data) { };
protected:
neogeo_control_port_device *m_port;
@@ -45,12 +45,12 @@ class neogeo_control_port_device : public device_t,
{
public:
// construction/destruction
- neogeo_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~neogeo_control_port_device();
- UINT8 read_ctrl();
- UINT8 read_start_sel();
- void write_ctrlsel(UINT8 data);
+ uint8_t read_ctrl();
+ uint8_t read_start_sel();
+ void write_ctrlsel(uint8_t data);
DECLARE_READ8_MEMBER( ctrl_r ) { return read_ctrl(); }
protected:
@@ -70,10 +70,10 @@ public:
device_neogeo_ctrl_edge_interface(const machine_config &mconfig, device_t &device);
virtual ~device_neogeo_ctrl_edge_interface();
- virtual UINT8 read_start_sel() { return 0xff; }
+ virtual uint8_t read_start_sel() { return 0xff; }
virtual DECLARE_READ8_MEMBER( in0_r ) { return 0xff; }
virtual DECLARE_READ8_MEMBER( in1_r ) { return 0xff; }
- virtual void write_ctrlsel(UINT8 data) { }
+ virtual void write_ctrlsel(uint8_t data) { }
protected:
neogeo_ctrl_edge_port_device *m_port;
@@ -86,13 +86,13 @@ class neogeo_ctrl_edge_port_device : public device_t,
{
public:
// construction/destruction
- neogeo_ctrl_edge_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_ctrl_edge_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~neogeo_ctrl_edge_port_device();
- UINT8 read_start_sel();
+ uint8_t read_start_sel();
DECLARE_READ8_MEMBER( in0_r );
DECLARE_READ8_MEMBER( in1_r );
- void write_ctrlsel(UINT8 data);
+ void write_ctrlsel(uint8_t data);
protected:
// device-level overrides
diff --git a/src/devices/bus/neogeo_ctrl/dial.cpp b/src/devices/bus/neogeo_ctrl/dial.cpp
index d73a7b6c8de..2885d9beb55 100644
--- a/src/devices/bus/neogeo_ctrl/dial.cpp
+++ b/src/devices/bus/neogeo_ctrl/dial.cpp
@@ -60,7 +60,7 @@ ioport_constructor neogeo_dial_device::device_input_ports() const
// neogeo_dial_device - constructor
//-------------------------------------------------
-neogeo_dial_device::neogeo_dial_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_dial_device::neogeo_dial_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NEOGEO_DIAL, "SNK Neo Geo Dial Controller", tag, owner, clock, "neogeo_dial", __FILE__),
device_neogeo_ctrl_edge_interface(mconfig, *this),
m_joy1(*this, "JOY1"),
@@ -97,7 +97,7 @@ void neogeo_dial_device::device_reset()
READ8_MEMBER(neogeo_dial_device::in0_r)
{
- UINT8 res = 0;
+ uint8_t res = 0;
if (m_ctrl_sel & 0x01)
res = m_joy1->read();
else
@@ -112,7 +112,7 @@ READ8_MEMBER(neogeo_dial_device::in0_r)
READ8_MEMBER(neogeo_dial_device::in1_r)
{
- UINT8 res = 0;
+ uint8_t res = 0;
if (m_ctrl_sel & 0x01)
res = m_joy2->read();
else
@@ -125,7 +125,7 @@ READ8_MEMBER(neogeo_dial_device::in1_r)
// write_ctrlsel
//-------------------------------------------------
-void neogeo_dial_device::write_ctrlsel(UINT8 data)
+void neogeo_dial_device::write_ctrlsel(uint8_t data)
{
m_ctrl_sel = data;
}
diff --git a/src/devices/bus/neogeo_ctrl/dial.h b/src/devices/bus/neogeo_ctrl/dial.h
index 5727c540637..ff4d9d12dfe 100644
--- a/src/devices/bus/neogeo_ctrl/dial.h
+++ b/src/devices/bus/neogeo_ctrl/dial.h
@@ -26,7 +26,7 @@ class neogeo_dial_device : public device_t,
{
public:
// construction/destruction
- neogeo_dial_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_dial_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -39,14 +39,14 @@ protected:
// device_neogeo_control_port_interface overrides
virtual DECLARE_READ8_MEMBER( in0_r ) override;
virtual DECLARE_READ8_MEMBER( in1_r ) override;
- virtual void write_ctrlsel(UINT8 data) override;
+ virtual void write_ctrlsel(uint8_t data) override;
private:
required_ioport m_joy1;
required_ioport m_joy2;
required_ioport m_dial1;
required_ioport m_dial2;
- UINT8 m_ctrl_sel;
+ uint8_t m_ctrl_sel;
};
diff --git a/src/devices/bus/neogeo_ctrl/irrmaze.cpp b/src/devices/bus/neogeo_ctrl/irrmaze.cpp
index e22941e5d09..3ada54927c8 100644
--- a/src/devices/bus/neogeo_ctrl/irrmaze.cpp
+++ b/src/devices/bus/neogeo_ctrl/irrmaze.cpp
@@ -49,7 +49,7 @@ ioport_constructor neogeo_irrmaze_device::device_input_ports() const
// neogeo_irrmaze_device - constructor
//-------------------------------------------------
-neogeo_irrmaze_device::neogeo_irrmaze_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_irrmaze_device::neogeo_irrmaze_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NEOGEO_IRRMAZE, "SNK Neo Geo Irritating Maze Analog Controller", tag, owner, clock, "neogeo_irrmaze", __FILE__),
device_neogeo_ctrl_edge_interface(mconfig, *this),
m_tx(*this, "TRACK_X"),
@@ -85,7 +85,7 @@ void neogeo_irrmaze_device::device_reset()
READ8_MEMBER(neogeo_irrmaze_device::in0_r)
{
- UINT8 res = 0;
+ uint8_t res = 0;
if (m_ctrl_sel & 0x01)
res = m_ty->read();
else
@@ -107,7 +107,7 @@ READ8_MEMBER(neogeo_irrmaze_device::in1_r)
// write_ctrlsel
//-------------------------------------------------
-void neogeo_irrmaze_device::write_ctrlsel(UINT8 data)
+void neogeo_irrmaze_device::write_ctrlsel(uint8_t data)
{
m_ctrl_sel = data;
}
diff --git a/src/devices/bus/neogeo_ctrl/irrmaze.h b/src/devices/bus/neogeo_ctrl/irrmaze.h
index 0eeecfb8a11..2ba9c17c13a 100644
--- a/src/devices/bus/neogeo_ctrl/irrmaze.h
+++ b/src/devices/bus/neogeo_ctrl/irrmaze.h
@@ -26,7 +26,7 @@ class neogeo_irrmaze_device : public device_t,
{
public:
// construction/destruction
- neogeo_irrmaze_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_irrmaze_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -39,13 +39,13 @@ protected:
// device_neogeo_control_port_interface overrides
virtual DECLARE_READ8_MEMBER( in0_r ) override;
virtual DECLARE_READ8_MEMBER( in1_r ) override;
- virtual void write_ctrlsel(UINT8 data) override;
+ virtual void write_ctrlsel(uint8_t data) override;
private:
required_ioport m_tx;
required_ioport m_ty;
required_ioport m_buttons;
- UINT8 m_ctrl_sel;
+ uint8_t m_ctrl_sel;
};
diff --git a/src/devices/bus/neogeo_ctrl/joystick.cpp b/src/devices/bus/neogeo_ctrl/joystick.cpp
index 5dbb605434a..906a1cdc863 100644
--- a/src/devices/bus/neogeo_ctrl/joystick.cpp
+++ b/src/devices/bus/neogeo_ctrl/joystick.cpp
@@ -59,7 +59,7 @@ ioport_constructor neogeo_joystick_device::device_input_ports() const
// neogeo_joystick_device - constructor
//-------------------------------------------------
-neogeo_joystick_device::neogeo_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_joystick_device::neogeo_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NEOGEO_JOY, "SNK Neo Geo Joystick", tag, owner, clock, "neogeo_joy", __FILE__),
device_neogeo_control_port_interface(mconfig, *this),
m_joy(*this, "JOY"),
@@ -90,7 +90,7 @@ void neogeo_joystick_device::device_reset()
// read_ctrl
//-------------------------------------------------
-UINT8 neogeo_joystick_device::read_ctrl()
+uint8_t neogeo_joystick_device::read_ctrl()
{
return m_joy->read();
}
@@ -99,7 +99,7 @@ UINT8 neogeo_joystick_device::read_ctrl()
// read_start_sel
//-------------------------------------------------
-UINT8 neogeo_joystick_device::read_start_sel()
+uint8_t neogeo_joystick_device::read_start_sel()
{
return m_ss->read();
}
@@ -160,7 +160,7 @@ ioport_constructor neogeo_joy_ac_device::device_input_ports() const
// neogeo_joy_ac_device / neogeo_joystick_device - constructor
//-------------------------------------------------
-neogeo_joy_ac_device::neogeo_joy_ac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_joy_ac_device::neogeo_joy_ac_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NEOGEO_JOY_AC, "SNK Neo Geo Arcade Joystick", tag, owner, clock, "neogeo_joyac", __FILE__),
device_neogeo_ctrl_edge_interface(mconfig, *this),
m_joy1(*this, "JOY1"),
diff --git a/src/devices/bus/neogeo_ctrl/joystick.h b/src/devices/bus/neogeo_ctrl/joystick.h
index 86cccd6fef8..c7f571f6d36 100644
--- a/src/devices/bus/neogeo_ctrl/joystick.h
+++ b/src/devices/bus/neogeo_ctrl/joystick.h
@@ -26,7 +26,7 @@ class neogeo_joystick_device : public device_t,
{
public:
// construction/destruction
- neogeo_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,8 +37,8 @@ protected:
virtual void device_reset() override;
// device_neogeo_control_port_interface overrides
- virtual UINT8 read_ctrl() override;
- virtual UINT8 read_start_sel() override;
+ virtual uint8_t read_ctrl() override;
+ virtual uint8_t read_start_sel() override;
private:
required_ioport m_joy;
@@ -53,7 +53,7 @@ class neogeo_joy_ac_device : public device_t,
{
public:
// construction/destruction
- neogeo_joy_ac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_joy_ac_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/neogeo_ctrl/kizuna4p.cpp b/src/devices/bus/neogeo_ctrl/kizuna4p.cpp
index b6b93089fe4..6a18ed07a92 100644
--- a/src/devices/bus/neogeo_ctrl/kizuna4p.cpp
+++ b/src/devices/bus/neogeo_ctrl/kizuna4p.cpp
@@ -84,7 +84,7 @@ ioport_constructor neogeo_kizuna4p_device::device_input_ports() const
// neogeo_kizuna4p_device - constructor
//-------------------------------------------------
-neogeo_kizuna4p_device::neogeo_kizuna4p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_kizuna4p_device::neogeo_kizuna4p_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NEOGEO_KIZ4P, "SNK Neo Geo Kizuna 4P Controller", tag, owner, clock, "neogeo_kiz4p", __FILE__),
device_neogeo_ctrl_edge_interface(mconfig, *this),
m_joy1(*this, "JOY1"),
@@ -123,7 +123,7 @@ void neogeo_kizuna4p_device::device_reset()
READ8_MEMBER(neogeo_kizuna4p_device::in0_r)
{
- UINT8 res = 0;
+ uint8_t res = 0;
if (m_ctrl_sel & 0x01)
res = m_joy3->read();
else
@@ -140,7 +140,7 @@ READ8_MEMBER(neogeo_kizuna4p_device::in0_r)
READ8_MEMBER(neogeo_kizuna4p_device::in1_r)
{
- UINT8 res = 0;
+ uint8_t res = 0;
if (m_ctrl_sel & 0x01)
res = m_joy4->read();
else
@@ -155,7 +155,7 @@ READ8_MEMBER(neogeo_kizuna4p_device::in1_r)
// read_start_sel
//-------------------------------------------------
-UINT8 neogeo_kizuna4p_device::read_start_sel()
+uint8_t neogeo_kizuna4p_device::read_start_sel()
{
return (BIT(m_ss1->read(), m_ctrl_sel & 0x01)) | (BIT(m_ss2->read(), m_ctrl_sel & 0x01) << 2);
}
@@ -165,7 +165,7 @@ UINT8 neogeo_kizuna4p_device::read_start_sel()
// write_ctrlsel
//-------------------------------------------------
-void neogeo_kizuna4p_device::write_ctrlsel(UINT8 data)
+void neogeo_kizuna4p_device::write_ctrlsel(uint8_t data)
{
m_ctrl_sel = data;
}
diff --git a/src/devices/bus/neogeo_ctrl/kizuna4p.h b/src/devices/bus/neogeo_ctrl/kizuna4p.h
index 7a3907f98db..d35b7d15ca2 100644
--- a/src/devices/bus/neogeo_ctrl/kizuna4p.h
+++ b/src/devices/bus/neogeo_ctrl/kizuna4p.h
@@ -26,7 +26,7 @@ class neogeo_kizuna4p_device : public device_t,
{
public:
// construction/destruction
- neogeo_kizuna4p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_kizuna4p_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -39,8 +39,8 @@ protected:
// device_neogeo_control_port_interface overrides
virtual DECLARE_READ8_MEMBER( in0_r ) override;
virtual DECLARE_READ8_MEMBER( in1_r ) override;
- virtual UINT8 read_start_sel() override;
- virtual void write_ctrlsel(UINT8 data) override;
+ virtual uint8_t read_start_sel() override;
+ virtual void write_ctrlsel(uint8_t data) override;
private:
required_ioport m_joy1;
@@ -49,7 +49,7 @@ private:
required_ioport m_joy4;
required_ioport m_ss1;
required_ioport m_ss2;
- UINT8 m_ctrl_sel;
+ uint8_t m_ctrl_sel;
};
diff --git a/src/devices/bus/neogeo_ctrl/mahjong.cpp b/src/devices/bus/neogeo_ctrl/mahjong.cpp
index ed55fefc1b0..d77403ed255 100644
--- a/src/devices/bus/neogeo_ctrl/mahjong.cpp
+++ b/src/devices/bus/neogeo_ctrl/mahjong.cpp
@@ -93,19 +93,19 @@ ioport_constructor neogeo_mjctrl_device::device_input_ports() const
// neogeo_joystick_device - constructor
//-------------------------------------------------
-neogeo_mjctrl_ac_device::neogeo_mjctrl_ac_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+neogeo_mjctrl_ac_device::neogeo_mjctrl_ac_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
, device_neogeo_control_port_interface(mconfig, *this)
, m_mjpanel(*this, "MJ.%u", 0)
{
}
-neogeo_mjctrl_ac_device::neogeo_mjctrl_ac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+neogeo_mjctrl_ac_device::neogeo_mjctrl_ac_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: neogeo_mjctrl_ac_device(mconfig, NEOGEO_MJCTRL_AC, "SNK Neo Geo Arcade Mahjong panel", tag, owner, clock, "neogeo_mjac", __FILE__)
{
}
-neogeo_mjctrl_device::neogeo_mjctrl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+neogeo_mjctrl_device::neogeo_mjctrl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
neogeo_mjctrl_ac_device(mconfig, NEOGEO_MJCTRL, "SNK Neo Geo Mahjong controller", tag, owner, clock, "neogeo_mjctrl", __FILE__),
m_ss(*this, "START_SELECT")
{
@@ -136,9 +136,9 @@ void neogeo_mjctrl_ac_device::device_reset()
// read_ctrl
//-------------------------------------------------
-UINT8 neogeo_mjctrl_ac_device::read_ctrl()
+uint8_t neogeo_mjctrl_ac_device::read_ctrl()
{
- UINT8 res = 0;
+ uint8_t res = 0;
switch (m_ctrl_sel)
{
default:
@@ -156,7 +156,7 @@ UINT8 neogeo_mjctrl_ac_device::read_ctrl()
// write_ctrlsel
//-------------------------------------------------
-void neogeo_mjctrl_ac_device::write_ctrlsel(UINT8 data)
+void neogeo_mjctrl_ac_device::write_ctrlsel(uint8_t data)
{
m_ctrl_sel = data;
}
@@ -165,7 +165,7 @@ void neogeo_mjctrl_ac_device::write_ctrlsel(UINT8 data)
// read_start_sel
//-------------------------------------------------
-UINT8 neogeo_mjctrl_device::read_start_sel()
+uint8_t neogeo_mjctrl_device::read_start_sel()
{
return m_ss->read();
}
diff --git a/src/devices/bus/neogeo_ctrl/mahjong.h b/src/devices/bus/neogeo_ctrl/mahjong.h
index 52812a9917e..d92b974b213 100644
--- a/src/devices/bus/neogeo_ctrl/mahjong.h
+++ b/src/devices/bus/neogeo_ctrl/mahjong.h
@@ -26,8 +26,8 @@ class neogeo_mjctrl_ac_device : public device_t,
{
public:
// construction/destruction
- neogeo_mjctrl_ac_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- neogeo_mjctrl_ac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_mjctrl_ac_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ neogeo_mjctrl_ac_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -38,12 +38,12 @@ protected:
virtual void device_reset() override;
// device_neogeo_control_port_interface overrides
- virtual UINT8 read_ctrl() override;
- virtual void write_ctrlsel(UINT8 data) override;
+ virtual uint8_t read_ctrl() override;
+ virtual void write_ctrlsel(uint8_t data) override;
private:
required_ioport_array<4> m_mjpanel;
- UINT8 m_ctrl_sel;
+ uint8_t m_ctrl_sel;
};
// ======================> neogeo_mjctrl_device
@@ -52,7 +52,7 @@ class neogeo_mjctrl_device : public neogeo_mjctrl_ac_device
{
public:
// construction/destruction
- neogeo_mjctrl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ neogeo_mjctrl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -60,7 +60,7 @@ public:
protected:
// device_neogeo_control_port_interface overrides
- virtual UINT8 read_start_sel() override;
+ virtual uint8_t read_start_sel() override;
private:
required_ioport m_ss;
diff --git a/src/devices/bus/nes/2a03pur.cpp b/src/devices/bus/nes/2a03pur.cpp
index d7c807b63f2..9fc9da33883 100644
--- a/src/devices/bus/nes/2a03pur.cpp
+++ b/src/devices/bus/nes/2a03pur.cpp
@@ -34,7 +34,7 @@
const device_type NES_2A03PURITANS = &device_creator<nes_2a03pur_device>;
-nes_2a03pur_device::nes_2a03pur_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_2a03pur_device::nes_2a03pur_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_2A03PURITANS, "NES Cart 2A03 Puritans Album PCB", tag, owner, clock, "nes_2a03pur", __FILE__)
{
}
diff --git a/src/devices/bus/nes/2a03pur.h b/src/devices/bus/nes/2a03pur.h
index 6bcafadb7d5..755957c0f95 100644
--- a/src/devices/bus/nes/2a03pur.h
+++ b/src/devices/bus/nes/2a03pur.h
@@ -12,7 +12,7 @@ class nes_2a03pur_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_2a03pur_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_2a03pur_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -22,7 +22,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg[8];
+ uint8_t m_reg[8];
};
diff --git a/src/devices/bus/nes/act53.cpp b/src/devices/bus/nes/act53.cpp
index 225be65d449..98bc04539ef 100644
--- a/src/devices/bus/nes/act53.cpp
+++ b/src/devices/bus/nes/act53.cpp
@@ -32,7 +32,7 @@
const device_type NES_ACTION53 = &device_creator<nes_action53_device>;
-nes_action53_device::nes_action53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_action53_device::nes_action53_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_ACTION53, "NES Cart Action 53 PCB", tag, owner, clock, "nes_action53", __FILE__),
m_sel(0)
{
@@ -105,10 +105,10 @@ void nes_action53_device::pcb_reset()
void nes_action53_device::update_prg()
{
- UINT8 prg_lo, prg_hi, helper;
- UINT8 out = (m_reg[3] & 0x3f) << 1; // Outer PRG reg
- UINT8 size = (m_reg[2] & 0x30) >> 4; // Game size
- UINT8 mask = (1 << (size + 1)) - 1; // Bits to be taken from PRG reg
+ uint8_t prg_lo, prg_hi, helper;
+ uint8_t out = (m_reg[3] & 0x3f) << 1; // Outer PRG reg
+ uint8_t size = (m_reg[2] & 0x30) >> 4; // Game size
+ uint8_t mask = (1 << (size + 1)) - 1; // Bits to be taken from PRG reg
if (!BIT(m_reg[2], 3))
{
diff --git a/src/devices/bus/nes/act53.h b/src/devices/bus/nes/act53.h
index e3b395ce1cd..3d9c8d53155 100644
--- a/src/devices/bus/nes/act53.h
+++ b/src/devices/bus/nes/act53.h
@@ -12,7 +12,7 @@ class nes_action53_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_action53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_action53_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -24,8 +24,8 @@ public:
private:
void update_prg();
void update_mirr();
- UINT8 m_sel;
- UINT8 m_reg[4];
+ uint8_t m_sel;
+ uint8_t m_reg[4];
};
diff --git a/src/devices/bus/nes/aladdin.cpp b/src/devices/bus/nes/aladdin.cpp
index d0f1ba00426..dcdd4e5e4d9 100644
--- a/src/devices/bus/nes/aladdin.cpp
+++ b/src/devices/bus/nes/aladdin.cpp
@@ -66,7 +66,7 @@ READ8_MEMBER(aladdin_cart_interface::read)
const device_type NES_ALADDIN_SLOT = &device_creator<nes_aladdin_slot_device>;
-nes_aladdin_slot_device::nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_aladdin_slot_device::nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_ALADDIN_SLOT, "NES Aladdin Deck Enhancer Cartridge Slot", tag, owner, clock, "nes_ade_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr)
@@ -96,8 +96,8 @@ image_init_result nes_aladdin_slot_device::call_load()
{
if (m_cart)
{
- UINT8 *ROM = m_cart->get_cart_base();
- UINT32 size;
+ uint8_t *ROM = m_cart->get_cart_base();
+ uint32_t size;
if (!ROM)
return image_init_result::FAIL;
@@ -107,14 +107,14 @@ image_init_result nes_aladdin_slot_device::call_load()
if (length() != 0x20010 && length() != 0x40010)
return image_init_result::FAIL;
- UINT8 temp[0x40010];
+ uint8_t temp[0x40010];
size = length() - 0x10;
fread(&temp, length());
memcpy(ROM, temp + 0x10, size);
// double check that iNES files are really mapper 71 or 232
{
- UINT8 mapper = (temp[6] & 0xf0) >> 4;
+ uint8_t mapper = (temp[6] & 0xf0) >> 4;
mapper |= temp[7] & 0xf0;
if (mapper != 71 && mapper != 232)
return image_init_result::FAIL;
@@ -141,9 +141,9 @@ std::string nes_aladdin_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string = "algn";
- UINT32 len = m_file->size();
- std::vector<UINT8> rom(len);
- UINT8 mapper;
+ uint32_t len = m_file->size();
+ std::vector<uint8_t> rom(len);
+ uint8_t mapper;
m_file->read(&rom[0], len);
@@ -177,26 +177,26 @@ ROM_END
const device_type NES_ALGN_ROM = &device_creator<nes_algn_rom_device>;
const device_type NES_ALGQ_ROM = &device_creator<nes_algq_rom_device>;
-nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
aladdin_cart_interface( mconfig, *this )
{
}
-nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_algn_rom_device::nes_algn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, NES_ALGN_ROM, "NES Aladdin Deck Enhancer ALGN ROM", tag, owner, clock, "nes_algn_rom", __FILE__),
aladdin_cart_interface( mconfig, *this )
{
}
-nes_algq_rom_device::nes_algq_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_algq_rom_device::nes_algq_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_algn_rom_device(mconfig, NES_ALGQ_ROM, "NES Aladdin Deck Enhancer ALGQ ROM", tag, owner, clock, "nes_algq_rom", __FILE__), m_bank_base(0)
{
}
void nes_algn_rom_device::device_start()
{
- m_rom = (UINT8*)memregion("aderom")->base();
+ m_rom = (uint8_t*)memregion("aderom")->base();
save_item(NAME(m_lobank));
}
@@ -208,7 +208,7 @@ void nes_algn_rom_device::device_reset()
void nes_algq_rom_device::device_start()
{
- m_rom = (UINT8*)memregion("aderom")->base();
+ m_rom = (uint8_t*)memregion("aderom")->base();
save_item(NAME(m_lobank));
save_item(NAME(m_hibank));
save_item(NAME(m_bank_base));
@@ -226,19 +226,19 @@ const tiny_rom_entry *nes_algn_rom_device::device_rom_region() const
return ROM_NAME( ade_rom );
}
-UINT8 *nes_algn_rom_device::get_cart_base()
+uint8_t *nes_algn_rom_device::get_cart_base()
{
return m_rom;
}
-void nes_algn_rom_device::write_prg(UINT32 offset, UINT8 data)
+void nes_algn_rom_device::write_prg(uint32_t offset, uint8_t data)
{
// m_hibank is fixed to the last available bank!
if (offset >= 0x4000)
m_lobank = data & m_rom_mask;
}
-void nes_algq_rom_device::write_prg(UINT32 offset, UINT8 data)
+void nes_algq_rom_device::write_prg(uint32_t offset, uint8_t data)
{
// here hibank & lobank variables are used differently
// m_bank_base = 64K block
@@ -264,7 +264,7 @@ void nes_algq_rom_device::write_prg(UINT32 offset, UINT8 data)
const device_type NES_ALADDIN = &device_creator<nes_aladdin_device>;
-nes_aladdin_device::nes_aladdin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_aladdin_device::nes_aladdin_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_ALADDIN, "NES Cart Camerica Aladdin PCB", tag, owner, clock, "nes_aladdin", __FILE__),
m_subslot(*this, "ade_slot")
{
diff --git a/src/devices/bus/nes/aladdin.h b/src/devices/bus/nes/aladdin.h
index 589fc3d87ec..990f0242ac7 100644
--- a/src/devices/bus/nes/aladdin.h
+++ b/src/devices/bus/nes/aladdin.h
@@ -25,15 +25,15 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(read);
- UINT8 *get_cart_base() { return m_rom; }
- void set_cart_size(UINT32 size) { m_rom_size = size; m_rom_mask = (size / 0x4000) - 1; }
- virtual void write_prg(UINT32 offset, UINT8 data) { }
+ uint8_t *get_cart_base() { return m_rom; }
+ void set_cart_size(uint32_t size) { m_rom_size = size; m_rom_mask = (size / 0x4000) - 1; }
+ virtual void write_prg(uint32_t offset, uint8_t data) { }
protected:
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
- UINT8 m_lobank, m_hibank, m_rom_mask;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
+ uint8_t m_lobank, m_hibank, m_rom_mask;
};
// ======================> nes_aladdin_slot_device
@@ -44,7 +44,7 @@ class nes_aladdin_slot_device : public device_t,
{
public:
// construction/destruction
- nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~nes_aladdin_slot_device();
// device-level overrides
@@ -68,7 +68,7 @@ public:
virtual std::string get_default_card_software() override;
virtual DECLARE_READ8_MEMBER(read);
- void write_prg(UINT32 offset, UINT8 data) { if (m_cart) m_cart->write_prg(offset, data); }
+ void write_prg(uint32_t offset, uint8_t data) { if (m_cart) m_cart->write_prg(offset, data); }
aladdin_cart_interface* m_cart;
};
@@ -95,13 +95,13 @@ class nes_algn_rom_device : public device_t,
{
public:
// construction/destruction
- nes_algn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_algn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_algn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_algn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
- virtual UINT8* get_cart_base();
- virtual void write_prg(UINT32 offset, UINT8 data) override;
+ virtual uint8_t* get_cart_base();
+ virtual void write_prg(uint32_t offset, uint8_t data) override;
protected:
// device-level overrides
@@ -116,17 +116,17 @@ class nes_algq_rom_device : public nes_algn_rom_device
{
public:
// construction/destruction
- nes_algq_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_algq_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
- virtual void write_prg(UINT32 offset, UINT8 data) override;
+ virtual void write_prg(uint32_t offset, uint8_t data) override;
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
- UINT8 m_bank_base;
+ uint8_t m_bank_base;
};
// device type definition
@@ -146,7 +146,7 @@ class nes_aladdin_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_aladdin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_aladdin_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/ave.cpp b/src/devices/bus/nes/ave.cpp
index c1103f228ac..9634f39e202 100644
--- a/src/devices/bus/nes/ave.cpp
+++ b/src/devices/bus/nes/ave.cpp
@@ -38,17 +38,17 @@ const device_type NES_NINA006 = &device_creator<nes_nina006_device>;
const device_type NES_MAXI15 = &device_creator<nes_maxi15_device>;
-nes_nina001_device::nes_nina001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_nina001_device::nes_nina001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_NINA001, "NES Cart AVE Nina-001 PCB", tag, owner, clock, "nes_nina001", __FILE__)
{
}
-nes_nina006_device::nes_nina006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_nina006_device::nes_nina006_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_NINA006, "NES Cart AVE Nina-006 PCB", tag, owner, clock, "nes_nina006", __FILE__)
{
}
-nes_maxi15_device::nes_maxi15_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_maxi15_device::nes_maxi15_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_MAXI15, "NES Cart AVE Maxi 15 PCB", tag, owner, clock, "nes_maxi15", __FILE__), m_reg(0), m_bank(0)
{
}
diff --git a/src/devices/bus/nes/ave.h b/src/devices/bus/nes/ave.h
index 936d93ce392..7648cc7ce46 100644
--- a/src/devices/bus/nes/ave.h
+++ b/src/devices/bus/nes/ave.h
@@ -12,7 +12,7 @@ class nes_nina001_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_nina001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_nina001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_nina006_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_nina006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_nina006_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -44,7 +44,7 @@ class nes_maxi15_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_maxi15_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_maxi15_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -54,7 +54,7 @@ public:
private:
void update_banks();
- UINT8 m_reg, m_bank;
+ uint8_t m_reg, m_bank;
};
diff --git a/src/devices/bus/nes/bandai.cpp b/src/devices/bus/nes/bandai.cpp
index 8a223a5d645..8a3af94a65f 100644
--- a/src/devices/bus/nes/bandai.cpp
+++ b/src/devices/bus/nes/bandai.cpp
@@ -58,49 +58,49 @@ const device_type NES_LZ93D50_24C02 = &device_creator<nes_lz93d50_24c02_device>;
const device_type NES_FJUMP2 = &device_creator<nes_fjump2_device>;
-nes_oekakids_device::nes_oekakids_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_oekakids_device::nes_oekakids_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_OEKAKIDS, "NES Cart Bandai Oeka Kids PCB", tag, owner, clock, "nes_oeka", __FILE__), m_reg(0), m_latch(0)
{
}
-nes_fcg_device::nes_fcg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_fcg_device::nes_fcg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_fcg_device::nes_fcg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_fcg_device::nes_fcg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_FCG, "NES Cart Bandai FCG PCB", tag, owner, clock, "nes_fcg", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_fcg_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_lz93d50_device::nes_lz93d50_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_fcg_device(mconfig, NES_LZ93D50, "NES Cart Bandai LZ93D50 PCB", tag, owner, clock, "nes_lz93d50", __FILE__)
{
}
-nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_lz93d50_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_i2cmem(*this, "i2cmem"), m_i2c_dir(0)
{
}
-nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_lz93d50_24c01_device::nes_lz93d50_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_lz93d50_device(mconfig, NES_LZ93D50_24C01, "NES Cart Bandai LZ93D50 + 24C01 PCB", tag, owner, clock, "nes_lz93d50_ep1", __FILE__),
m_i2cmem(*this, "i2cmem"), m_i2c_dir(0)
{
}
-nes_lz93d50_24c02_device::nes_lz93d50_24c02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_lz93d50_24c02_device::nes_lz93d50_24c02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_lz93d50_24c01_device(mconfig, NES_LZ93D50_24C02, "NES Cart Bandai LZ93D50 + 24C02 PCB", tag, owner, clock, "nes_lz93d50_ep2", __FILE__)
{
}
-nes_fjump2_device::nes_fjump2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_fjump2_device::nes_fjump2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_lz93d50_device(mconfig, NES_FJUMP2, "NES Cart Bandai Famicom Jump II PCB", tag, owner, clock, "nes_fjump2", __FILE__)
{
}
@@ -434,7 +434,7 @@ machine_config_constructor nes_lz93d50_24c02_device::device_mconfig_additions()
void nes_fjump2_device::set_prg()
{
- UINT8 prg_base = 0;
+ uint8_t prg_base = 0;
for (int i = 0; i < 4; i++)
prg_base |= (m_reg[i] << 4);
diff --git a/src/devices/bus/nes/bandai.h b/src/devices/bus/nes/bandai.h
index 13ee41f4823..108c6fb96cc 100644
--- a/src/devices/bus/nes/bandai.h
+++ b/src/devices/bus/nes/bandai.h
@@ -13,7 +13,7 @@ class nes_oekakids_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_oekakids_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_oekakids_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ public:
// TODO: add oeka kids controller emulation
protected:
void update_chr();
- UINT8 m_reg, m_latch;
+ uint8_t m_reg, m_latch;
};
@@ -38,8 +38,8 @@ class nes_fcg_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_fcg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_fcg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fcg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_fcg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -50,7 +50,7 @@ public:
virtual void pcb_reset() override;
protected:
- UINT16 m_irq_count;
+ uint16_t m_irq_count;
int m_irq_enable;
static const device_timer_id TIMER_IRQ = 0;
@@ -64,8 +64,8 @@ class nes_lz93d50_device : public nes_fcg_device
{
public:
// construction/destruction
- nes_lz93d50_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_lz93d50_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_lz93d50_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_lz93d50_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override { fcg_write(space, offset, data, mem_mask); }
@@ -78,8 +78,8 @@ class nes_lz93d50_24c01_device : public nes_lz93d50_device
{
public:
// construction/destruction
- nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_lz93d50_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_lz93d50_24c01_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_lz93d50_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -91,7 +91,7 @@ public:
// TODO: fix EEPROM I/O emulation
required_device<i2cmem_device> m_i2cmem;
- UINT8 m_i2c_dir;
+ uint8_t m_i2c_dir;
};
@@ -101,7 +101,7 @@ class nes_lz93d50_24c02_device : public nes_lz93d50_24c01_device
{
public:
// construction/destruction
- nes_lz93d50_24c02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_lz93d50_24c02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -114,7 +114,7 @@ class nes_fjump2_device : public nes_lz93d50_device
{
public:
// construction/destruction
- nes_fjump2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fjump2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -126,7 +126,7 @@ public:
protected:
void set_prg();
- UINT8 m_reg[5];
+ uint8_t m_reg[5];
};
diff --git a/src/devices/bus/nes/benshieng.cpp b/src/devices/bus/nes/benshieng.cpp
index cda8d66d94d..803b4413c54 100644
--- a/src/devices/bus/nes/benshieng.cpp
+++ b/src/devices/bus/nes/benshieng.cpp
@@ -31,7 +31,7 @@
const device_type NES_BENSHIENG = &device_creator<nes_benshieng_device>;
-nes_benshieng_device::nes_benshieng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_benshieng_device::nes_benshieng_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BENSHIENG, "NES Cart Benshieng PCB", tag, owner, clock, "nes_benshieng", __FILE__),
m_dipsetting(0)
{
@@ -88,7 +88,7 @@ void nes_benshieng_device::update_banks()
WRITE8_MEMBER(nes_benshieng_device::write_h)
{
- UINT8 helper = (offset & 0xc00) >> 10;
+ uint8_t helper = (offset & 0xc00) >> 10;
LOG_MMC(("benshieng write_h, offset: %04x, data: %02x\n", offset, data));
// m_mmc_dipsetting = ioport("CARTDIPS")->read();
diff --git a/src/devices/bus/nes/benshieng.h b/src/devices/bus/nes/benshieng.h
index c87b016c6a3..1989c26ad15 100644
--- a/src/devices/bus/nes/benshieng.h
+++ b/src/devices/bus/nes/benshieng.h
@@ -12,7 +12,7 @@ class nes_benshieng_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_benshieng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_benshieng_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -22,9 +22,9 @@ public:
private:
void update_banks();
- UINT8 m_dipsetting;
- UINT8 m_mmc_prg_bank[4];
- UINT8 m_mmc_vrom_bank[4];
+ uint8_t m_dipsetting;
+ uint8_t m_mmc_prg_bank[4];
+ uint8_t m_mmc_vrom_bank[4];
};
diff --git a/src/devices/bus/nes/bootleg.cpp b/src/devices/bus/nes/bootleg.cpp
index f21db4454ff..094ec65dd22 100644
--- a/src/devices/bus/nes/bootleg.cpp
+++ b/src/devices/bus/nes/bootleg.cpp
@@ -61,107 +61,107 @@ const device_type NES_SHUIGUAN = &device_creator<nes_shuiguan_device>;
const device_type NES_RT01 = &device_creator<nes_rt01_device>;
-nes_ax5705_device::nes_ax5705_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ax5705_device::nes_ax5705_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_AX5705, "NES Cart AX5705 PCB", tag, owner, clock, "nes_ax5705", __FILE__)
{
}
-nes_sc127_device::nes_sc127_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sc127_device::nes_sc127_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SC127, "NES Cart SC-127 PCB", tag, owner, clock, "nes_sc127", __FILE__), m_irq_count(0), m_irq_enable(0)
{
}
-nes_mbaby_device::nes_mbaby_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_mbaby_device::nes_mbaby_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_MARIOBABY, "NES Cart Mario Baby Bootleg PCB", tag, owner, clock, "nes_mbaby", __FILE__), m_latch(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_asn_device::nes_asn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_asn_device::nes_asn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_ASN, "NES Cart Ai Senshi Nicol Bootleg PCB", tag, owner, clock, "nes_asn", __FILE__), m_latch(0)
{
}
-nes_smb3p_device::nes_smb3p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_smb3p_device::nes_smb3p_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SMB3PIRATE, "NES Cart Super Mario Bros. 3 Pirate PCB", tag, owner, clock, "nes_smb3p", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_btl_dn_device::nes_btl_dn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_btl_dn_device::nes_btl_dn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BTL_DNINJA, "NES Cart DragonNinja Pirate PCB", tag, owner, clock, "nes_btl_dn", __FILE__), m_irq_count(0)
{
}
-nes_whirl2706_device::nes_whirl2706_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_whirl2706_device::nes_whirl2706_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_WHIRLWIND_2706, "NES Cart Whirlwind 2706 PCB", tag, owner, clock, "nes_whirl2706", __FILE__), m_latch(0)
{
}
-nes_smb2j_device::nes_smb2j_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_smb2j_device::nes_smb2j_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SMB2J, "NES Cart Super Mario Bros. 2 Jpn PCB", tag, owner, clock, "nes_smb2j", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_smb2ja_device::nes_smb2ja_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_smb2ja_device::nes_smb2ja_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SMB2JA, "NES Cart Super Mario Bros. 2 Jpn (Alt) PCB", tag, owner, clock, "nes_smb2ja", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_smb2jb_device::nes_smb2jb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_smb2jb_device::nes_smb2jb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SMB2JB, "NES Cart Super Mario Bros. 2 Jpn (Alt 2) PCB", tag, owner, clock, "nes_smb2jb", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_09034a_device::nes_09034a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_09034a_device::nes_09034a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_09034A, "NES Cart 09-034A PCB", tag, owner, clock, "nes_09034a", __FILE__), m_reg(0)
{
}
-nes_tobidase_device::nes_tobidase_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tobidase_device::nes_tobidase_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_TOBIDASE, "NES Cart Tobidase Daisakusen Pirate PCB", tag, owner, clock, "nes_tobidase", __FILE__), m_latch(0)
{
}
-nes_lh32_device::nes_lh32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_lh32_device::nes_lh32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_LH32, "NES Cart LH-32 Pirate PCB", tag, owner, clock, "nes_lh32", __FILE__), m_latch(0)
{
}
-nes_lh10_device::nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_lh10_device::nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_LH10, "NES Cart LH-10 Pirate PCB", tag, owner, clock, "nes_lh10", __FILE__), m_latch(0)
{
}
-nes_lh53_device::nes_lh53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_lh53_device::nes_lh53_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_LH53, "NES Cart LH-53 Pirate PCB", tag, owner, clock, "nes_lh53", __FILE__), m_irq_count(0), m_irq_enable(0), m_reg(0), irq_timer(nullptr)
{
}
-nes_2708_device::nes_2708_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_2708_device::nes_2708_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_2708, "NES Cart BTL-2708 Pirate PCB", tag, owner, clock, "nes_2708", __FILE__)
{
}
-nes_ac08_device::nes_ac08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ac08_device::nes_ac08_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_AC08, "NES Cart AC08 Pirate PCB", tag, owner, clock, "nes_ac08", __FILE__), m_latch(0)
{
}
-nes_unl_bb_device::nes_unl_bb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_unl_bb_device::nes_unl_bb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_UNL_BB, "NES Cart FDS+CHR Pirate PCB", tag, owner, clock, "nes_unl_bb", __FILE__)
{
}
-nes_mmalee_device::nes_mmalee_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_mmalee_device::nes_mmalee_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_MMALEE, "NES Cart Super Mario Bros. Malee 2 Pirate PCB", tag, owner, clock, "nes_mmalee", __FILE__)
{
}
-nes_shuiguan_device::nes_shuiguan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_shuiguan_device::nes_shuiguan_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SHUIGUAN, "NES Cart Shui Guan Pipe Pirate PCB", tag, owner, clock, "nes_shuiguan", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_rt01_device::nes_rt01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_rt01_device::nes_rt01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_RT01, "NES Cart RT-01 PCB", tag, owner, clock, "nes_rt01", __FILE__)
{
}
@@ -572,7 +572,7 @@ void nes_ax5705_device::set_prg()
WRITE8_MEMBER(nes_ax5705_device::write_h)
{
- UINT8 bank;
+ uint8_t bank;
LOG_MMC(("ax5705 write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x700f)
@@ -882,7 +882,7 @@ void nes_btl_dn_device::hblank_irq(int scanline, int vblank, int blanked )
WRITE8_MEMBER(nes_btl_dn_device::write_h)
{
- UINT8 bank;
+ uint8_t bank;
LOG_MMC(("btl_dn write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x7003)
@@ -1117,7 +1117,7 @@ void nes_smb2jb_device::device_timer(emu_timer &timer, device_timer_id id, int p
WRITE8_MEMBER(nes_smb2jb_device::write_l)
{
- UINT8 prg;
+ uint8_t prg;
LOG_MMC(("smb2jb write_l, offset: %04x, data: %02x\n", offset, data));
offset += 0x100;
@@ -1144,7 +1144,7 @@ READ8_MEMBER(nes_smb2jb_device::read_m)
/* This goes to 0x4020-0x403f & 0x40a0-0x40bf */
WRITE8_MEMBER(nes_smb2jb_device::write_ex)
{
- UINT8 prg;
+ uint8_t prg;
LOG_MMC(("smb2jb write_ex, offset: %04x, data: %02x\n", offset, data));
if ((offset < 0x20) || (offset >= 0x80 && offset < 0xa0))
diff --git a/src/devices/bus/nes/bootleg.h b/src/devices/bus/nes/bootleg.h
index 59f02a476a5..5e2457d2fef 100644
--- a/src/devices/bus/nes/bootleg.h
+++ b/src/devices/bus/nes/bootleg.h
@@ -12,7 +12,7 @@ class nes_ax5705_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ax5705_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ax5705_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -22,8 +22,8 @@ public:
private:
void set_prg();
- UINT8 m_mmc_prg_bank[2];
- UINT8 m_mmc_vrom_bank[8];
+ uint8_t m_mmc_prg_bank[2];
+ uint8_t m_mmc_vrom_bank[8];
};
@@ -33,7 +33,7 @@ class nes_sc127_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sc127_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sc127_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -43,7 +43,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT16 m_irq_count;
+ uint16_t m_irq_count;
int m_irq_enable;
};
@@ -54,7 +54,7 @@ class nes_mbaby_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_mbaby_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_mbaby_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -65,7 +65,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
int m_irq_enable;
static const device_timer_id TIMER_IRQ = 0;
@@ -80,7 +80,7 @@ class nes_asn_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_asn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_asn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -90,7 +90,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
};
@@ -100,7 +100,7 @@ class nes_smb3p_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_smb3p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_smb3p_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -110,7 +110,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT16 m_irq_count;
+ uint16_t m_irq_count;
int m_irq_enable;
static const device_timer_id TIMER_IRQ = 0;
@@ -124,7 +124,7 @@ class nes_btl_dn_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_btl_dn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_btl_dn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -134,7 +134,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT16 m_irq_count;
+ uint16_t m_irq_count;
};
@@ -144,7 +144,7 @@ class nes_whirl2706_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_whirl2706_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_whirl2706_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -154,7 +154,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
};
@@ -164,7 +164,7 @@ class nes_smb2j_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_smb2j_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_smb2j_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -178,7 +178,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT16 m_irq_count;
+ uint16_t m_irq_count;
int m_irq_enable;
static const device_timer_id TIMER_IRQ = 0;
@@ -192,7 +192,7 @@ class nes_smb2ja_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_smb2ja_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_smb2ja_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -203,7 +203,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT16 m_irq_count;
+ uint16_t m_irq_count;
int m_irq_enable;
static const device_timer_id TIMER_IRQ = 0;
@@ -217,7 +217,7 @@ class nes_smb2jb_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_smb2jb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_smb2jb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -229,7 +229,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT16 m_irq_count;
+ uint16_t m_irq_count;
int m_irq_enable;
static const device_timer_id TIMER_IRQ = 0;
@@ -243,7 +243,7 @@ class nes_09034a_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_09034a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_09034a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -253,7 +253,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg;
+ uint8_t m_reg;
};
@@ -263,7 +263,7 @@ class nes_tobidase_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_tobidase_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tobidase_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -273,7 +273,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
};
@@ -283,7 +283,7 @@ class nes_lh32_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_lh32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_lh32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -295,7 +295,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
};
@@ -305,7 +305,7 @@ class nes_lh10_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -317,8 +317,8 @@ public:
private:
void update_prg();
- UINT8 m_latch;
- UINT8 m_reg[8];
+ uint8_t m_latch;
+ uint8_t m_reg[8];
};
@@ -328,7 +328,7 @@ class nes_lh53_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_lh53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_lh53_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -341,9 +341,9 @@ public:
virtual void pcb_reset() override;
private:
- UINT16 m_irq_count;
+ uint16_t m_irq_count;
int m_irq_enable;
- UINT8 m_reg;
+ uint8_t m_reg;
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
@@ -357,7 +357,7 @@ class nes_2708_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_2708_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_2708_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -369,7 +369,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg[2];
+ uint8_t m_reg[2];
};
// ======================> nes_ac08_device
@@ -378,7 +378,7 @@ class nes_ac08_device : public nes_nrom_device
{
public:
// nes_ac08_device/destruction
- nes_ac08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ac08_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -389,7 +389,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
};
// ======================> nes_unl_bb_device
@@ -398,7 +398,7 @@ class nes_unl_bb_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_unl_bb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_unl_bb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -408,7 +408,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg[2];
+ uint8_t m_reg[2];
};
// ======================> nes_mmalee_device
@@ -417,7 +417,7 @@ class nes_mmalee_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_mmalee_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_mmalee_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -433,7 +433,7 @@ class nes_shuiguan_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_shuiguan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_shuiguan_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -444,9 +444,9 @@ public:
virtual void pcb_reset() override;
private:
- UINT16 m_irq_count;
+ uint16_t m_irq_count;
int m_irq_enable;
- UINT8 m_mmc_vrom_bank[8];
+ uint8_t m_mmc_vrom_bank[8];
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
@@ -459,7 +459,7 @@ class nes_rt01_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_rt01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_rt01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/camerica.cpp b/src/devices/bus/nes/camerica.cpp
index d1418c763f6..9d9a9a6f8ec 100644
--- a/src/devices/bus/nes/camerica.cpp
+++ b/src/devices/bus/nes/camerica.cpp
@@ -46,17 +46,17 @@ const device_type NES_BF9096 = &device_creator<nes_bf9096_device>;
const device_type NES_GOLDEN5 = &device_creator<nes_golden5_device>;
-nes_bf9093_device::nes_bf9093_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bf9093_device::nes_bf9093_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BF9093, "NES Cart Camerica BF9093 PCB", tag, owner, clock, "nes_bf9093", __FILE__)
{
}
-nes_bf9096_device::nes_bf9096_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bf9096_device::nes_bf9096_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BF9096, "NES Cart Camerica BF9096 PCB", tag, owner, clock, "nes_bf9096", __FILE__), m_bank_base(0), m_latch(0)
{
}
-nes_golden5_device::nes_golden5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_golden5_device::nes_golden5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_GOLDEN5, "NES Cart Camerica Golden 5 PCB", tag, owner, clock, "nes_golden5", __FILE__), m_bank_base(0), m_latch(0)
{
}
diff --git a/src/devices/bus/nes/camerica.h b/src/devices/bus/nes/camerica.h
index f9adeacdca0..ba3b103b0d5 100644
--- a/src/devices/bus/nes/camerica.h
+++ b/src/devices/bus/nes/camerica.h
@@ -12,7 +12,7 @@ class nes_bf9093_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bf9093_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bf9093_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_bf9096_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bf9096_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bf9096_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -38,7 +38,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_bank_base, m_latch;
+ uint8_t m_bank_base, m_latch;
};
@@ -48,7 +48,7 @@ class nes_golden5_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_golden5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_golden5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -57,7 +57,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_bank_base, m_latch;
+ uint8_t m_bank_base, m_latch;
};
diff --git a/src/devices/bus/nes/cne.cpp b/src/devices/bus/nes/cne.cpp
index 76dc0a999f2..eb4a2c8d33a 100644
--- a/src/devices/bus/nes/cne.cpp
+++ b/src/devices/bus/nes/cne.cpp
@@ -37,17 +37,17 @@ const device_type NES_CNE_FSB = &device_creator<nes_cne_fsb_device>;
const device_type NES_CNE_SHLZ = &device_creator<nes_cne_shlz_device>;
-nes_cne_decathl_device::nes_cne_decathl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_cne_decathl_device::nes_cne_decathl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_CNE_DECATHL, "NES Cart C&E Decathlon PCB", tag, owner, clock, "nes_cne_deca", __FILE__)
{
}
-nes_cne_fsb_device::nes_cne_fsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_cne_fsb_device::nes_cne_fsb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_CNE_FSB, "NES Cart C&E Feng Shen Bang PCB", tag, owner, clock, "nes_cne_fsb", __FILE__)
{
}
-nes_cne_shlz_device::nes_cne_shlz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_cne_shlz_device::nes_cne_shlz_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_CNE_SHLZ, "NES Cart C&E Sheng Huo Lie Zhuan PCB", tag, owner, clock, "nes_cne_shlz", __FILE__)
{
}
diff --git a/src/devices/bus/nes/cne.h b/src/devices/bus/nes/cne.h
index f64445aeb01..558067f2862 100644
--- a/src/devices/bus/nes/cne.h
+++ b/src/devices/bus/nes/cne.h
@@ -12,7 +12,7 @@ class nes_cne_decathl_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_cne_decathl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cne_decathl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_cne_fsb_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_cne_fsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cne_fsb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -45,7 +45,7 @@ class nes_cne_shlz_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_cne_shlz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cne_shlz_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/cony.cpp b/src/devices/bus/nes/cony.cpp
index 2f4b29bfab3..0fbebcda02f 100644
--- a/src/devices/bus/nes/cony.cpp
+++ b/src/devices/bus/nes/cony.cpp
@@ -39,7 +39,7 @@ const device_type NES_CONY = &device_creator<nes_cony_device>;
const device_type NES_YOKO = &device_creator<nes_yoko_device>;
-nes_cony_device::nes_cony_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_cony_device::nes_cony_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_irq_count(0),
m_irq_enable(0),
@@ -50,12 +50,12 @@ nes_cony_device::nes_cony_device(const machine_config &mconfig, device_type type
{
}
-nes_cony_device::nes_cony_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_cony_device::nes_cony_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_CONY, "NES Cart Cony PCB", tag, owner, clock, "nes_cony", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch1(0), m_latch2(0), m_extra1(0)
{
}
-nes_yoko_device::nes_yoko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_yoko_device::nes_yoko_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_cony_device(mconfig, NES_YOKO, "NES Cart Yoko PCB", tag, owner, clock, "nes_yoko", __FILE__), m_extra2(0)
{
}
diff --git a/src/devices/bus/nes/cony.h b/src/devices/bus/nes/cony.h
index 625470da1e1..406952b69cb 100644
--- a/src/devices/bus/nes/cony.h
+++ b/src/devices/bus/nes/cony.h
@@ -12,8 +12,8 @@ class nes_cony_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_cony_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_cony_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cony_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_cony_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -28,16 +28,16 @@ protected:
virtual void set_prg();
virtual void set_chr();
- UINT16 m_irq_count;
+ uint16_t m_irq_count;
int m_irq_enable;
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
- UINT8 m_latch1, m_latch2;
- UINT8 m_low_reg[4];
- UINT8 m_reg[10];
- UINT8 m_extra1;
+ uint8_t m_latch1, m_latch2;
+ uint8_t m_low_reg[4];
+ uint8_t m_reg[10];
+ uint8_t m_extra1;
};
@@ -47,7 +47,7 @@ class nes_yoko_device : public nes_cony_device
{
public:
// construction/destruction
- nes_yoko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_yoko_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -61,7 +61,7 @@ private:
virtual void set_prg() override;
virtual void set_chr() override;
- UINT8 m_extra2;
+ uint8_t m_extra2;
};
diff --git a/src/devices/bus/nes/datach.cpp b/src/devices/bus/nes/datach.cpp
index 6e4e619c286..20f9998bc30 100644
--- a/src/devices/bus/nes/datach.cpp
+++ b/src/devices/bus/nes/datach.cpp
@@ -67,7 +67,7 @@ READ8_MEMBER(datach_cart_interface::read)
const device_type NES_DATACH_SLOT = &device_creator<nes_datach_slot_device>;
-nes_datach_slot_device::nes_datach_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_datach_slot_device::nes_datach_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_DATACH_SLOT, "NES Datach Cartridge Slot", tag, owner, clock, "nes_datach_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr)
@@ -96,7 +96,7 @@ image_init_result nes_datach_slot_device::call_load()
{
if (m_cart)
{
- UINT8 *ROM = m_cart->get_cart_base();
+ uint8_t *ROM = m_cart->get_cart_base();
if (!ROM)
return image_init_result::FAIL;
@@ -108,7 +108,7 @@ image_init_result nes_datach_slot_device::call_load()
return image_init_result::FAIL;
int shift = length() - 0x40000;
- UINT8 temp[0x40010];
+ uint8_t temp[0x40010];
fread(&temp, length());
memcpy(ROM, temp + shift, 0x40000);
@@ -116,7 +116,7 @@ image_init_result nes_datach_slot_device::call_load()
// (or 16, since some older .nes files marked Datach as mapper 16)
if (length() == 0x40010)
{
- UINT8 mapper = (temp[6] & 0xf0) >> 4;
+ uint8_t mapper = (temp[6] & 0xf0) >> 4;
mapper |= temp[7] & 0xf0;
if (mapper != 157 && mapper != 16)
{
@@ -162,19 +162,19 @@ ROM_END
const device_type NES_DATACH_ROM = &device_creator<nes_datach_rom_device>;
const device_type NES_DATACH_24C01 = &device_creator<nes_datach_24c01_device>;
-nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
datach_cart_interface( mconfig, *this )
{
}
-nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_datach_rom_device::nes_datach_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, NES_DATACH_ROM, "NES Datach ROM", tag, owner, clock, "nes_datach_rom", __FILE__),
datach_cart_interface( mconfig, *this )
{
}
-nes_datach_24c01_device::nes_datach_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_datach_24c01_device::nes_datach_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_datach_rom_device(mconfig, NES_DATACH_24C01, "NES Datach + 24C01 PCB", tag, owner, clock, "nes_datach_ep1", __FILE__)
{
}
@@ -182,7 +182,7 @@ nes_datach_24c01_device::nes_datach_24c01_device(const machine_config &mconfig,
void nes_datach_rom_device::device_start()
{
- m_rom = (UINT8*)memregion("datachrom")->base();
+ m_rom = (uint8_t*)memregion("datachrom")->base();
save_item(NAME(m_bank));
}
@@ -196,7 +196,7 @@ const tiny_rom_entry *nes_datach_rom_device::device_rom_region() const
return ROM_NAME( datach_rom );
}
-UINT8 *nes_datach_rom_device::get_cart_base()
+uint8_t *nes_datach_rom_device::get_cart_base()
{
return m_rom;
}
@@ -221,7 +221,7 @@ machine_config_constructor nes_datach_24c01_device::device_mconfig_additions() c
const device_type NES_DATACH = &device_creator<nes_datach_device>;
-nes_datach_device::nes_datach_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_datach_device::nes_datach_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_lz93d50_device(mconfig, NES_DATACH, "NES Cart Bandai Datach PCB", tag, owner, clock, "nes_datach", __FILE__), m_datach_latch(0),
m_i2cmem(*this, "i2cmem"),
m_reader(*this, "datach"),
@@ -289,7 +289,7 @@ void nes_datach_device::pcb_reset()
READ8_MEMBER(nes_datach_device::read_m)
{
LOG_MMC(("Datach read_m, offset: %04x\n", offset));
- UINT8 i2c_val = 0;
+ uint8_t i2c_val = 0;
#if TEST_EEPROM
if (m_i2c_dir)
{
diff --git a/src/devices/bus/nes/datach.h b/src/devices/bus/nes/datach.h
index 47c625badc7..323f09956b1 100644
--- a/src/devices/bus/nes/datach.h
+++ b/src/devices/bus/nes/datach.h
@@ -26,16 +26,16 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(read);
- UINT8 *get_cart_base() { return m_rom; }
- void write_prg_bank(UINT8 bank) { m_bank = bank; }
+ uint8_t *get_cart_base() { return m_rom; }
+ void write_prg_bank(uint8_t bank) { m_bank = bank; }
optional_device<i2cmem_device> m_i2cmem;
protected:
// internal state
- UINT8 *m_rom;
+ uint8_t *m_rom;
// ROM is accessed via two 16K banks, but only the first one can be switched
- UINT8 m_bank;
+ uint8_t m_bank;
};
// ======================> nes_datach_slot_device
@@ -46,7 +46,7 @@ class nes_datach_slot_device : public device_t,
{
public:
// construction/destruction
- nes_datach_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_datach_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~nes_datach_slot_device();
// device-level overrides
@@ -70,7 +70,7 @@ public:
virtual std::string get_default_card_software() override;
virtual DECLARE_READ8_MEMBER(read);
- void write_prg_bank(UINT8 bank) { if (m_cart) m_cart->write_prg_bank(bank); }
+ void write_prg_bank(uint8_t bank) { if (m_cart) m_cart->write_prg_bank(bank); }
datach_cart_interface* m_cart;
};
@@ -97,12 +97,12 @@ class nes_datach_rom_device : public device_t,
{
public:
// construction/destruction
- nes_datach_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_datach_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_datach_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_datach_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
- virtual UINT8* get_cart_base();
+ virtual uint8_t* get_cart_base();
protected:
// device-level overrides
@@ -116,7 +116,7 @@ class nes_datach_24c01_device : public nes_datach_rom_device
{
public:
// construction/destruction
- nes_datach_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_datach_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -139,7 +139,7 @@ class nes_datach_device : public nes_lz93d50_device
{
public:
// construction/destruction
- nes_datach_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_datach_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -152,12 +152,12 @@ public:
virtual void pcb_reset() override;
protected:
- UINT8 m_datach_latch;
+ uint8_t m_datach_latch;
required_device<i2cmem_device> m_i2cmem;
required_device<barcode_reader_device> m_reader;
required_device<nes_datach_slot_device> m_subslot;
- UINT8 m_i2c_dir;
- UINT8 m_i2c_in_use;
+ uint8_t m_i2c_dir;
+ uint8_t m_i2c_in_use;
static const device_timer_id TIMER_SERIAL = 1;
emu_timer *serial_timer;
diff --git a/src/devices/bus/nes/discrete.cpp b/src/devices/bus/nes/discrete.cpp
index e0109a84d94..a99b66fd77a 100644
--- a/src/devices/bus/nes/discrete.cpp
+++ b/src/devices/bus/nes/discrete.cpp
@@ -41,22 +41,22 @@ const device_type NES_74X377 = &device_creator<nes_74x377_device>;
const device_type NES_74X161X138 = &device_creator<nes_74x161x138_device>;
-nes_74x161x161x32_device::nes_74x161x161x32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_74x161x161x32_device::nes_74x161x161x32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_74X161X161X32, "NES Cart Discrete Logic (74*161/161/32) PCB", tag, owner, clock, "nes_74x161", __FILE__)
{
}
-nes_74x139x74_device::nes_74x139x74_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_74x139x74_device::nes_74x139x74_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_74X139X74, "NES Cart Discrete Logic (74*139/74) PCB", tag, owner, clock, "nes_74x139", __FILE__)
{
}
-nes_74x377_device::nes_74x377_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_74x377_device::nes_74x377_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_74X377, "NES Cart Discrete Logic (74*377) PCB", tag, owner, clock, "nes_74x377", __FILE__)
{
}
-nes_74x161x138_device::nes_74x161x138_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_74x161x138_device::nes_74x161x138_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_74X161X138, "NES Cart Discrete Logic (74*161/138) PCB", tag, owner, clock, "nes_bitcorp_dis", __FILE__)
{
}
diff --git a/src/devices/bus/nes/discrete.h b/src/devices/bus/nes/discrete.h
index 94abf418a95..7448e62b727 100644
--- a/src/devices/bus/nes/discrete.h
+++ b/src/devices/bus/nes/discrete.h
@@ -12,7 +12,7 @@ class nes_74x161x161x32_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_74x161x161x32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_74x161x161x32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_74x139x74_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_74x139x74_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_74x139x74_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -44,7 +44,7 @@ class nes_74x377_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_74x377_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_74x377_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -60,7 +60,7 @@ class nes_74x161x138_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_74x161x138_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_74x161x138_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/disksys.cpp b/src/devices/bus/nes/disksys.cpp
index d272232387d..7e2d4a36e76 100644
--- a/src/devices/bus/nes/disksys.cpp
+++ b/src/devices/bus/nes/disksys.cpp
@@ -103,7 +103,7 @@ void nes_disksys_device::unload_proc(device_image_interface &image)
const device_type NES_DISKSYS = &device_creator<nes_disksys_device>;
-nes_disksys_device::nes_disksys_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_disksys_device::nes_disksys_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_DISKSYS, "FC RAM Expansion + Disk System PCB", tag, owner, clock, "fc_disksys", __FILE__), m_2c33_rom(nullptr),
m_fds_data(nullptr),
m_disk(*this, FLOPPY_0), irq_timer(nullptr), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_transfer(0), m_fds_motor_on(0), m_fds_door_closed(0), m_fds_current_side(0), m_fds_head_position(0), m_fds_status0(0), m_read_mode(0), m_drive_ready(0),
@@ -116,7 +116,7 @@ void nes_disksys_device::device_start()
{
common_start();
- m_2c33_rom = (UINT8*)memregion("drive")->base();
+ m_2c33_rom = (uint8_t*)memregion("drive")->base();
m_disk->floppy_install_load_proc(nes_disksys_device::load_proc);
m_disk->floppy_install_unload_proc(nes_disksys_device::unload_proc);
@@ -289,7 +289,7 @@ WRITE8_MEMBER(nes_disksys_device::write_ex)
READ8_MEMBER(nes_disksys_device::read_ex)
{
LOG_MMC(("Famicom Disk System read_ex, offset: %04x\n", offset));
- UINT8 ret;
+ uint8_t ret;
if (offset >= 0x20 && offset < 0x60)
{
@@ -416,7 +416,7 @@ void nes_disksys_device::load_disk(device_image_interface &image)
m_fds_sides = (image.length() - header) / 65500;
if (!m_fds_data)
- m_fds_data = std::make_unique<UINT8[]>(m_fds_sides * 65500);
+ m_fds_data = std::make_unique<uint8_t[]>(m_fds_sides * 65500);
// if there is an header, skip it
image.fseek(header, SEEK_SET);
diff --git a/src/devices/bus/nes/disksys.h b/src/devices/bus/nes/disksys.h
index 35cda095114..5f05125061b 100644
--- a/src/devices/bus/nes/disksys.h
+++ b/src/devices/bus/nes/disksys.h
@@ -13,7 +13,7 @@ class nes_disksys_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_disksys_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_disksys_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -37,8 +37,8 @@ public:
static void unload_proc(device_image_interface &image);
private:
- UINT8 *m_2c33_rom;
- std::unique_ptr<UINT8[]> m_fds_data; // here, we store a copy of the disk
+ uint8_t *m_2c33_rom;
+ std::unique_ptr<uint8_t[]> m_fds_data; // here, we store a copy of the disk
required_device<legacy_floppy_image_device> m_disk;
static const device_timer_id TIMER_IRQ = 0;
@@ -47,18 +47,18 @@ private:
void load_disk(device_image_interface &image);
void unload_disk(device_image_interface &image);
- UINT16 m_irq_count, m_irq_count_latch;
+ uint16_t m_irq_count, m_irq_count_latch;
int m_irq_enable, m_irq_transfer;
- UINT8 m_fds_motor_on;
- UINT8 m_fds_door_closed;
- UINT8 m_fds_current_side;
- UINT32 m_fds_head_position;
- UINT8 m_fds_status0;
- UINT8 m_read_mode;
- UINT8 m_drive_ready;
+ uint8_t m_fds_motor_on;
+ uint8_t m_fds_door_closed;
+ uint8_t m_fds_current_side;
+ uint32_t m_fds_head_position;
+ uint8_t m_fds_status0;
+ uint8_t m_read_mode;
+ uint8_t m_drive_ready;
- UINT8 m_fds_sides;
+ uint8_t m_fds_sides;
int m_fds_last_side;
int m_fds_count;
};
diff --git a/src/devices/bus/nes/event.cpp b/src/devices/bus/nes/event.cpp
index e8cc13e44bc..1e6c9085963 100644
--- a/src/devices/bus/nes/event.cpp
+++ b/src/devices/bus/nes/event.cpp
@@ -35,7 +35,7 @@
const device_type NES_EVENT = &device_creator<nes_event_device>;
-nes_event_device::nes_event_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_event_device::nes_event_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_sxrom_device(mconfig, NES_EVENT, "NES Cart Event PCB", tag, owner, clock, "nes_event", __FILE__),
m_dsw(*this, "DIPSW"),
m_nwc_init(0),
@@ -113,7 +113,7 @@ void nes_event_device::set_prg()
// printf("enter with %d and reg1 0x%x - reg3 0x%x\n", m_nwc_init, m_reg[1], m_reg[3]);
// reg[1] is different from base MMC-1!
// bit 0 is ignored, bit1/bit3 are used for PRG switch, bit4 is used for the timer
- UINT8 temp = (m_reg[1] >> 1) & 7;
+ uint8_t temp = (m_reg[1] >> 1) & 7;
// initially PRG is fixed, until bit4 of reg1 is set to 1 and then to 0
switch (m_nwc_init)
diff --git a/src/devices/bus/nes/event.h b/src/devices/bus/nes/event.h
index 7da34bc58c2..af154b7fffc 100644
--- a/src/devices/bus/nes/event.h
+++ b/src/devices/bus/nes/event.h
@@ -12,7 +12,7 @@ class nes_event_device : public nes_sxrom_device
{
public:
// construction/destruction
- nes_event_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_event_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -33,7 +33,7 @@ protected:
emu_timer *event_timer;
attotime timer_freq;
- UINT32 m_timer_count;
+ uint32_t m_timer_count;
int m_timer_on, m_timer_enabled;
};
diff --git a/src/devices/bus/nes/ggenie.cpp b/src/devices/bus/nes/ggenie.cpp
index 148b9b568ac..ec6664bb23d 100644
--- a/src/devices/bus/nes/ggenie.cpp
+++ b/src/devices/bus/nes/ggenie.cpp
@@ -34,7 +34,7 @@
const device_type NES_GGENIE = &device_creator<nes_ggenie_device>;
-nes_ggenie_device::nes_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ggenie_device::nes_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_GGENIE, "NES Cart Game Genie PCB", tag, owner, clock, "nes_ggenie", __FILE__),
m_ggslot(*this, "gg_slot"),
m_gg_bypass(0)
@@ -48,7 +48,7 @@ void nes_ggenie_device::device_start()
save_item(NAME(m_gg_bypass));
}
-void nes_ggenie_device::pcb_start(running_machine &machine, UINT8 *ciram_ptr, bool cart_mounted)
+void nes_ggenie_device::pcb_start(running_machine &machine, uint8_t *ciram_ptr, bool cart_mounted)
{
device_nes_cart_interface::pcb_start(machine, ciram_ptr, cart_mounted);
if (m_ggslot->m_cart)
@@ -170,7 +170,7 @@ READ8_MEMBER(nes_ggenie_device::read_h)
{
if (m_gg_bypass && m_ggslot->m_cart)
{
- UINT8 rom_value = m_ggslot->m_cart->hi_access_rom(offset);
+ uint8_t rom_value = m_ggslot->m_cart->hi_access_rom(offset);
// check if GG code has to act on this address
for (int i = 0; i < 3; i++)
diff --git a/src/devices/bus/nes/ggenie.h b/src/devices/bus/nes/ggenie.h
index f0b55ee3753..2a1289c4865 100644
--- a/src/devices/bus/nes/ggenie.h
+++ b/src/devices/bus/nes/ggenie.h
@@ -12,7 +12,7 @@ class nes_ggenie_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -35,7 +35,7 @@ public:
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void pcb_reset() override;
- virtual void pcb_start(running_machine &machine, UINT8 *ciram_ptr, bool cart_mounted) override;
+ virtual void pcb_start(running_machine &machine, uint8_t *ciram_ptr, bool cart_mounted) override;
private:
// emulate the Game Genie!
@@ -43,9 +43,9 @@ private:
int m_gg_bypass;
// GG codes
- UINT16 m_gg_addr[3];
- UINT8 m_gg_repl[3];
- UINT8 m_gg_comp[3];
+ uint16_t m_gg_addr[3];
+ uint8_t m_gg_repl[3];
+ uint8_t m_gg_comp[3];
int m_gg_disable[3];
int m_gg_is_comp[3];
};
diff --git a/src/devices/bus/nes/henggedianzi.cpp b/src/devices/bus/nes/henggedianzi.cpp
index 8a212e17bf3..2665dff69a2 100644
--- a/src/devices/bus/nes/henggedianzi.cpp
+++ b/src/devices/bus/nes/henggedianzi.cpp
@@ -43,17 +43,17 @@ const device_type NES_HENGG_XHZS = &device_creator<nes_hengg_xhzs_device>;
const device_type NES_HENGG_SHJY3 = &device_creator<nes_hengg_shjy3_device>;
-nes_hengg_srich_device::nes_hengg_srich_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_hengg_srich_device::nes_hengg_srich_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_HENGG_SRICH, "NES Cart Henggedianzi Super Rich PCB", tag, owner, clock, "nes_hengg_srich", __FILE__)
{
}
-nes_hengg_xhzs_device::nes_hengg_xhzs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_hengg_xhzs_device::nes_hengg_xhzs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_HENGG_XHZS, "NES Cart Henggedianzi Xing He Zhan Shi PCB", tag, owner, clock, "nes_hengg_xhzs", __FILE__)
{
}
-nes_hengg_shjy3_device::nes_hengg_shjy3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_hengg_shjy3_device::nes_hengg_shjy3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_HENGG_SHJY3, "NES Cart Henggedianzi Shen Hua Jian Yun III PCB", tag, owner, clock, "nes_hengg_shjy3", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_chr_mode(0)
{
}
@@ -209,7 +209,7 @@ void nes_hengg_shjy3_device::update_banks()
for (int i = 0; i < 8; i++)
{
- UINT8 chr_bank = m_mmc_vrom_bank[i] | (m_mmc_extra_bank[i] << 4);
+ uint8_t chr_bank = m_mmc_vrom_bank[i] | (m_mmc_extra_bank[i] << 4);
if (m_mmc_vrom_bank[i] == 0xc8)
{
m_chr_mode = 0;
@@ -233,8 +233,8 @@ WRITE8_MEMBER(nes_hengg_shjy3_device::write_h)
if (offset >= 0x3000 && offset <= 0x600c)
{
- UINT8 shift = offset & 4;
- UINT8 mmc_helper = ((offset & 8) | (offset >> 8)) >> 3;
+ uint8_t shift = offset & 4;
+ uint8_t mmc_helper = ((offset & 8) | (offset >> 8)) >> 3;
mmc_helper += 2;
mmc_helper &= 7;
diff --git a/src/devices/bus/nes/henggedianzi.h b/src/devices/bus/nes/henggedianzi.h
index 9f1344bfab9..59bdf287e78 100644
--- a/src/devices/bus/nes/henggedianzi.h
+++ b/src/devices/bus/nes/henggedianzi.h
@@ -12,7 +12,7 @@ class nes_hengg_srich_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_hengg_srich_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_hengg_srich_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_hengg_xhzs_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_hengg_xhzs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_hengg_xhzs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -45,7 +45,7 @@ class nes_hengg_shjy3_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_hengg_shjy3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_hengg_shjy3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -57,13 +57,13 @@ public:
private:
void update_banks();
- UINT16 m_irq_count, m_irq_count_latch;
+ uint16_t m_irq_count, m_irq_count_latch;
int m_irq_enable;
int m_chr_mode;
- UINT8 m_mmc_prg_bank[2];
- UINT8 m_mmc_vrom_bank[8];
- UINT8 m_mmc_extra_bank[8];
+ uint8_t m_mmc_prg_bank[2];
+ uint8_t m_mmc_vrom_bank[8];
+ uint8_t m_mmc_extra_bank[8];
};
diff --git a/src/devices/bus/nes/hes.cpp b/src/devices/bus/nes/hes.cpp
index ddfda0590d8..5daae861b6e 100644
--- a/src/devices/bus/nes/hes.cpp
+++ b/src/devices/bus/nes/hes.cpp
@@ -33,7 +33,7 @@
const device_type NES_HES = &device_creator<nes_hes_device>;
-nes_hes_device::nes_hes_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_hes_device::nes_hes_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_HES, "NES Cart HES PCB", tag, owner, clock, "nes_hes", __FILE__)
{
}
diff --git a/src/devices/bus/nes/hes.h b/src/devices/bus/nes/hes.h
index d6e59f90bae..5cd2ad539b8 100644
--- a/src/devices/bus/nes/hes.h
+++ b/src/devices/bus/nes/hes.h
@@ -12,7 +12,7 @@ class nes_hes_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_hes_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_hes_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/hosenkan.cpp b/src/devices/bus/nes/hosenkan.cpp
index 0525534cbb9..f9dccb9dbd8 100644
--- a/src/devices/bus/nes/hosenkan.cpp
+++ b/src/devices/bus/nes/hosenkan.cpp
@@ -32,7 +32,7 @@
const device_type NES_HOSENKAN = &device_creator<nes_hosenkan_device>;
-nes_hosenkan_device::nes_hosenkan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_hosenkan_device::nes_hosenkan_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_HOSENKAN, "NES Cart HOSENKAN PCB", tag, owner, clock, "nes_hosenkan", __FILE__),
m_irq_count(0),
m_irq_count_latch(0),
diff --git a/src/devices/bus/nes/hosenkan.h b/src/devices/bus/nes/hosenkan.h
index ca3840bcbb9..0d87cc6acff 100644
--- a/src/devices/bus/nes/hosenkan.h
+++ b/src/devices/bus/nes/hosenkan.h
@@ -12,7 +12,7 @@ class nes_hosenkan_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_hosenkan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_hosenkan_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -23,11 +23,11 @@ public:
virtual void pcb_reset() override;
private:
- UINT16 m_irq_count, m_irq_count_latch;
- UINT8 m_irq_clear;
+ uint16_t m_irq_count, m_irq_count_latch;
+ uint8_t m_irq_clear;
int m_irq_enable;
- UINT8 m_latch;
+ uint8_t m_latch;
};
diff --git a/src/devices/bus/nes/irem.cpp b/src/devices/bus/nes/irem.cpp
index 5a8a1052849..5dea3e46832 100644
--- a/src/devices/bus/nes/irem.cpp
+++ b/src/devices/bus/nes/irem.cpp
@@ -42,27 +42,27 @@ const device_type NES_G101 = &device_creator<nes_g101_device>;
const device_type NES_H3001 = &device_creator<nes_h3001_device>;
-nes_lrog017_device::nes_lrog017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_lrog017_device::nes_lrog017_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_LROG017, "NES Cart Irem Discrete 74*161/161/21/138 PCB", tag, owner, clock, "nes_lrog017", __FILE__)
{
}
-nes_holydivr_device::nes_holydivr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_holydivr_device::nes_holydivr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_HOLYDIVR, "NES Cart Irem Holy Diver PCB", tag, owner, clock, "nes_holydivr", __FILE__)
{
}
-nes_tam_s1_device::nes_tam_s1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tam_s1_device::nes_tam_s1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_TAM_S1, "NES Cart Irem TAM-S1 PCB", tag, owner, clock, "nes_tam_s1", __FILE__)
{
}
-nes_g101_device::nes_g101_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_g101_device::nes_g101_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_G101, "NES Cart Irem G-101 PCB", tag, owner, clock, "nes_g101", __FILE__), m_latch(0)
{
}
-nes_h3001_device::nes_h3001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_h3001_device::nes_h3001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_H3001, "NES Cart Irem H-3001 PCB", tag, owner, clock, "nes_h3001", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), irq_timer(nullptr)
{
}
diff --git a/src/devices/bus/nes/irem.h b/src/devices/bus/nes/irem.h
index 0e1e55803f7..3aef2278957 100644
--- a/src/devices/bus/nes/irem.h
+++ b/src/devices/bus/nes/irem.h
@@ -12,7 +12,7 @@ class nes_lrog017_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_lrog017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_lrog017_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_holydivr_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_holydivr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_holydivr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -44,7 +44,7 @@ class nes_tam_s1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_tam_s1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tam_s1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -60,7 +60,7 @@ class nes_g101_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_g101_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_g101_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -69,7 +69,7 @@ public:
virtual void pcb_reset() override;
protected:
- UINT8 m_latch;
+ uint8_t m_latch;
};
@@ -79,7 +79,7 @@ class nes_h3001_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_h3001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_h3001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -89,7 +89,7 @@ public:
virtual void pcb_reset() override;
protected:
- UINT16 m_irq_count, m_irq_count_latch;
+ uint16_t m_irq_count, m_irq_count_latch;
int m_irq_enable;
static const device_timer_id TIMER_IRQ = 0;
diff --git a/src/devices/bus/nes/jaleco.cpp b/src/devices/bus/nes/jaleco.cpp
index 13be40eac4c..f910b840b70 100644
--- a/src/devices/bus/nes/jaleco.cpp
+++ b/src/devices/bus/nes/jaleco.cpp
@@ -51,88 +51,88 @@ const device_type NES_JF29 = &device_creator<nes_jf29_device>;
const device_type NES_JF33 = &device_creator<nes_jf33_device>;
-nes_jf11_device::nes_jf11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf11_device::nes_jf11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_JF11, "NES Cart Jaleco JF-11 PCB", tag, owner, clock, "nes_jf11", __FILE__)
{
}
-nes_jf13_device::nes_jf13_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf13_device::nes_jf13_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_JF13, "NES Cart Jaleco JF-13 PCB", tag, owner, clock, "nes_jf13", __FILE__),
m_samples(*this, "samples")
{
}
-nes_jf16_device::nes_jf16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf16_device::nes_jf16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_JF16, "NES Cart Jaleco JF-16 PCB", tag, owner, clock, "nes_jf16", __FILE__)
{
}
-nes_jf17_device::nes_jf17_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_jf17_device::nes_jf17_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0)
{
}
-nes_jf17_device::nes_jf17_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf17_device::nes_jf17_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_JF17, "NES Cart Jaleco JF-17 PCB", tag, owner, clock, "nes_jf17", __FILE__), m_latch(0)
{
}
-nes_jf17_adpcm_device::nes_jf17_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf17_adpcm_device::nes_jf17_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_jf17_device(mconfig, NES_JF17_ADPCM, "NES Cart Jaleco JF-17 + ADPCM (Moero!! Pro Tennis) PCB", tag, owner, clock, "nes_jf17_pcm", __FILE__),
m_samples(*this, "samples")
{
}
-nes_jf19_device::nes_jf19_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_jf19_device::nes_jf19_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_jf19_device::nes_jf19_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf19_device::nes_jf19_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_JF19, "NES Cart Jaleco JF-19 (Moero!! Pro Soccer) PCB", tag, owner, clock, "nes_jf19", __FILE__)
{
}
-nes_jf19_adpcm_device::nes_jf19_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf19_adpcm_device::nes_jf19_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_jf19_device(mconfig, NES_JF19_ADPCM, "NES Cart Jaleco JF-19 + ADPCM (Moero!! Pro Yakyuu 88) PCB", tag, owner, clock, "nes_jf19_pcm", __FILE__),
m_samples(*this, "samples")
{
}
-nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0)
{
}
-nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ss88006_device::nes_ss88006_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SS88006, "NES Cart Jaleco SS88006 PCB", tag, owner, clock, "nes_ss88006", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0)
{
}
-nes_ss88006_adpcm_device::nes_ss88006_adpcm_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_ss88006_adpcm_device::nes_ss88006_adpcm_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_ss88006_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_jf23_device::nes_jf23_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf23_device::nes_jf23_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_ss88006_adpcm_device(mconfig, NES_JF23, "NES Cart Jaleco Shin Moero Pro Yakyuu PCB", tag, owner, clock, "nes_jf23", __FILE__),
m_samples(*this, "samples")
{
}
-nes_jf24_device::nes_jf24_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf24_device::nes_jf24_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_ss88006_adpcm_device(mconfig, NES_JF24, "NES Cart Jaleco Terao no Dosukoi Oozumou PCB", tag, owner, clock, "nes_jf24", __FILE__),
m_samples(*this, "samples")
{
}
-nes_jf29_device::nes_jf29_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf29_device::nes_jf29_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_ss88006_adpcm_device(mconfig, NES_JF29, "NES Cart Jaleco Moe Pro! '90 PCB", tag, owner, clock, "nes_jf29", __FILE__),
m_samples(*this, "samples")
{
}
-nes_jf33_device::nes_jf33_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jf33_device::nes_jf33_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_ss88006_adpcm_device(mconfig, NES_JF33, "NES Cart Jaleco Moe Pro! Saikyou-hen PCB", tag, owner, clock, "nes_jf33", __FILE__),
m_samples(*this, "samples")
{
@@ -475,7 +475,7 @@ void nes_ss88006_device::device_timer(emu_timer &timer, device_timer_id id, int
WRITE8_MEMBER(nes_ss88006_device::ss88006_write)
{
- UINT8 bank;
+ uint8_t bank;
LOG_MMC(("ss88006 write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x7003)
@@ -563,7 +563,7 @@ WRITE8_MEMBER(nes_ss88006_device::ss88006_write)
// bits2-bits6 are sample number, bit1 is setup/enable/disable
// program first write sample # + bit1 set to 'init' the sample
// then it writes sample # + bit1 clear to 'start' the sample
-void nes_ss88006_adpcm_device::ss88006_adpcm_write(address_space &space, offs_t offset, UINT8 data, samples_device *dev)
+void nes_ss88006_adpcm_device::ss88006_adpcm_write(address_space &space, offs_t offset, uint8_t data, samples_device *dev)
{
LOG_MMC(("ss88006 write_h, offset: %04x, data: %02x\n", offset, data));
diff --git a/src/devices/bus/nes/jaleco.h b/src/devices/bus/nes/jaleco.h
index 7d8536b71ff..5ad09a78cba 100644
--- a/src/devices/bus/nes/jaleco.h
+++ b/src/devices/bus/nes/jaleco.h
@@ -13,7 +13,7 @@ class nes_jf11_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_jf11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -29,7 +29,7 @@ class nes_jf13_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_jf13_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf13_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -49,7 +49,7 @@ class nes_jf16_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_jf16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -65,8 +65,8 @@ class nes_jf17_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_jf17_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_jf17_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf17_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_jf17_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -75,7 +75,7 @@ public:
virtual void pcb_reset() override;
protected:
- UINT8 m_latch;
+ uint8_t m_latch;
};
@@ -85,7 +85,7 @@ class nes_jf17_adpcm_device : public nes_jf17_device
{
public:
// construction/destruction
- nes_jf17_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf17_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -101,8 +101,8 @@ class nes_jf19_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_jf19_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_jf19_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf19_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_jf19_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -118,7 +118,7 @@ class nes_jf19_adpcm_device : public nes_jf19_device
{
public:
// construction/destruction
- nes_jf19_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf19_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -134,8 +134,8 @@ class nes_ss88006_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ss88006_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_ss88006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ss88006_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_ss88006_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -146,17 +146,17 @@ public:
virtual void pcb_reset() override;
protected:
- UINT16 m_irq_count, m_irq_count_latch;
- UINT8 m_irq_mode;
+ uint16_t m_irq_count, m_irq_count_latch;
+ uint8_t m_irq_mode;
int m_irq_enable;
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
- UINT8 m_mmc_prg_bank[3];
- UINT8 m_mmc_vrom_bank[8];
+ uint8_t m_mmc_prg_bank[3];
+ uint8_t m_mmc_vrom_bank[8];
- UINT8 m_latch; // used for samples, in derived classes
+ uint8_t m_latch; // used for samples, in derived classes
};
@@ -166,10 +166,10 @@ class nes_ss88006_adpcm_device : public nes_ss88006_device
{
public:
// construction/destruction
- nes_ss88006_adpcm_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_ss88006_adpcm_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
- void ss88006_adpcm_write(address_space &space, offs_t offset, UINT8 data, samples_device *dev);
+ void ss88006_adpcm_write(address_space &space, offs_t offset, uint8_t data, samples_device *dev);
};
@@ -179,7 +179,7 @@ class nes_jf23_device : public nes_ss88006_adpcm_device
{
public:
// construction/destruction
- nes_jf23_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf23_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -195,7 +195,7 @@ class nes_jf24_device : public nes_ss88006_adpcm_device
{
public:
// construction/destruction
- nes_jf24_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf24_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -211,7 +211,7 @@ class nes_jf29_device : public nes_ss88006_adpcm_device
{
public:
// construction/destruction
- nes_jf29_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf29_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -227,7 +227,7 @@ class nes_jf33_device : public nes_ss88006_adpcm_device
{
public:
// construction/destruction
- nes_jf33_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jf33_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nes/jy.cpp b/src/devices/bus/nes/jy.cpp
index 08763d250e9..cf947e4b74d 100644
--- a/src/devices/bus/nes/jy.cpp
+++ b/src/devices/bus/nes/jy.cpp
@@ -42,30 +42,30 @@ const device_type NES_JY_TYPEB = &device_creator<nes_jy_typeb_device>;
const device_type NES_JY_TYPEC = &device_creator<nes_jy_typec_device>;
-nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0), m_extra_chr_bank(0), m_extra_chr_mask(0), m_bank_6000(0),
m_irq_mode(0), m_irq_count(0), m_irq_prescale(0), m_irq_prescale_mask(0), m_irq_flip(0), m_irq_enable(0), m_irq_up(0), m_irq_down(0), irq_timer(nullptr)
{
}
-nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jy_typea_device::nes_jy_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_JY_TYPEA, "NES Cart JY Company Type A PCB", tag, owner, clock, "nes_jya", __FILE__), m_latch(0), m_extra_chr_bank(0),
m_extra_chr_mask(0), m_bank_6000(0), m_irq_mode(0), m_irq_count(0), m_irq_prescale(0), m_irq_prescale_mask(0), m_irq_flip(0), m_irq_enable(0), m_irq_up(0),
m_irq_down(0), irq_timer(nullptr)
{
}
-nes_jy_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_jy_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_jy_typea_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_jy_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jy_typeb_device::nes_jy_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_jy_typea_device(mconfig, NES_JY_TYPEB, "NES Cart JY Company Type B PCB", tag, owner, clock, "nes_jyb", __FILE__)
{
}
-nes_jy_typec_device::nes_jy_typec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_jy_typec_device::nes_jy_typec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_jy_typeb_device(mconfig, NES_JY_TYPEC, "NES Cart JY Company Type C PCB", tag, owner, clock, "nes_jyc", __FILE__)
{
}
@@ -296,15 +296,15 @@ READ8_MEMBER(nes_jy_typea_device::read_m)
}
-inline UINT8 nes_jy_typea_device::unscramble(UINT8 bank)
+inline uint8_t nes_jy_typea_device::unscramble(uint8_t bank)
{
return BITSWAP8(bank & 0x7f,7,0,1,2,3,4,5,6);
}
void nes_jy_typea_device::update_prg()
{
- UINT8 exPrg = (m_reg[3] & 0x06) << 5;
- UINT8 last = (m_reg[0] & 0x04) ? m_mmc_prg_bank[3] : 0x3f;
+ uint8_t exPrg = (m_reg[3] & 0x06) << 5;
+ uint8_t last = (m_reg[0] & 0x04) ? m_mmc_prg_bank[3] : 0x3f;
switch (m_reg[0] & 0x03)
{
@@ -351,9 +351,9 @@ void nes_jy_typea_device::update_chr()
// docs suggest m_reg[3] & 0x1f for chr_page below,
// but 45 in 1 (JY-120A) menu requires to use this (from NEStopia)
- UINT8 chr_page = (m_reg[3] & 1) | ((m_reg[3] & 0x18) >> 2);
- UINT32 extra_chr_base = BIT(m_reg[3], 5) ? 0 : (chr_page * 0x100);
- UINT32 extra_chr_mask = BIT(m_reg[3], 5) ? 0xffffff : 0xff;
+ uint8_t chr_page = (m_reg[3] & 1) | ((m_reg[3] & 0x18) >> 2);
+ uint32_t extra_chr_base = BIT(m_reg[3], 5) ? 0 : (chr_page * 0x100);
+ uint32_t extra_chr_mask = BIT(m_reg[3], 5) ? 0xffffff : 0xff;
switch (m_reg[0] & 0x18)
{
diff --git a/src/devices/bus/nes/jy.h b/src/devices/bus/nes/jy.h
index 1eca466d681..5c835e42a87 100644
--- a/src/devices/bus/nes/jy.h
+++ b/src/devices/bus/nes/jy.h
@@ -12,8 +12,8 @@ class nes_jy_typea_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_jy_typea_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_jy_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jy_typea_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_jy_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -36,24 +36,24 @@ protected:
void update_chr();
void update_mirror_typea();
virtual void update_mirror() { update_mirror_typea(); }
- inline UINT8 unscramble(UINT8 bank);
-
- UINT8 m_mul[2];
- UINT8 m_latch;
- UINT8 m_reg[4];
- UINT8 m_chr_latch[2]; // type C uses a more complex CHR 4K mode, and these vars are only changed for those games
- UINT8 m_mmc_prg_bank[4];
- UINT16 m_mmc_nt_bank[4];
- UINT16 m_mmc_vrom_bank[8];
- UINT16 m_extra_chr_bank;
- UINT16 m_extra_chr_mask;
+ inline uint8_t unscramble(uint8_t bank);
+
+ uint8_t m_mul[2];
+ uint8_t m_latch;
+ uint8_t m_reg[4];
+ uint8_t m_chr_latch[2]; // type C uses a more complex CHR 4K mode, and these vars are only changed for those games
+ uint8_t m_mmc_prg_bank[4];
+ uint16_t m_mmc_nt_bank[4];
+ uint16_t m_mmc_vrom_bank[8];
+ uint16_t m_extra_chr_bank;
+ uint16_t m_extra_chr_mask;
int m_bank_6000;
- UINT8 m_irq_mode;
- UINT8 m_irq_count;
- UINT8 m_irq_prescale;
- UINT8 m_irq_prescale_mask;
- UINT8 m_irq_flip;
+ uint8_t m_irq_mode;
+ uint8_t m_irq_count;
+ uint8_t m_irq_prescale;
+ uint8_t m_irq_prescale_mask;
+ uint8_t m_irq_flip;
int m_irq_enable;
int m_irq_up, m_irq_down;
@@ -69,8 +69,8 @@ class nes_jy_typeb_device : public nes_jy_typea_device
{
public:
// construction/destruction
- nes_jy_typeb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_jy_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jy_typeb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_jy_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
void update_mirror_typeb();
@@ -83,7 +83,7 @@ class nes_jy_typec_device : public nes_jy_typeb_device
{
public:
// construction/destruction
- nes_jy_typec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_jy_typec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_READ8_MEMBER(chr_r) override;
diff --git a/src/devices/bus/nes/kaiser.cpp b/src/devices/bus/nes/kaiser.cpp
index e335681157d..4dfdeb867d6 100644
--- a/src/devices/bus/nes/kaiser.cpp
+++ b/src/devices/bus/nes/kaiser.cpp
@@ -60,57 +60,57 @@ const device_type NES_KS7016 = &device_creator<nes_ks7016_device>;
const device_type NES_KS7037 = &device_creator<nes_ks7037_device>;
-nes_ks7058_device::nes_ks7058_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7058_device::nes_ks7058_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_KS7058, "NES Cart Kaiser KS-7058 PCB", tag, owner, clock, "nes_ks7058", __FILE__)
{
}
-nes_ks7022_device::nes_ks7022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7022_device::nes_ks7022_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_KS7022, "NES Cart Kaiser KS-7022 PCB", tag, owner, clock, "nes_ks7022", __FILE__), m_latch(0)
{
}
-nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7032_device::nes_ks7032_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_KS7032, "NES Cart Kaiser KS-7032 PCB", tag, owner, clock, "nes_ks7032", __FILE__), m_latch(0), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_ks202_device::nes_ks202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks202_device::nes_ks202_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_ks7032_device(mconfig, NES_KS202, "NES Cart Kaiser KS-202 PCB", tag, owner, clock, "nes_ks202", __FILE__)
{
}
-nes_ks7017_device::nes_ks7017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7017_device::nes_ks7017_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_KS7017, "NES Cart Kaiser KS-7017 PCB", tag, owner, clock, "nes_ks7017", __FILE__), m_latch(0), m_irq_count(0), m_irq_status(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_ks7012_device::nes_ks7012_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7012_device::nes_ks7012_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_KS7012, "NES Cart Kaiser KS-7012 PCB", tag, owner, clock, "nes_ks7012", __FILE__)
{
}
-nes_ks7013b_device::nes_ks7013b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7013b_device::nes_ks7013b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_KS7013B, "NES Cart Kaiser KS-7013B PCB", tag, owner, clock, "nes_ks7013b", __FILE__)
{
}
-nes_ks7031_device::nes_ks7031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7031_device::nes_ks7031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_KS7031, "NES Cart Kaiser KS-7031 PCB", tag, owner, clock, "nes_ks7031", __FILE__)
{
}
-nes_ks7016_device::nes_ks7016_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7016_device::nes_ks7016_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_KS7031, "NES Cart Kaiser KS-7016 PCB", tag, owner, clock, "nes_ks7016", __FILE__)
{
}
-nes_ks7037_device::nes_ks7037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7037_device::nes_ks7037_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_KS7037, "NES Cart Kaiser KS-7037 PCB", tag, owner, clock, "nes_ks7037", __FILE__)
{
}
@@ -657,7 +657,7 @@ READ8_MEMBER(nes_ks7016_device::read_m)
WRITE8_MEMBER(nes_ks7016_device::write_h)
{
LOG_MMC(("ks7016 write_h, offset: %04x, data: %02x\n", offset, data));
- UINT8 mask = offset & 0x30;
+ uint8_t mask = offset & 0x30;
if ((offset & 0x5943) == 0x5943)
m_reg = (mask == 0x30) ? 0xb : (((offset >> 2) & 0x0f) << 1);
if ((offset & 0x5943) == 0x5903)
diff --git a/src/devices/bus/nes/kaiser.h b/src/devices/bus/nes/kaiser.h
index 6d58ff134fe..c6d094d4390 100644
--- a/src/devices/bus/nes/kaiser.h
+++ b/src/devices/bus/nes/kaiser.h
@@ -12,7 +12,7 @@ class nes_ks7058_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ks7058_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7058_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_ks7022_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ks7022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7022_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -38,7 +38,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
};
@@ -48,8 +48,8 @@ class nes_ks7032_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ks7032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_ks7032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_ks7032_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -63,10 +63,10 @@ public:
protected:
void prg_update();
- UINT8 m_latch;
- UINT8 m_reg[8];
+ uint8_t m_latch;
+ uint8_t m_reg[8];
- UINT16 m_irq_count;
+ uint16_t m_irq_count;
int m_irq_enable;
static const device_timer_id TIMER_IRQ = 0;
@@ -80,7 +80,7 @@ class nes_ks202_device : public nes_ks7032_device
{
public:
// construction/destruction
- nes_ks202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks202_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_READ8_MEMBER(read_m) override;
@@ -94,7 +94,7 @@ class nes_ks7017_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ks7017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7017_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -106,10 +106,10 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
- UINT16 m_irq_count;
- UINT8 m_irq_status;
+ uint16_t m_irq_count;
+ uint8_t m_irq_status;
int m_irq_enable;
static const device_timer_id TIMER_IRQ = 0;
@@ -123,7 +123,7 @@ class nes_ks7012_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ks7012_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7012_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -138,7 +138,7 @@ class nes_ks7013b_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ks7013b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7013b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -155,7 +155,7 @@ class nes_ks7031_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ks7031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -166,7 +166,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg[4];
+ uint8_t m_reg[4];
};
@@ -176,7 +176,7 @@ class nes_ks7016_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ks7016_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7016_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -186,7 +186,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg;
+ uint8_t m_reg;
};
// ======================> nes_ks7037_device
@@ -195,7 +195,7 @@ class nes_ks7037_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ks7037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7037_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -208,8 +208,8 @@ public:
private:
void update_prg();
- UINT8 m_latch;
- UINT8 m_reg[8];
+ uint8_t m_latch;
+ uint8_t m_reg[8];
};
diff --git a/src/devices/bus/nes/karastudio.cpp b/src/devices/bus/nes/karastudio.cpp
index 13366022114..eb2177a240d 100644
--- a/src/devices/bus/nes/karastudio.cpp
+++ b/src/devices/bus/nes/karastudio.cpp
@@ -71,7 +71,7 @@ READ8_MEMBER(kstudio_cart_interface::read)
const device_type NES_KSEXPANSION_SLOT = &device_creator<nes_kstudio_slot_device>;
-nes_kstudio_slot_device::nes_kstudio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_kstudio_slot_device::nes_kstudio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_KSEXPANSION_SLOT, "NES Karaoke Studio Expansion Slot", tag, owner, clock, "nes_ks_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr)
@@ -100,7 +100,7 @@ image_init_result nes_kstudio_slot_device::call_load()
{
if (m_cart)
{
- UINT8 *ROM = m_cart->get_cart_base();
+ uint8_t *ROM = m_cart->get_cart_base();
if (!ROM)
return image_init_result::FAIL;
@@ -144,7 +144,7 @@ ROM_END
const device_type NES_KSEXPANSION_ROM = &device_creator<nes_kstudio_rom_device>;
-nes_kstudio_rom_device::nes_kstudio_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_kstudio_rom_device::nes_kstudio_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, NES_KSEXPANSION_ROM, "NES Karaoke Studio Expansion ROM", tag, owner, clock, "nes_ks_rom", __FILE__),
kstudio_cart_interface( mconfig, *this )
{
@@ -152,7 +152,7 @@ nes_kstudio_rom_device::nes_kstudio_rom_device(const machine_config &mconfig, co
void nes_kstudio_rom_device::device_start()
{
- m_rom = (UINT8*)memregion("exrom")->base();
+ m_rom = (uint8_t*)memregion("exrom")->base();
save_item(NAME(m_bank));
}
@@ -166,7 +166,7 @@ const tiny_rom_entry *nes_kstudio_rom_device::device_rom_region() const
return ROM_NAME( ks_exp_rom );
}
-UINT8 *nes_kstudio_rom_device::get_cart_base()
+uint8_t *nes_kstudio_rom_device::get_cart_base()
{
return m_rom;
}
@@ -181,7 +181,7 @@ UINT8 *nes_kstudio_rom_device::get_cart_base()
const device_type NES_KARAOKESTUDIO = &device_creator<nes_karaokestudio_device>;
-nes_karaokestudio_device::nes_karaokestudio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_karaokestudio_device::nes_karaokestudio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_KARAOKESTUDIO, "NES Cart Bandai Karaoke Studio PCB", tag, owner, clock, "nes_karaoke", __FILE__), m_exp_active(0),
m_subslot(*this, "exp_slot"),
m_mic_ipt(*this, "MIC")
diff --git a/src/devices/bus/nes/karastudio.h b/src/devices/bus/nes/karastudio.h
index f5d15ce6e46..2accd9bf346 100644
--- a/src/devices/bus/nes/karastudio.h
+++ b/src/devices/bus/nes/karastudio.h
@@ -25,14 +25,14 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(read);
- UINT8 *get_cart_base() { return m_rom; }
- void write_prg_bank(UINT8 bank) { m_bank = bank; }
+ uint8_t *get_cart_base() { return m_rom; }
+ void write_prg_bank(uint8_t bank) { m_bank = bank; }
protected:
// internal state
- UINT8 *m_rom;
+ uint8_t *m_rom;
// ROM is accessed via two 16K banks, but only the first one can be switched
- UINT8 m_bank;
+ uint8_t m_bank;
};
// ======================> nes_kstudio_slot_device
@@ -43,7 +43,7 @@ class nes_kstudio_slot_device : public device_t,
{
public:
// construction/destruction
- nes_kstudio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_kstudio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~nes_kstudio_slot_device();
// device-level overrides
@@ -67,7 +67,7 @@ public:
virtual std::string get_default_card_software() override;
virtual DECLARE_READ8_MEMBER(read);
- void write_prg_bank(UINT8 bank) { if (m_cart) m_cart->write_prg_bank(bank); }
+ void write_prg_bank(uint8_t bank) { if (m_cart) m_cart->write_prg_bank(bank); }
kstudio_cart_interface* m_cart;
};
@@ -94,11 +94,11 @@ class nes_kstudio_rom_device : public device_t,
{
public:
// construction/destruction
- nes_kstudio_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_kstudio_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
- virtual UINT8* get_cart_base();
+ virtual uint8_t* get_cart_base();
protected:
// device-level overrides
@@ -122,7 +122,7 @@ class nes_karaokestudio_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_karaokestudio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_karaokestudio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/konami.cpp b/src/devices/bus/nes/konami.cpp
index ded2e4b0980..a7565d5af96 100644
--- a/src/devices/bus/nes/konami.cpp
+++ b/src/devices/bus/nes/konami.cpp
@@ -51,38 +51,38 @@ const device_type NES_VRC6 = &device_creator<nes_konami_vrc6_device>;
const device_type NES_VRC7 = &device_creator<nes_konami_vrc7_device>;
-nes_konami_vrc1_device::nes_konami_vrc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_konami_vrc1_device::nes_konami_vrc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_VRC1, "NES Cart Konami VRC-1 PCB", tag, owner, clock, "nes_vrc1", __FILE__)
{
}
-nes_konami_vrc2_device::nes_konami_vrc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_konami_vrc2_device::nes_konami_vrc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_VRC2, "NES Cart Konami VRC-2 PCB", tag, owner, clock, "nes_vrc2", __FILE__), m_latch(0)
{
}
-nes_konami_vrc3_device::nes_konami_vrc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_konami_vrc3_device::nes_konami_vrc3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_VRC3, "NES Cart Konami VRC-3 PCB", tag, owner, clock, "nes_vrc3", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0), m_irq_mode(0), irq_timer(nullptr)
{
}
-nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0), m_mmc_prg_bank(0), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0), m_irq_mode(0), m_irq_prescale(0), irq_timer(nullptr)
{
}
-nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_konami_vrc4_device::nes_konami_vrc4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_VRC4, "NES Cart Konami VRC-4 PCB", tag, owner, clock, "nes_vrc4", __FILE__), m_latch(0), m_mmc_prg_bank(0), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0), m_irq_mode(0), m_irq_prescale(0), irq_timer(nullptr)
{
}
-nes_konami_vrc6_device::nes_konami_vrc6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_konami_vrc6_device::nes_konami_vrc6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_konami_vrc4_device(mconfig, NES_VRC6, "NES Cart Konami VRC-6 PCB", tag, owner, clock, "nes_vrc6", __FILE__),
m_vrc6snd(*this, "vrc6snd")
{
}
-nes_konami_vrc7_device::nes_konami_vrc7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_konami_vrc7_device::nes_konami_vrc7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_konami_vrc4_device(mconfig, NES_VRC7, "NES Cart Konami VRC-7 PCB", tag, owner, clock, "nes_vrc7", __FILE__),
m_ym2413(*this, "ym")
{
@@ -309,8 +309,8 @@ WRITE8_MEMBER(nes_konami_vrc2_device::write_m)
WRITE8_MEMBER(nes_konami_vrc2_device::write_h)
{
- UINT8 bank, shift, mask;
- UINT16 add_lines = ((offset << (9 - m_vrc_ls_prg_a)) & 0x200) | ((offset << (8 - m_vrc_ls_prg_b)) & 0x100);
+ uint8_t bank, shift, mask;
+ uint16_t add_lines = ((offset << (9 - m_vrc_ls_prg_a)) & 0x200) | ((offset << (8 - m_vrc_ls_prg_b)) & 0x100);
LOG_MMC(("VRC-2 write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x7000)
@@ -487,8 +487,8 @@ void nes_konami_vrc4_device::set_prg()
WRITE8_MEMBER(nes_konami_vrc4_device::write_h)
{
- UINT8 bank, shift, mask;
- UINT16 add_lines = ((offset << (9 - m_vrc_ls_prg_a)) & 0x200) | ((offset << (8 - m_vrc_ls_prg_b)) & 0x100);
+ uint8_t bank, shift, mask;
+ uint16_t add_lines = ((offset << (9 - m_vrc_ls_prg_a)) & 0x200) | ((offset << (8 - m_vrc_ls_prg_b)) & 0x100);
LOG_MMC(("VRC-4 write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x7000)
@@ -569,8 +569,8 @@ WRITE8_MEMBER(nes_konami_vrc4_device::write_h)
WRITE8_MEMBER(nes_konami_vrc6_device::write_h)
{
- UINT8 bank;
- UINT16 add_lines = ((offset << (9 - m_vrc_ls_prg_a)) & 0x200) | ((offset << (8 - m_vrc_ls_prg_b)) & 0x100);
+ uint8_t bank;
+ uint16_t add_lines = ((offset << (9 - m_vrc_ls_prg_a)) & 0x200) | ((offset << (8 - m_vrc_ls_prg_b)) & 0x100);
LOG_MMC(("VRC-6 write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x7000)
@@ -668,7 +668,7 @@ machine_config_constructor nes_konami_vrc6_device::device_mconfig_additions() co
WRITE8_MEMBER(nes_konami_vrc7_device::write_h)
{
- UINT8 bank;
+ uint8_t bank;
LOG_MMC(("VRC-7 write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x7038)
diff --git a/src/devices/bus/nes/konami.h b/src/devices/bus/nes/konami.h
index 8a0ac20ff75..11a6e943bb3 100644
--- a/src/devices/bus/nes/konami.h
+++ b/src/devices/bus/nes/konami.h
@@ -14,7 +14,7 @@ class nes_konami_vrc1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_konami_vrc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_konami_vrc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -23,7 +23,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_mmc_vrom_bank[2];
+ uint8_t m_mmc_vrom_bank[2];
};
@@ -33,7 +33,7 @@ class nes_konami_vrc2_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_konami_vrc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_konami_vrc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -44,8 +44,8 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_mmc_vrom_bank[8];
- UINT8 m_latch;
+ uint8_t m_mmc_vrom_bank[8];
+ uint8_t m_latch;
};
@@ -55,7 +55,7 @@ class nes_konami_vrc3_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_konami_vrc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_konami_vrc3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -65,7 +65,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT16 m_irq_count, m_irq_count_latch;
+ uint16_t m_irq_count, m_irq_count_latch;
int m_irq_enable, m_irq_enable_latch;
int m_irq_mode;
@@ -80,8 +80,8 @@ class nes_konami_vrc4_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_konami_vrc4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_konami_vrc4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_konami_vrc4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_konami_vrc4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -92,11 +92,11 @@ public:
protected:
void set_prg();
- UINT8 m_mmc_vrom_bank[8];
- UINT8 m_latch, m_mmc_prg_bank;
+ uint8_t m_mmc_vrom_bank[8];
+ uint8_t m_latch, m_mmc_prg_bank;
void irq_tick();
- UINT16 m_irq_count, m_irq_count_latch;
+ uint16_t m_irq_count, m_irq_count_latch;
int m_irq_enable, m_irq_enable_latch;
int m_irq_mode;
int m_irq_prescale;
@@ -112,7 +112,7 @@ class nes_konami_vrc6_device : public nes_konami_vrc4_device
{
public:
// construction/destruction
- nes_konami_vrc6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_konami_vrc6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -129,7 +129,7 @@ class nes_konami_vrc7_device : public nes_konami_vrc4_device
{
public:
// construction/destruction
- nes_konami_vrc7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_konami_vrc7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/legacy.cpp b/src/devices/bus/nes/legacy.cpp
index cdcc69df682..888a5077146 100644
--- a/src/devices/bus/nes/legacy.cpp
+++ b/src/devices/bus/nes/legacy.cpp
@@ -39,22 +39,22 @@ const device_type NES_FFE4 = &device_creator<nes_ffe4_device>;
const device_type NES_FFE8 = &device_creator<nes_ffe8_device>;
-nes_ffe3_device::nes_ffe3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ffe3_device::nes_ffe3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_FFE3, "NES Cart FFE-3 PCB", tag, owner, clock, "nes_ff3", __FILE__)
{
}
-nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_exram_enabled(0), m_exram_bank(0)
{
}
-nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ffe4_device::nes_ffe4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_FFE4, "NES Cart FFE-4 PCB", tag, owner, clock, "nes_ff4", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_exram_enabled(0), m_exram_bank(0)
{
}
-nes_ffe8_device::nes_ffe8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ffe8_device::nes_ffe8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_ffe4_device(mconfig, NES_FFE8, "NES Cart FFE-8 PCB", tag, owner, clock, "nes_ff8", __FILE__)
{
}
diff --git a/src/devices/bus/nes/legacy.h b/src/devices/bus/nes/legacy.h
index 4efc4bc96f5..396eec92b46 100644
--- a/src/devices/bus/nes/legacy.h
+++ b/src/devices/bus/nes/legacy.h
@@ -12,7 +12,7 @@ class nes_ffe3_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ffe3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ffe3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -28,8 +28,8 @@ class nes_ffe4_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ffe4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_ffe4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ffe4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_ffe4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -42,16 +42,16 @@ public:
virtual void pcb_reset() override;
protected:
- UINT16 m_irq_count;
+ uint16_t m_irq_count;
int m_irq_enable;
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
- UINT8 m_latch;
+ uint8_t m_latch;
int m_exram_enabled;
int m_exram_bank;
- UINT8 m_exram[0x8000];
+ uint8_t m_exram[0x8000];
};
@@ -61,7 +61,7 @@ class nes_ffe8_device : public nes_ffe4_device
{
public:
// construction/destruction
- nes_ffe8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ffe8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_l) override;
diff --git a/src/devices/bus/nes/mmc1.cpp b/src/devices/bus/nes/mmc1.cpp
index b1bd17d3917..983fb5bfcb8 100644
--- a/src/devices/bus/nes/mmc1.cpp
+++ b/src/devices/bus/nes/mmc1.cpp
@@ -39,27 +39,27 @@ const device_type NES_SOROM_A = &device_creator<nes_sorom_a_device>;
-nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_reg_write_enable(0), m_latch(0), m_count(0)
{
}
-nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sxrom_device::nes_sxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SXROM, "NES Cart SxROM (MMC-1) PCB", tag, owner, clock, "nes_sxrom", __FILE__), m_reg_write_enable(0), m_latch(0), m_count(0)
{
}
-nes_sorom_device::nes_sorom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sorom_device::nes_sorom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_sxrom_device(mconfig, NES_SOROM, "NES Cart SOROM (MMC-1) PCB", tag, owner, clock, "nes_sorom", __FILE__)
{
}
-nes_sxrom_a_device::nes_sxrom_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sxrom_a_device::nes_sxrom_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_sxrom_device(mconfig, NES_SXROM_A, "NES Cart SxROM (MMC-1A) PCB", tag, owner, clock, "nes_sxrom_a", __FILE__)
{
}
-nes_sorom_a_device::nes_sorom_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sorom_a_device::nes_sorom_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_sxrom_device(mconfig, NES_SOROM_A, "NES Cart SOROM (MMC-1A) PCB", tag, owner, clock, "nes_sorom_a", __FILE__)
{
}
@@ -144,7 +144,7 @@ TIMER_CALLBACK_MEMBER( nes_sxrom_device::resync_callback )
void nes_sxrom_device::set_prg()
{
- UINT8 prg_mode, prg_offset;
+ uint8_t prg_mode, prg_offset;
prg_mode = m_reg[0] & 0x0c;
/* prg_mode&0x8 determines bank size: 32k (if 0) or 16k (if 1)? when in 16k mode,
@@ -179,7 +179,7 @@ void nes_sxrom_device::set_prg()
void nes_sxrom_device::set_chr()
{
- UINT8 chr_mode = BIT(m_reg[0], 4);
+ uint8_t chr_mode = BIT(m_reg[0], 4);
if (chr_mode)
{
@@ -267,7 +267,7 @@ WRITE8_MEMBER( nes_sxrom_device::write_h )
WRITE8_MEMBER(nes_sxrom_device::write_m)
{
- UINT8 bank = (m_reg[1] >> 2) & 3;
+ uint8_t bank = (m_reg[1] >> 2) & 3;
LOG_MMC(("sxrom write_m, offset: %04x, data: %02x\n", offset, data));
if (!BIT(m_reg[3], 4)) // WRAM enabled
@@ -281,7 +281,7 @@ WRITE8_MEMBER(nes_sxrom_device::write_m)
READ8_MEMBER(nes_sxrom_device::read_m)
{
- UINT8 bank = (m_reg[1] >> 2) & 3;
+ uint8_t bank = (m_reg[1] >> 2) & 3;
LOG_MMC(("sxrom read_m, offset: %04x\n", offset));
if (!BIT(m_reg[3], 4)) // WRAM enabled
@@ -298,7 +298,7 @@ READ8_MEMBER(nes_sxrom_device::read_m)
// SOROM has two RAM banks, the first is not battery backed up, the second is.
WRITE8_MEMBER(nes_sorom_device::write_m)
{
- UINT8 type = BIT(m_reg[0], 4) ? BIT(m_reg[1], 4) : BIT(m_reg[1], 3);
+ uint8_t type = BIT(m_reg[0], 4) ? BIT(m_reg[1], 4) : BIT(m_reg[1], 3);
LOG_MMC(("sorom write_m, offset: %04x, data: %02x\n", offset, data));
if (!BIT(m_reg[3], 4)) // WRAM enabled
@@ -312,7 +312,7 @@ WRITE8_MEMBER(nes_sorom_device::write_m)
READ8_MEMBER(nes_sorom_device::read_m)
{
- UINT8 type = BIT(m_reg[0], 4) ? BIT(m_reg[1], 4) : BIT(m_reg[1], 3);
+ uint8_t type = BIT(m_reg[0], 4) ? BIT(m_reg[1], 4) : BIT(m_reg[1], 3);
LOG_MMC(("sorom read_m, offset: %04x\n", offset));
if (!BIT(m_reg[3], 4)) // WRAM enabled
@@ -329,7 +329,7 @@ READ8_MEMBER(nes_sorom_device::read_m)
// MMC1A boards have no wram enable/disable bit
WRITE8_MEMBER(nes_sxrom_a_device::write_m)
{
- UINT8 bank = (m_reg[1] >> 2) & 3;
+ uint8_t bank = (m_reg[1] >> 2) & 3;
LOG_MMC(("sxrom_a write_m, offset: %04x, data: %02x\n", offset, data));
if (!m_battery.empty())
@@ -340,7 +340,7 @@ WRITE8_MEMBER(nes_sxrom_a_device::write_m)
READ8_MEMBER(nes_sxrom_a_device::read_m)
{
- UINT8 bank = (m_reg[1] >> 2) & 3;
+ uint8_t bank = (m_reg[1] >> 2) & 3;
LOG_MMC(("sxrom_a read_m, offset: %04x\n", offset));
if (!m_battery.empty())
@@ -353,7 +353,7 @@ READ8_MEMBER(nes_sxrom_a_device::read_m)
WRITE8_MEMBER(nes_sorom_a_device::write_m)
{
- UINT8 type = BIT(m_reg[0], 4) ? BIT(m_reg[1], 4) : BIT(m_reg[1], 3);
+ uint8_t type = BIT(m_reg[0], 4) ? BIT(m_reg[1], 4) : BIT(m_reg[1], 3);
LOG_MMC(("sorom_a write_m, offset: %04x, data: %02x\n", offset, data));
if (type)
@@ -364,7 +364,7 @@ WRITE8_MEMBER(nes_sorom_a_device::write_m)
READ8_MEMBER(nes_sorom_a_device::read_m)
{
- UINT8 type = BIT(m_reg[0], 4) ? BIT(m_reg[1], 4) : BIT(m_reg[1], 3);
+ uint8_t type = BIT(m_reg[0], 4) ? BIT(m_reg[1], 4) : BIT(m_reg[1], 3);
LOG_MMC(("sorom_a read_m, offset: %04x\n", offset));
if (type)
diff --git a/src/devices/bus/nes/mmc1.h b/src/devices/bus/nes/mmc1.h
index 7b71b732a87..8b30b6f0bbf 100644
--- a/src/devices/bus/nes/mmc1.h
+++ b/src/devices/bus/nes/mmc1.h
@@ -12,8 +12,8 @@ class nes_sxrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_sxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_sxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -29,7 +29,7 @@ protected:
virtual void set_prg();
virtual void set_chr();
- UINT8 m_reg[4];
+ uint8_t m_reg[4];
int m_reg_write_enable;
int m_latch;
int m_count;
@@ -39,7 +39,7 @@ class nes_sorom_device : public nes_sxrom_device
{
public:
// construction/destruction
- nes_sorom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sorom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_READ8_MEMBER(read_m) override;
virtual DECLARE_WRITE8_MEMBER(write_m) override;
@@ -51,7 +51,7 @@ class nes_sxrom_a_device : public nes_sxrom_device
{
public:
// construction/destruction
- nes_sxrom_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sxrom_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_READ8_MEMBER(read_m) override;
virtual DECLARE_WRITE8_MEMBER(write_m) override;
@@ -61,7 +61,7 @@ class nes_sorom_a_device : public nes_sxrom_device
{
public:
// construction/destruction
- nes_sorom_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sorom_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_READ8_MEMBER(read_m) override;
virtual DECLARE_WRITE8_MEMBER(write_m) override;
diff --git a/src/devices/bus/nes/mmc2.cpp b/src/devices/bus/nes/mmc2.cpp
index 9351761f31c..1fedbab04df 100644
--- a/src/devices/bus/nes/mmc2.cpp
+++ b/src/devices/bus/nes/mmc2.cpp
@@ -32,19 +32,19 @@ const device_type NES_PXROM = &device_creator<nes_pxrom_device>;
const device_type NES_FXROM = &device_creator<nes_fxrom_device>;
-nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_latch1(0),
m_latch2(0)
{
}
-nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_pxrom_device::nes_pxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_PXROM, "NES Cart PxROM (MMC-2) PCB", tag, owner, clock, "nes_pxrom", __FILE__), m_latch1(0), m_latch2(0)
{
}
-nes_fxrom_device::nes_fxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_fxrom_device::nes_fxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_pxrom_device(mconfig, NES_FXROM, "NES Cart FxROM (MMC-4) PCB", tag, owner, clock, "nes_fxrom", __FILE__)
{
}
diff --git a/src/devices/bus/nes/mmc2.h b/src/devices/bus/nes/mmc2.h
index d127aafec2f..ecdf5e30ed0 100644
--- a/src/devices/bus/nes/mmc2.h
+++ b/src/devices/bus/nes/mmc2.h
@@ -12,8 +12,8 @@ class nes_pxrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_pxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_pxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_pxrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_pxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -24,7 +24,7 @@ public:
virtual void pcb_reset() override;
protected:
- UINT8 m_reg[4];
+ uint8_t m_reg[4];
int m_latch1, m_latch2;
};
@@ -35,7 +35,7 @@ class nes_fxrom_device : public nes_pxrom_device
{
public:
// construction/destruction
- nes_fxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
diff --git a/src/devices/bus/nes/mmc3.cpp b/src/devices/bus/nes/mmc3.cpp
index a9bc5631b0d..1357ceb119b 100644
--- a/src/devices/bus/nes/mmc3.cpp
+++ b/src/devices/bus/nes/mmc3.cpp
@@ -53,39 +53,39 @@ const device_type NES_QJ_PCB = &device_creator<nes_qj_device>;
const device_type NES_ZZ_PCB = &device_creator<nes_zz_device>;
-nes_txrom_device::nes_txrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_txrom_device::nes_txrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_prg_base(0), m_prg_mask(0), m_chr_base(0), m_chr_mask(0),
m_latch(0), m_wram_protect(0), m_alt_irq(0), m_irq_count(0), m_irq_count_latch(0), m_irq_clear(0), m_irq_enable(0)
{
}
-nes_txrom_device::nes_txrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_txrom_device::nes_txrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_TXROM, "NES Cart TxROM (MMC-3) PCB", tag, owner, clock, "nes_txrom", __FILE__), m_prg_base(0), m_prg_mask(0), m_chr_base(0), m_chr_mask(0),
m_latch(0), m_wram_protect(0), m_alt_irq(0), m_irq_count(0), m_irq_count_latch(0), m_irq_clear(0), m_irq_enable(0)
{
}
-nes_hkrom_device::nes_hkrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_hkrom_device::nes_hkrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_HKROM, "NES Cart HKROM (MMC-6) PCB", tag, owner, clock, "nes_hkrom", __FILE__), m_wram_enable(0), m_mmc6_reg(0)
{
}
-nes_txsrom_device::nes_txsrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_txsrom_device::nes_txsrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_TXSROM, "NES Cart TxSROM PCB", tag, owner, clock, "nes_txsrom", __FILE__)
{
}
-nes_tqrom_device::nes_tqrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tqrom_device::nes_tqrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_TQROM, "NES Cart TQROM PCB", tag, owner, clock, "nes_tqrom", __FILE__)
{
}
-nes_qj_device::nes_qj_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_qj_device::nes_qj_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_QJ_PCB, "NES Cart NES-QJ PCB", tag, owner, clock, "nes_qj", __FILE__)
{
}
-nes_zz_device::nes_zz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_zz_device::nes_zz_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_ZZ_PCB, "NES Cart PAL-ZZ PCB", tag, owner, clock, "nes_zz", __FILE__)
{
}
@@ -224,7 +224,7 @@ void nes_txrom_device::chr_cb( int start, int bank, int source )
void nes_txrom_device::set_prg( int prg_base, int prg_mask )
{
- UINT8 prg_flip = (m_latch & 0x40) ? 2 : 0;
+ uint8_t prg_flip = (m_latch & 0x40) ? 2 : 0;
prg_cb(0, prg_base | (m_mmc_prg_bank[0 ^ prg_flip] & prg_mask));
prg_cb(1, prg_base | (m_mmc_prg_bank[1] & prg_mask));
@@ -232,9 +232,9 @@ void nes_txrom_device::set_prg( int prg_base, int prg_mask )
prg_cb(3, prg_base | (m_mmc_prg_bank[3] & prg_mask));
}
-void nes_txrom_device::set_chr( UINT8 chr, int chr_base, int chr_mask )
+void nes_txrom_device::set_chr( uint8_t chr, int chr_base, int chr_mask )
{
- UINT8 chr_page = (m_latch & 0x80) >> 5;
+ uint8_t chr_page = (m_latch & 0x80) >> 5;
chr_cb(chr_page ^ 0, chr_base | ((m_mmc_vrom_bank[0] & ~0x01) & chr_mask), chr);
chr_cb(chr_page ^ 1, chr_base | ((m_mmc_vrom_bank[0] | 0x01) & chr_mask), chr);
@@ -248,7 +248,7 @@ void nes_txrom_device::set_chr( UINT8 chr, int chr_base, int chr_mask )
WRITE8_MEMBER(nes_txrom_device::txrom_write)
{
- UINT8 mmc_helper, cmd;
+ uint8_t mmc_helper, cmd;
LOG_MMC(("txrom_write, offset: %04x, data: %02x\n", offset, data));
@@ -354,7 +354,7 @@ READ8_MEMBER(nes_txrom_device::read_m)
WRITE8_MEMBER(nes_hkrom_device::write_m)
{
- UINT8 write_hi, write_lo;
+ uint8_t write_hi, write_lo;
LOG_MMC(("hkrom write_m, offset: %04x, data: %02x\n", offset, data));
if (offset < 0x1000)
@@ -393,7 +393,7 @@ READ8_MEMBER(nes_hkrom_device::read_m)
WRITE8_MEMBER(nes_hkrom_device::write_h)
{
- UINT8 mmc6_helper;
+ uint8_t mmc6_helper;
LOG_MMC(("hkrom write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x6001)
@@ -494,10 +494,10 @@ WRITE8_MEMBER(nes_txsrom_device::write_h)
-------------------------------------------------*/
-void nes_tqrom_device::set_chr( UINT8 chr, int chr_base, int chr_mask )
+void nes_tqrom_device::set_chr( uint8_t chr, int chr_base, int chr_mask )
{
- UINT8 chr_page = (m_latch & 0x80) >> 5;
- UINT8 src[6], mask[6];
+ uint8_t chr_page = (m_latch & 0x80) >> 5;
+ uint8_t src[6], mask[6];
// TQROM ignores the source, base and mask set by the MMC3 and determines them based on vrom bank bits
for (int i = 0; i < 6; i++)
@@ -550,7 +550,7 @@ WRITE8_MEMBER(nes_qj_device::write_m)
WRITE8_MEMBER(nes_zz_device::write_m)
{
- UINT8 mmc_helper = data & 0x07;
+ uint8_t mmc_helper = data & 0x07;
LOG_MMC(("zz write_m, offset: %04x, data: %02x\n", offset, data));
m_prg_base = (BIT(mmc_helper, 2) << 4) | (((mmc_helper & 0x03) == 0x03) ? 0x08 : 0);
diff --git a/src/devices/bus/nes/mmc3.h b/src/devices/bus/nes/mmc3.h
index 6436b247cea..17578b92adf 100644
--- a/src/devices/bus/nes/mmc3.h
+++ b/src/devices/bus/nes/mmc3.h
@@ -12,8 +12,8 @@ class nes_txrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_txrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_txrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_txrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_txrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { mmc3_start(); }
@@ -29,13 +29,13 @@ public:
protected:
virtual void set_prg(int prg_base, int prg_mask);
- virtual void set_chr(UINT8 chr, int chr_base, int chr_mask);
+ virtual void set_chr(uint8_t chr, int chr_base, int chr_mask);
void mmc3_start();
void mmc3_common_initialize(int prg_mask, int chr_mask, int IRQ_type);
// are there MMC3 clones which need more regs?
- UINT16 m_mmc_prg_bank[4];
- UINT16 m_mmc_vrom_bank[8]; // a few clones need more than the 6 banks used by base MMC3 (e.g. waixing_g)
+ uint16_t m_mmc_prg_bank[4];
+ uint16_t m_mmc_vrom_bank[8]; // a few clones need more than the 6 banks used by base MMC3 (e.g. waixing_g)
int m_prg_base, m_prg_mask; // MMC3 based multigame carts select a block of banks by using these (and then act like normal MMC3),
int m_chr_base, m_chr_mask; // while MMC3 and clones (mapper 118 & 119) simply set them as 0 and 0xff resp.
@@ -44,8 +44,8 @@ protected:
int m_wram_protect;
int m_alt_irq;
- UINT16 m_irq_count, m_irq_count_latch;
- UINT8 m_irq_clear;
+ uint16_t m_irq_count, m_irq_count_latch;
+ uint8_t m_irq_clear;
int m_irq_enable;
};
@@ -56,7 +56,7 @@ class nes_hkrom_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_hkrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_hkrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -68,10 +68,10 @@ public:
protected:
int m_wram_enable;
- UINT8 m_mmc6_reg;
+ uint8_t m_mmc6_reg;
// MMC-6 contains 1K of internal ram, battery backed up
- UINT8 m_mmc6_ram[0x400];
+ uint8_t m_mmc6_ram[0x400];
};
@@ -81,7 +81,7 @@ class nes_txsrom_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_txsrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_txsrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -98,10 +98,10 @@ class nes_tqrom_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_tqrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tqrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
- virtual void set_chr( UINT8 chr, int chr_base, int chr_mask ) override;
+ virtual void set_chr( uint8_t chr, int chr_base, int chr_mask ) override;
};
@@ -111,7 +111,7 @@ class nes_qj_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_qj_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_qj_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_m) override;
@@ -125,7 +125,7 @@ class nes_zz_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_zz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_zz_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_m) override;
diff --git a/src/devices/bus/nes/mmc3_clones.cpp b/src/devices/bus/nes/mmc3_clones.cpp
index 72fde58282f..b9866c1e63e 100644
--- a/src/devices/bus/nes/mmc3_clones.cpp
+++ b/src/devices/bus/nes/mmc3_clones.cpp
@@ -66,182 +66,182 @@ const device_type NES_PJOY84 = &device_creator<nes_pjoy84_device>;
const device_type NES_COOLBOY = &device_creator<nes_coolboy_device>;
-nes_nitra_device::nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_nitra_device::nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_NITRA, "NES Cart Nitra PCB", tag, owner, clock, "nes_nitra", __FILE__)
{
}
-nes_ks7057_device::nes_ks7057_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ks7057_device::nes_ks7057_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_KS7057, "NES Cart KS-7057 PCB", tag, owner, clock, "nes_ks7057", __FILE__)
{
}
-nes_sbros11_device::nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sbros11_device::nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_SBROS11, "NES Cart SMB 11 PCB", tag, owner, clock, "nes_smb11", __FILE__)
{
}
-nes_malisb_device::nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_malisb_device::nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_MALISB, "NES Cart Mali Spash Bomb PCB", tag, owner, clock, "nes_malisb", __FILE__)
{
}
-nes_family4646_device::nes_family4646_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_family4646_device::nes_family4646_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_FAMILY4646, "NES Cart BMC-FAMILY-4646 PCB", tag, owner, clock, "nes_family4646", __FILE__)
{
}
-nes_pikay2k_device::nes_pikay2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_pikay2k_device::nes_pikay2k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_PIKAY2K, "NES Cart PIKACHU Y2K PCB", tag, owner, clock, "nes_pikay2k", __FILE__)
{
}
-nes_8237_device::nes_8237_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_8237_device::nes_8237_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_8237, "NES Cart UNL-8237 PCB", tag, owner, clock, "nes_8237", __FILE__), m_cd_enable(0)
{
}
-nes_sglionk_device::nes_sglionk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sglionk_device::nes_sglionk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_SG_LIONK, "NES Cart SuperGame Lion King PCB", tag, owner, clock, "nes_sglionk", __FILE__), m_reg(0), m_reg_enabled(0)
{
}
-nes_sgboog_device::nes_sgboog_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sgboog_device::nes_sgboog_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_SG_BOOG, "NES Cart SuperGame BoogerMan PCB", tag, owner, clock, "nes_sgbooger", __FILE__), m_mode(0)
{
}
-nes_kasing_device::nes_kasing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_kasing_device::nes_kasing_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_KASING, "NES Cart Kasing PCB", tag, owner, clock, "nes_kasing", __FILE__), m_reg(0)
{
}
-nes_kay_device::nes_kay_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_kay_device::nes_kay_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_KAY, "NES Cart KAY PCB", tag, owner, clock, "nes_kay", __FILE__), m_low_reg(0)
{
}
-nes_h2288_device::nes_h2288_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_h2288_device::nes_h2288_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_H2288, "NES Cart H-2288 PCB", tag, owner, clock, "nes_h2288", __FILE__)
{
}
-nes_6035052_device::nes_6035052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_6035052_device::nes_6035052_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_6035052, "NES Cart UNL-603-5052 PCB", tag, owner, clock, "nes_6035052", __FILE__), m_prot(0)
{
}
-nes_txc_tw_device::nes_txc_tw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_txc_tw_device::nes_txc_tw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_TXC_TW, "NES Cart TXC Thunder Warrior PCB", tag, owner, clock, "nes_txc_tw", __FILE__)
{
}
-nes_kof97_device::nes_kof97_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_kof97_device::nes_kof97_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_KOF97, "NES Cart KOF 97 PCB", tag, owner, clock, "nes_kof97", __FILE__)
{
}
-nes_kof96_device::nes_kof96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_kof96_device::nes_kof96_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_KOF96, "NES Cart KOF 96 PCB", tag, owner, clock, "nes_kof96", __FILE__)
{
}
-nes_sf3_device::nes_sf3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sf3_device::nes_sf3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_SF3, "NES Cart Super Fighter III PCB", tag, owner, clock, "nes_sf3", __FILE__)
{
}
-nes_gouder_device::nes_gouder_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_gouder_device::nes_gouder_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_GOUDER, "NES Cart Gouder PCB", tag, owner, clock, "nes_gouder", __FILE__)
{
}
-nes_sa9602b_device::nes_sa9602b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sa9602b_device::nes_sa9602b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_SA9602B, "NES Cart SA-9602B PCB", tag, owner, clock, "nes_sa9602b", __FILE__), m_reg(0), m_prg_chip(0)
{
}
-nes_sachen_shero_device::nes_sachen_shero_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_shero_device::nes_sachen_shero_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_SACHEN_SHERO, "NES Cart Street Hero PCB", tag, owner, clock, "nes_shero", __FILE__), m_reg(0)
{
}
-//nes_a9746_device::nes_a9746_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+//nes_a9746_device::nes_a9746_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
// : nes_txrom_device(mconfig, NES_A9746, "NES Cart A-9746 PCB", tag, owner, clock, "nes_bmc_a9746", __FILE__)
//{
//}
-nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_txrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_mmc_cmd1(0)
{
}
-nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_fk23c_device::nes_fk23c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_FK23C, "NES Cart FK23C PCB", tag, owner, clock, "nes_fk23c", __FILE__), m_mmc_cmd1(0)
{
}
-nes_fk23ca_device::nes_fk23ca_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_fk23ca_device::nes_fk23ca_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_fk23c_device(mconfig, NES_FK23CA, "NES Cart FK23CA PCB", tag, owner, clock, "nes_fk23ca", __FILE__)
{
}
-nes_s24in1sc03_device::nes_s24in1sc03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_s24in1sc03_device::nes_s24in1sc03_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_S24IN1SC03, "NES Cart Super 24 in 1 SC-03 PCB", tag, owner, clock, "nes_s24in1c03", __FILE__)
{
}
-nes_bmc_15in1_device::nes_bmc_15in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_15in1_device::nes_bmc_15in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_BMC_15IN1, "NES Cart BMC 15 in 1 PCB", tag, owner, clock, "nes_bmc_15in1", __FILE__)
{
}
-nes_bmc_sbig7_device::nes_bmc_sbig7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_sbig7_device::nes_bmc_sbig7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_BMC_SBIG7, "NES Cart BMC Super BIG 7 in 1 PCB", tag, owner, clock, "nes_bmc_sbit7", __FILE__)
{
}
-nes_bmc_hik8_device::nes_bmc_hik8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_hik8_device::nes_bmc_hik8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_BMC_HIK8, "NES Cart BMC Super HIK 8 in 1 PCB", tag, owner, clock, "nes_bmc_hik8", __FILE__), m_count(0)
{
}
-nes_bmc_hik4_device::nes_bmc_hik4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_hik4_device::nes_bmc_hik4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_BMC_HIK4, "NES Cart BMC Super HIK 4 in 1 PCB", tag, owner, clock, "nes_bmc_hik4", __FILE__)
{
}
-nes_bmc_mario7in1_device::nes_bmc_mario7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_mario7in1_device::nes_bmc_mario7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_BMC_MARIO7IN1, "NES Cart BMC Mario 7 in 1 PCB", tag, owner, clock, "nes_bmc_mario7in1", __FILE__), m_reg_written(0)
{
}
-nes_bmc_gold7in1_device::nes_bmc_gold7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_gold7in1_device::nes_bmc_gold7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_BMC_GOLD7IN1, "NES Cart BMC Golden 7 in 1 PCB", tag, owner, clock, "nes_bmc_gold7in1", __FILE__), m_reg_written(0)
{
}
-nes_bmc_gc6in1_device::nes_bmc_gc6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_gc6in1_device::nes_bmc_gc6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_BMC_GC6IN1, "NES Cart BMC Golden Card 6 in 1 PCB", tag, owner, clock, "nes_bmc_gc6in1", __FILE__)
{
}
-nes_bmc_411120c_device::nes_bmc_411120c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_411120c_device::nes_bmc_411120c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_BMC_411120C, "NES Cart BMC 411120C PCB", tag, owner, clock, "nes_bmc_411120c", __FILE__), m_reg(0)
{
}
-nes_bmc_830118c_device::nes_bmc_830118c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_830118c_device::nes_bmc_830118c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_BMC_830118C, "NES Cart BMC 830118C PCB", tag, owner, clock, "nes_bmc_830118c", __FILE__), m_reg(0)
{
}
-nes_pjoy84_device::nes_pjoy84_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_pjoy84_device::nes_pjoy84_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_PJOY84, "NES Cart Powerjoy 84 PCB", tag, owner, clock, "nes_pjoy84", __FILE__)
{
}
-nes_coolboy_device::nes_coolboy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_coolboy_device::nes_coolboy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_COOLBOY, "NES Cart CoolBoy PCB", tag, owner, clock, "nes_coolboy", __FILE__)
{
}
@@ -856,7 +856,7 @@ WRITE8_MEMBER(nes_8237_device::write_l)
WRITE8_MEMBER(nes_8237_device::write_h)
{
- static const UINT8 conv_table[8] = {0, 2, 6, 1, 7, 3, 4, 5};
+ static const uint8_t conv_table[8] = {0, 2, 6, 1, 7, 3, 4, 5};
LOG_MMC(("unl_8237 write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x7000)
@@ -925,7 +925,7 @@ WRITE8_MEMBER(nes_sglionk_device::write_m)
WRITE8_MEMBER(nes_sglionk_device::write_h)
{
- static const UINT8 conv_table[8] = {0, 3, 1, 5, 6, 7, 2, 4};
+ static const uint8_t conv_table[8] = {0, 3, 1, 5, 6, 7, 2, 4};
LOG_MMC(("sglionk write_h, offset: %04x, data: %02x\n", offset, data));
if (offset < 0x6000)
@@ -1013,7 +1013,7 @@ void nes_sgboog_device::set_prg(int prg_base, int prg_mask)
else
{
// here standard MMC3 bankswitch
- UINT8 prg_flip = (m_latch & 0x40) ? 2 : 0;
+ uint8_t prg_flip = (m_latch & 0x40) ? 2 : 0;
prg_cb(0, prg_base | (m_mmc_prg_bank[0 ^ prg_flip] & prg_mask));
prg_cb(1, prg_base | (m_mmc_prg_bank[1] & prg_mask));
@@ -1071,7 +1071,7 @@ WRITE8_MEMBER(nes_sgboog_device::write_m)
WRITE8_MEMBER(nes_sgboog_device::write_h)
{
- static const UINT8 conv_table[8] = {0,2,5,3,6,1,7,4};
+ static const uint8_t conv_table[8] = {0,2,5,3,6,1,7,4};
LOG_MMC(("sgboog write_h, offset: %04x, data: %02x\n", offset, data));
if (m_mode)
@@ -1261,7 +1261,7 @@ void nes_kay_device::prg_cb(int start, int bank)
void nes_kay_device::chr_cb(int start, int bank, int source)
{
- UINT8 chr_page = (m_latch & 0x80) >> 5;
+ uint8_t chr_page = (m_latch & 0x80) >> 5;
if ((start & 0x04) == chr_page)
bank |= 0x100;
@@ -1324,8 +1324,8 @@ WRITE8_MEMBER(nes_h2288_device::write_l)
m_reg[offset & 1] = data;
if (m_reg[0] & 0x40)
{
- UINT8 helper1 = (m_reg[0] & 0x05) | ((m_reg[0] >> 2) & 0x0a);
- UINT8 helper2 = BIT(m_reg[0], 1);
+ uint8_t helper1 = (m_reg[0] & 0x05) | ((m_reg[0] >> 2) & 0x0a);
+ uint8_t helper2 = BIT(m_reg[0], 1);
prg16_89ab(helper1 & ~helper2);
prg16_cdef(helper1 | helper2);
}
@@ -1353,7 +1353,7 @@ READ8_MEMBER(nes_h2288_device::read_l)
WRITE8_MEMBER(nes_h2288_device::write_h)
{
- static const UINT8 conv_table[8] = {0, 3, 1, 5, 6, 7, 2, 4};
+ static const uint8_t conv_table[8] = {0, 3, 1, 5, 6, 7, 2, 4};
LOG_MMC(("h2288 write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x6001)
@@ -1431,7 +1431,7 @@ void nes_txc_tw_device::prg_cb(int start, int bank)
-------------------------------------------------*/
-inline UINT8 kof97_unscramble( UINT8 data )
+inline uint8_t kof97_unscramble( uint8_t data )
{
return ((data >> 1) & 0x01) | ((data >> 4) & 0x02) | ((data << 2) & 0x04) | ((data >> 0) & 0xd8) | ((data << 3) & 0x20);
}
@@ -1477,7 +1477,7 @@ void nes_kof96_device::prg_cb(int start, int bank)
void nes_kof96_device::chr_cb(int start, int bank, int source)
{
- UINT8 chr_page = (m_latch & 0x80) >> 5;
+ uint8_t chr_page = (m_latch & 0x80) >> 5;
if ((start & 0x04) == chr_page)
bank |= 0x100;
@@ -1487,7 +1487,7 @@ void nes_kof96_device::chr_cb(int start, int bank, int source)
WRITE8_MEMBER(nes_kof96_device::write_l)
{
- UINT8 new_bank;
+ uint8_t new_bank;
LOG_MMC(("kof96 write_l, offset: %04x, data: %02x\n", offset, data));
offset += 0x100;
@@ -1593,7 +1593,7 @@ WRITE8_MEMBER(nes_kof96_device::write_h)
-------------------------------------------------*/
-void nes_sf3_device::set_chr(UINT8 chr_source, int chr_base, int chr_mask)
+void nes_sf3_device::set_chr(uint8_t chr_source, int chr_base, int chr_mask)
{
chr4_0(chr_base | ((m_mmc_vrom_bank[0] >> 1) & chr_mask), chr_source);
chr2_4(chr_base | (m_mmc_vrom_bank[1] & chr_mask), chr_source);
@@ -1602,7 +1602,7 @@ void nes_sf3_device::set_chr(UINT8 chr_source, int chr_base, int chr_mask)
WRITE8_MEMBER(nes_sf3_device::write_h)
{
- UINT8 cmd;
+ uint8_t cmd;
LOG_MMC(("sf3 write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x6001)
@@ -1645,7 +1645,7 @@ WRITE8_MEMBER(nes_sf3_device::write_h)
WRITE8_MEMBER(nes_gouder_device::write_l)
{
- static const UINT8 conv_table[256] =
+ static const uint8_t conv_table[256] =
{
0x59,0x59,0x59,0x59,0x59,0x59,0x59,0x59,0x59,0x49,0x19,0x09,0x59,0x49,0x19,0x09,
0x59,0x59,0x59,0x59,0x59,0x59,0x59,0x59,0x51,0x41,0x11,0x01,0x51,0x41,0x11,0x01,
@@ -1831,7 +1831,7 @@ void nes_fk23c_device::chr_cb(int start, int bank, int source)
void nes_fk23c_device::prg_cb(int start, int bank)
{
- UINT8 mask = (0x3f >> (m_reg[0] & 0x03));
+ uint8_t mask = (0x3f >> (m_reg[0] & 0x03));
if ((m_reg[0] & 0x07) < 3)
{
@@ -1955,7 +1955,7 @@ WRITE8_MEMBER(nes_fk23c_device::write_h)
void nes_s24in1sc03_device::prg_cb(int start, int bank)
{
- static const UINT8 masks[8] = {0x3f, 0x1f, 0x0f, 0x01, 0x03, 0x00, 0x00, 0x00};
+ static const uint8_t masks[8] = {0x3f, 0x1f, 0x0f, 0x01, 0x03, 0x00, 0x00, 0x00};
int prg_base = m_reg[1] << 1;
int prg_mask = masks[m_reg[0] & 0x07];
@@ -1965,7 +1965,7 @@ void nes_s24in1sc03_device::prg_cb(int start, int bank)
void nes_s24in1sc03_device::chr_cb(int start, int bank, int source)
{
- UINT8 chr = BIT(m_reg[0], 5) ? CHRRAM : CHRROM;
+ uint8_t chr = BIT(m_reg[0], 5) ? CHRRAM : CHRROM;
int chr_base = (m_reg[2] << 3) & 0xf00;
chr1_x(start, chr_base | bank, chr);
@@ -2039,7 +2039,7 @@ WRITE8_MEMBER(nes_bmc_15in1_device::write_m)
WRITE8_MEMBER(nes_bmc_sbig7_device::write_h)
{
- UINT8 page;
+ uint8_t page;
LOG_MMC(("bmc_sbig7 write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x6001)
@@ -2164,7 +2164,7 @@ WRITE8_MEMBER(nes_bmc_hik4_device::write_m)
WRITE8_MEMBER(nes_bmc_mario7in1_device::write_m)
{
- UINT8 helper1, helper2;
+ uint8_t helper1, helper2;
LOG_MMC(("bmc_mario7in1 write_m, offset: %04x, data: %02x\n", offset, data));
/* mid writes only work when WRAM is enabled. not sure if I should
@@ -2206,7 +2206,7 @@ WRITE8_MEMBER(nes_bmc_mario7in1_device::write_m)
WRITE8_MEMBER(nes_bmc_gold7in1_device::write_m)
{
- UINT8 helper1, helper2;
+ uint8_t helper1, helper2;
LOG_MMC(("bmc_gold7in1 write_m, offset: %04x, data: %02x\n", offset, data));
if ((m_wram_protect & 0x80) && !m_reg_written)
@@ -2267,7 +2267,7 @@ void nes_bmc_gc6in1_device::chr_cb(int start, int bank, int source)
WRITE8_MEMBER(nes_bmc_gc6in1_device::write_l)
{
- UINT8 bank;
+ uint8_t bank;
LOG_MMC(("bmc_gc6in1 write_l, offset: %04x, data: %02x\n", offset, data));
offset += 0x100;
@@ -2296,8 +2296,8 @@ WRITE8_MEMBER(nes_bmc_gc6in1_device::write_l)
WRITE8_MEMBER(nes_bmc_gc6in1_device::write_h)
{
- UINT8 cmd;
- static const UINT8 conv_table[8] = {0, 6, 3, 7, 5, 2, 4, 1};
+ uint8_t cmd;
+ static const uint8_t conv_table[8] = {0, 6, 3, 7, 5, 2, 4, 1};
LOG_MMC(("bmc_gc6in1 write_h, offset: %04x, data: %02x\n", offset, data));
if (!m_reg[2])
@@ -2442,7 +2442,7 @@ WRITE8_MEMBER(nes_bmc_830118c_device::write_m)
void nes_pjoy84_device::prg_cb(int start, int bank)
{
- UINT8 flip = (m_latch & 0x40) ? 2 : 0;
+ uint8_t flip = (m_latch & 0x40) ? 2 : 0;
if (!(m_reg[3] & 0x03))
prg8_x(start, bank);
@@ -2563,9 +2563,9 @@ void nes_a9746_device::pcb_reset()
mmc3_common_initialize(0x7f, 0xff, 0);
}
-void nes_a9746_device::update_banks(UINT8 value)
+void nes_a9746_device::update_banks(uint8_t value)
{
- UINT8 bank = BITSWAP8(value & 0x3c,7,6,0,1,2,3,4,5);
+ uint8_t bank = BITSWAP8(value & 0x3c,7,6,0,1,2,3,4,5);
switch (m_reg[0])
{
diff --git a/src/devices/bus/nes/mmc3_clones.h b/src/devices/bus/nes/mmc3_clones.h
index e6878d9d461..d8b6327d518 100644
--- a/src/devices/bus/nes/mmc3_clones.h
+++ b/src/devices/bus/nes/mmc3_clones.h
@@ -12,7 +12,7 @@ class nes_nitra_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -25,7 +25,7 @@ class nes_ks7057_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_ks7057_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ks7057_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -38,7 +38,7 @@ class nes_sbros11_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -51,7 +51,7 @@ class nes_malisb_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -66,7 +66,7 @@ class nes_family4646_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_family4646_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_family4646_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_m) override;
@@ -81,7 +81,7 @@ class nes_pikay2k_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_pikay2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_pikay2k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -92,7 +92,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg[2];
+ uint8_t m_reg[2];
};
@@ -102,7 +102,7 @@ class nes_8237_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_8237_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_8237_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -114,7 +114,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg[3];
+ uint8_t m_reg[3];
int m_cd_enable;
};
@@ -125,7 +125,7 @@ class nes_sglionk_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_sglionk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sglionk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -135,7 +135,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg;
+ uint8_t m_reg;
int m_reg_enabled;
};
@@ -146,7 +146,7 @@ class nes_sgboog_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_sgboog_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sgboog_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -160,8 +160,8 @@ public:
private:
virtual void set_prg(int prg_base, int prg_mask) override;
- UINT8 m_reg[3];
- UINT8 m_mode;
+ uint8_t m_reg[3];
+ uint8_t m_mode;
};
@@ -171,7 +171,7 @@ class nes_kasing_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_kasing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_kasing_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -181,7 +181,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg;
+ uint8_t m_reg;
};
@@ -191,7 +191,7 @@ class nes_kay_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_kay_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_kay_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -205,8 +205,8 @@ public:
private:
void update_regs();
- UINT8 m_reg[8];
- UINT8 m_low_reg;
+ uint8_t m_reg[8];
+ uint8_t m_low_reg;
};
@@ -216,7 +216,7 @@ class nes_h2288_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_h2288_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_h2288_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -228,7 +228,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg[2]; // reg 1 is unused?
+ uint8_t m_reg[2]; // reg 1 is unused?
};
@@ -238,7 +238,7 @@ class nes_6035052_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_6035052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_6035052_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -252,7 +252,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_prot;
+ uint8_t m_prot;
};
@@ -262,7 +262,7 @@ class nes_txc_tw_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_txc_tw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_txc_tw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_l) override;
@@ -277,7 +277,7 @@ class nes_kof97_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_kof97_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_kof97_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -290,7 +290,7 @@ class nes_kof96_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_kof96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_kof96_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -303,7 +303,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg[4];
+ uint8_t m_reg[4];
};
@@ -313,13 +313,13 @@ class nes_sf3_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_sf3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sf3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
protected:
- virtual void set_chr(UINT8 chr, int chr_base, int chr_mask) override;
+ virtual void set_chr(uint8_t chr, int chr_base, int chr_mask) override;
};
@@ -329,7 +329,7 @@ class nes_gouder_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_gouder_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_gouder_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -340,7 +340,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg[5];
+ uint8_t m_reg[5];
};
@@ -350,7 +350,7 @@ class nes_sa9602b_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_sa9602b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sa9602b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -360,7 +360,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg;
+ uint8_t m_reg;
int m_prg_chip;
};
@@ -371,7 +371,7 @@ class nes_sachen_shero_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_sachen_shero_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_shero_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -382,7 +382,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg;
+ uint8_t m_reg;
};
#ifdef UNUSED_FUNCTION
@@ -392,7 +392,7 @@ class nes_a9746_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_a9746_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_a9746_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -401,8 +401,8 @@ public:
virtual void pcb_reset();
private:
- void update_banks(UINT8 value);
- UINT8 m_reg[3];
+ void update_banks(uint8_t value);
+ uint8_t m_reg[3];
};
#endif
@@ -413,8 +413,8 @@ class nes_fk23c_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_fk23c_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_fk23c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fk23c_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_fk23c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -428,8 +428,8 @@ public:
protected:
void fk23c_set_prg();
void fk23c_set_chr();
- UINT8 m_reg[8];
- UINT8 m_mmc_cmd1;
+ uint8_t m_reg[8];
+ uint8_t m_mmc_cmd1;
};
@@ -439,7 +439,7 @@ class nes_fk23ca_device : public nes_fk23c_device
{
public:
// construction/destruction
- nes_fk23ca_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fk23ca_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void pcb_reset() override;
};
@@ -451,7 +451,7 @@ class nes_s24in1sc03_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_s24in1sc03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_s24in1sc03_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -462,7 +462,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg[3];
+ uint8_t m_reg[3];
};
@@ -472,7 +472,7 @@ class nes_bmc_15in1_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_15in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_15in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_m) override;
@@ -487,7 +487,7 @@ class nes_bmc_sbig7_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_sbig7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_sbig7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -502,7 +502,7 @@ class nes_bmc_hik8_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_hik8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_hik8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -511,8 +511,8 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg[4];
- UINT8 m_count;
+ uint8_t m_reg[4];
+ uint8_t m_count;
};
@@ -522,7 +522,7 @@ class nes_bmc_hik4_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_hik4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_hik4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_m) override;
@@ -537,7 +537,7 @@ class nes_bmc_mario7in1_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_mario7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_mario7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -546,7 +546,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg_written;
+ uint8_t m_reg_written;
};
@@ -556,7 +556,7 @@ class nes_bmc_gold7in1_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_gold7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_gold7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -565,7 +565,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg_written;
+ uint8_t m_reg_written;
};
@@ -575,7 +575,7 @@ class nes_bmc_gc6in1_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_gc6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_gc6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -587,7 +587,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg[4];
+ uint8_t m_reg[4];
};
@@ -597,7 +597,7 @@ class nes_bmc_411120c_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_411120c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_411120c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -608,7 +608,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg;
+ uint8_t m_reg;
};
@@ -618,7 +618,7 @@ class nes_bmc_830118c_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_bmc_830118c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_830118c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -629,7 +629,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg;
+ uint8_t m_reg;
};
@@ -639,7 +639,7 @@ class nes_pjoy84_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_pjoy84_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_pjoy84_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -651,7 +651,7 @@ public:
private:
inline void set_base_mask();
- UINT8 m_reg[4];
+ uint8_t m_reg[4];
};
// ======================> nes_coolboy_device
@@ -660,7 +660,7 @@ class nes_coolboy_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_coolboy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_coolboy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
// virtual void device_start() override;
@@ -672,7 +672,7 @@ public:
private:
// inline void set_base_mask();
- UINT8 m_reg[4];
+ uint8_t m_reg[4];
};
diff --git a/src/devices/bus/nes/mmc5.cpp b/src/devices/bus/nes/mmc5.cpp
index 7c114ca0e77..f93882ff3c6 100644
--- a/src/devices/bus/nes/mmc5.cpp
+++ b/src/devices/bus/nes/mmc5.cpp
@@ -44,7 +44,7 @@ static const int m_mmc5_attrib[4] = {0x00, 0x55, 0xaa, 0xff};
const device_type NES_EXROM = &device_creator<nes_exrom_device>;
-nes_exrom_device::nes_exrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_exrom_device::nes_exrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_EXROM, "NES Cart ExROM (MMC-5) PCB", tag, owner, clock, "nes_exrom", __FILE__), m_irq_count(0),
m_irq_status(0), m_irq_enable(0), m_mult1(0), m_mult2(0), m_mmc5_scanline(0), m_vrom_page_a(0), m_vrom_page_b(0), m_floodtile(0), m_floodattr(0),
m_prg_mode(0), m_chr_mode(0), m_wram_protect_1(0), m_wram_protect_2(0), m_exram_control(0), m_wram_base(0), m_last_chr(0), m_ex1_chr(0),
@@ -359,9 +359,9 @@ WRITE8_MEMBER(nes_exrom_device::nt_w)
}
}
-inline UINT8 nes_exrom_device::base_chr_r(int bank, UINT32 offset)
+inline uint8_t nes_exrom_device::base_chr_r(int bank, uint32_t offset)
{
- UINT32 helper = 0;
+ uint32_t helper = 0;
switch (m_chr_mode)
{
@@ -385,15 +385,15 @@ inline UINT8 nes_exrom_device::base_chr_r(int bank, UINT32 offset)
return m_vrom[helper & (m_vrom_size - 1)];
}
-inline UINT8 nes_exrom_device::split_chr_r(UINT32 offset)
+inline uint8_t nes_exrom_device::split_chr_r(uint32_t offset)
{
- UINT32 helper = (m_split_bank * 0x1000) + (offset & 0x3f8) + (m_split_yst & 7);
+ uint32_t helper = (m_split_bank * 0x1000) + (offset & 0x3f8) + (m_split_yst & 7);
return m_vrom[helper & (m_vrom_size - 1)];
}
-inline UINT8 nes_exrom_device::bg_ex1_chr_r(UINT32 offset)
+inline uint8_t nes_exrom_device::bg_ex1_chr_r(uint32_t offset)
{
- UINT32 helper = (m_ex1_bank * 0x1000) + (offset & 0xfff);
+ uint32_t helper = (m_ex1_bank * 0x1000) + (offset & 0xfff);
return m_vrom[helper & (m_vrom_size - 1)];
}
diff --git a/src/devices/bus/nes/mmc5.h b/src/devices/bus/nes/mmc5.h
index 44569d3d561..1ca0dd1cd88 100644
--- a/src/devices/bus/nes/mmc5.h
+++ b/src/devices/bus/nes/mmc5.h
@@ -12,7 +12,7 @@ class nes_exrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_exrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_exrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -34,13 +34,13 @@ protected:
void set_mirror(int page, int src);
void update_prg();
- inline UINT8 base_chr_r(int bank, UINT32 offset);
- inline UINT8 split_chr_r(UINT32 offset);
- inline UINT8 bg_ex1_chr_r(UINT32 offset);
+ inline uint8_t base_chr_r(int bank, uint32_t offset);
+ inline uint8_t split_chr_r(uint32_t offset);
+ inline uint8_t bg_ex1_chr_r(uint32_t offset);
inline bool in_split();
- UINT16 m_irq_count;
- UINT8 m_irq_status;
+ uint16_t m_irq_count;
+ uint8_t m_irq_status;
int m_irq_enable;
int m_mult1, m_mult2;
@@ -48,7 +48,7 @@ protected:
int m_mmc5_scanline;
int m_vrom_page_a;
int m_vrom_page_b;
- UINT16 m_vrom_bank[12]; // MMC5 has 10bit wide VROM regs!
+ uint16_t m_vrom_bank[12]; // MMC5 has 10bit wide VROM regs!
int m_floodtile;
int m_floodattr;
@@ -60,27 +60,27 @@ protected:
int m_exram_control; // $5104
int m_wram_base; // $5113
- UINT8 m_last_chr;
- UINT8 m_ex1_chr;
- UINT8 m_split_chr;
- UINT8 m_prg_regs[4];
- UINT8 m_prg_ram_mapped[4];
+ uint8_t m_last_chr;
+ uint8_t m_ex1_chr;
+ uint8_t m_split_chr;
+ uint8_t m_prg_regs[4];
+ uint8_t m_prg_ram_mapped[4];
- UINT8 m_ex1_bank;
+ uint8_t m_ex1_bank;
- UINT8 m_high_chr; // $5130
+ uint8_t m_high_chr; // $5130
- UINT8 m_split_scr; // $5200
- UINT8 m_split_rev; // $5200
- UINT8 m_split_ctrl; // $5200
- UINT8 m_split_yst; // $5201
- UINT8 m_split_bank; // $5202
+ uint8_t m_split_scr; // $5200
+ uint8_t m_split_rev; // $5200
+ uint8_t m_split_ctrl; // $5200
+ uint8_t m_split_yst; // $5201
+ uint8_t m_split_bank; // $5202
int m_vcount;
// MMC-5 contains 1K of internal ram
- UINT8 m_exram[0x400];
+ uint8_t m_exram[0x400];
- UINT8 m_ram_hi_banks[4];
+ uint8_t m_ram_hi_banks[4];
// int m_nes_vram_sprite[8];
};
diff --git a/src/devices/bus/nes/multigame.cpp b/src/devices/bus/nes/multigame.cpp
index bd905a11de5..52ae1baccbe 100644
--- a/src/devices/bus/nes/multigame.cpp
+++ b/src/devices/bus/nes/multigame.cpp
@@ -77,237 +77,237 @@ const device_type NES_BMC_4IN1RESET = &device_creator<nes_bmc_4in1reset_device>;
const device_type NES_BMC_42IN1RESET = &device_creator<nes_bmc_42in1reset_device>;
-nes_action52_device::nes_action52_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_action52_device::nes_action52_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_ACTION52, "NES Cart Action 52 PCB", tag, owner, clock, "nes_action52", __FILE__)
{
}
-nes_caltron_device::nes_caltron_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_caltron_device::nes_caltron_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_CALTRON6IN1, "NES Cart Caltron 6 in 1 PCB", tag, owner, clock, "nes_caltron", __FILE__), m_latch(0)
{
}
-nes_rumblestat_device::nes_rumblestat_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_rumblestat_device::nes_rumblestat_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_RUMBLESTATION, "NES Cart Rumblestation PCB", tag, owner, clock, "nes_rumblestat", __FILE__), m_prg(0), m_chr(0)
{
}
-nes_svision16_device::nes_svision16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_svision16_device::nes_svision16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SVISION16, "NES Cart Supervision 16 in 1 PCB", tag, owner, clock, "nes_svision16", __FILE__), m_latch1(0), m_latch2(0)
{
}
-nes_n625092_device::nes_n625092_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_n625092_device::nes_n625092_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_N625092, "NES Cart N625092 PCB", tag, owner, clock, "nes_n625092", __FILE__), m_latch1(0), m_latch2(0)
{
}
-nes_a65as_device::nes_a65as_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_a65as_device::nes_a65as_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_A65AS, "NES Cart A65AS PCB", tag, owner, clock, "nes_a65as", __FILE__)
{
}
-nes_t262_device::nes_t262_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_t262_device::nes_t262_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_T262, "NES Cart T-262 PCB", tag, owner, clock, "nes_t262", __FILE__), m_latch1(0), m_latch2(0)
{
}
-nes_novel1_device::nes_novel1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_novel1_device::nes_novel1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_NOVEL1, "NES Cart Novel Diamond Type 1 PCB", tag, owner, clock, "nes_novel1", __FILE__)
{
}
-nes_novel2_device::nes_novel2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_novel2_device::nes_novel2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_NOVEL2, "NES Cart Novel Diamond Type 2 PCB", tag, owner, clock, "nes_novel2", __FILE__)
{
}
-nes_studyngame_device::nes_studyngame_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_studyngame_device::nes_studyngame_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_STUDYNGAME, "NES Cart Study n Game PCB", tag, owner, clock, "nes_studyngame", __FILE__)
{
}
-nes_sgun20in1_device::nes_sgun20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sgun20in1_device::nes_sgun20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SUPERGUN20IN1, "NES Cart Supergun 20 in 1 PCB", tag, owner, clock, "nes_sgun20in1", __FILE__)
{
}
-nes_vt5201_device::nes_vt5201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_vt5201_device::nes_vt5201_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_VT5201, "NES Cart VT5201 PCB", tag, owner, clock, "nes_vt5201", __FILE__), m_latch(0), m_dipsetting(0)
{
}
-nes_810544c_device::nes_810544c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_810544c_device::nes_810544c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_810544C, "NES Cart 810544-C-A1 PCB", tag, owner, clock, "nes_810544c", __FILE__)
{
}
-nes_ntd03_device::nes_ntd03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ntd03_device::nes_ntd03_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_NTD03, "NES Cart NTD-03 PCB", tag, owner, clock, "nes_ntd03", __FILE__)
{
}
-nes_bmc_gb63_device::nes_bmc_gb63_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_gb63_device::nes_bmc_gb63_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_GB63, "NES Cart BMC Ghostbusters 63 in 1 PCB", tag, owner, clock, "nes_bmc_gb63", __FILE__), m_latch(0), m_dipsetting(0), m_vram_disable(0)
{
}
-nes_bmc_gka_device::nes_bmc_gka_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_gka_device::nes_bmc_gka_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_GKA, "NES Cart BMC GK-A PCB", tag, owner, clock, "nes_bmc_gka", __FILE__), m_latch1(0), m_latch2(0)
{
}
-nes_bmc_gkb_device::nes_bmc_gkb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_gkb_device::nes_bmc_gkb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_GKB, "NES Cart BMC GK-B PCB", tag, owner, clock, "nes_bmc_gkb", __FILE__)
{
}
-nes_bmc_ws_device::nes_bmc_ws_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_ws_device::nes_bmc_ws_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_WS, "NES Cart BMC WS PCB", tag, owner, clock, "nes_bmc_ws", __FILE__), m_latch(0)
{
}
-nes_bmc_11160_device::nes_bmc_11160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_11160_device::nes_bmc_11160_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_11160, "NES Cart BMC-11160 PCB", tag, owner, clock, "nes_bmc_11160", __FILE__)
{
}
-nes_bmc_g146_device::nes_bmc_g146_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_g146_device::nes_bmc_g146_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_G146, "NES Cart BMC-G-146 PCB", tag, owner, clock, "nes_bmc_g146", __FILE__)
{
}
-nes_bmc_8157_device::nes_bmc_8157_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_8157_device::nes_bmc_8157_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_8157, "NES Cart BMC-8157 PCB", tag, owner, clock, "nes_bmc_8157", __FILE__)
{
}
-nes_bmc_hik300_device::nes_bmc_hik300_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_hik300_device::nes_bmc_hik300_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_HIK300, "NES Cart BMC HIK 300 in 1 PCB", tag, owner, clock, "nes_bmc_hik300", __FILE__)
{
}
-nes_bmc_s700_device::nes_bmc_s700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_s700_device::nes_bmc_s700_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_S700, "NES Cart BMC Super 700 in 1 PCB", tag, owner, clock, "nes_bmc_s700", __FILE__)
{
}
-nes_bmc_ball11_device::nes_bmc_ball11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_ball11_device::nes_bmc_ball11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_BALL11, "NES Cart BMC Ball 11 in 1 PCB", tag, owner, clock, "nes_bmc_ball11", __FILE__)
{
}
-nes_bmc_22games_device::nes_bmc_22games_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_22games_device::nes_bmc_22games_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_22GAMES, "NES Cart BMC 22 Games PCB", tag, owner, clock, "nes_bmc_22games", __FILE__)
{
}
-nes_bmc_64y2k_device::nes_bmc_64y2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_64y2k_device::nes_bmc_64y2k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_64Y2K, "NES Cart BMC 64 in 1 Y2K PCB", tag, owner, clock, "nes_bmc_64y2k", __FILE__)
{
}
-nes_bmc_12in1_device::nes_bmc_12in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_12in1_device::nes_bmc_12in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_12IN1, "NES Cart BMC 12 in 1 PCB", tag, owner, clock, "nes_bmc_12in1", __FILE__)
{
}
-nes_bmc_20in1_device::nes_bmc_20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_20in1_device::nes_bmc_20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_20IN1, "NES Cart BMC 20 in 1 PCB", tag, owner, clock, "nes_bmc_20in1", __FILE__)
{
}
-nes_bmc_21in1_device::nes_bmc_21in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_21in1_device::nes_bmc_21in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_21IN1, "NES Cart BMC 21 in 1 PCB", tag, owner, clock, "nes_bmc_21in1", __FILE__)
{
}
-nes_bmc_31in1_device::nes_bmc_31in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_31in1_device::nes_bmc_31in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_31IN1, "NES Cart BMC 31 in 1 PCB", tag, owner, clock, "nes_bmc_31in1", __FILE__)
{
}
-nes_bmc_35in1_device::nes_bmc_35in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_35in1_device::nes_bmc_35in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_35IN1, "NES Cart BMC 35 in 1 PCB", tag, owner, clock, "nes_bmc_35in1", __FILE__)
{
}
-nes_bmc_36in1_device::nes_bmc_36in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_36in1_device::nes_bmc_36in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_36IN1, "NES Cart BMC 36 in 1 PCB", tag, owner, clock, "nes_bmc_36in1", __FILE__)
{
}
-nes_bmc_64in1_device::nes_bmc_64in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_64in1_device::nes_bmc_64in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_64IN1, "NES Cart BMC 64 in 1 PCB", tag, owner, clock, "nes_bmc_64in1", __FILE__)
{
}
-nes_bmc_70in1_device::nes_bmc_70in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_70in1_device::nes_bmc_70in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_70IN1, "NES Cart BMC 70 in 1 PCB", tag, owner, clock, "nes_bmc_70in1", __FILE__), m_mode(0)
{
}
-nes_bmc_72in1_device::nes_bmc_72in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_72in1_device::nes_bmc_72in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_72IN1, "NES Cart BMC 72 in 1 PCB", tag, owner, clock, "nes_bmc_72in1", __FILE__)
{
}
-nes_bmc_76in1_device::nes_bmc_76in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_76in1_device::nes_bmc_76in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_76IN1, "NES Cart BMC 76 in 1 PCB", tag, owner, clock, "nes_bmc_76in1", __FILE__), m_latch1(0), m_latch2(0)
{
}
-nes_bmc_110in1_device::nes_bmc_110in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_110in1_device::nes_bmc_110in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_110IN1, "NES Cart BMC 110 in 1 PCB", tag, owner, clock, "nes_bmc_110in1", __FILE__)
{
}
-nes_bmc_150in1_device::nes_bmc_150in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_150in1_device::nes_bmc_150in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_150IN1, "NES Cart BMC 150 in 1 PCB", tag, owner, clock, "nes_bmc_150in1", __FILE__)
{
}
-nes_bmc_190in1_device::nes_bmc_190in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_190in1_device::nes_bmc_190in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_190IN1, "NES Cart BMC 190 in 1 PCB", tag, owner, clock, "nes_bmc_190in1", __FILE__)
{
}
-nes_bmc_800in1_device::nes_bmc_800in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_800in1_device::nes_bmc_800in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_800IN1, "NES Cart BMC 800 in 1 PCB", tag, owner, clock, "nes_bmc_800in1", __FILE__), m_mode(0)
{
}
-nes_bmc_1200in1_device::nes_bmc_1200in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_1200in1_device::nes_bmc_1200in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_1200IN1, "NES Cart BMC 1200 in 1 PCB", tag, owner, clock, "nes_bmc_1200in1", __FILE__), m_vram_protect(0)
{
}
-nes_bmc_gold150_device::nes_bmc_gold150_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_gold150_device::nes_bmc_gold150_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_GOLD150, "NES Cart BMC Golden 150 in 1 PCB", tag, owner, clock, "nes_bmc_gold150", __FILE__), m_latch(0)
{
}
-nes_bmc_gold260_device::nes_bmc_gold260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_gold260_device::nes_bmc_gold260_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_GOLD260, "NES Cart BMC Golden 260 in 1 PCB", tag, owner, clock, "nes_bmc_gold260", __FILE__)
{
}
-nes_bmc_ch001_device::nes_bmc_ch001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_ch001_device::nes_bmc_ch001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_CH001, "NES Cart BMC CH-001 PCB", tag, owner, clock, "nes_bmc_ch001", __FILE__), m_latch(0)
{
}
-nes_bmc_super22_device::nes_bmc_super22_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_super22_device::nes_bmc_super22_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_SUPER22, "NES Cart BMC Super 22 Games PCB", tag, owner, clock, "nes_bmc_super22", __FILE__)
{
}
-nes_bmc_4in1reset_device::nes_bmc_4in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_4in1reset_device::nes_bmc_4in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_4IN1RESET, "NES Cart BMC 4 in 1 (Reset Based) PCB", tag, owner, clock, "nes_bmc_4in1reset", __FILE__), m_latch(0)
{
}
-nes_bmc_42in1reset_device::nes_bmc_42in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bmc_42in1reset_device::nes_bmc_42in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BMC_42IN1RESET, "NES Cart BMC 42 in 1 (Reset Based) PCB", tag, owner, clock, "nes_bmc_42in1reset", __FILE__), m_latch(0)
{
}
@@ -1018,7 +1018,7 @@ void nes_bmc_42in1reset_device::pcb_reset()
WRITE8_MEMBER(nes_action52_device::write_h)
{
- UINT8 pmode = offset & 0x20;
+ uint8_t pmode = offset & 0x20;
int pbank = (offset & 0x1fc0) >> 6;
int cbank = (data & 0x03) | ((offset & 0x0f) << 2);
LOG_MMC(("ae_act52_w, offset: %04x, data: %02x\n", offset, data));
@@ -1164,9 +1164,9 @@ WRITE8_MEMBER(nes_svision16_device::write_h)
-------------------------------------------------*/
-void nes_n625092_device::set_prg(UINT8 reg1, UINT8 reg2)
+void nes_n625092_device::set_prg(uint8_t reg1, uint8_t reg2)
{
- UINT8 helper1, helper2;
+ uint8_t helper1, helper2;
helper1 = !(reg1 & 0x01) ? reg2 : (reg1 & 0x80) ? reg2 : (reg2 & 0x06) | 0x00;
helper2 = !(reg1 & 0x01) ? reg2 : (reg1 & 0x80) ? 0x07 : (reg2 & 0x06) | 0x01;
@@ -1215,7 +1215,7 @@ WRITE8_MEMBER(nes_n625092_device::write_h)
WRITE8_MEMBER(nes_a65as_device::write_h)
{
- UINT8 helper = (data & 0x30) >> 1;
+ uint8_t helper = (data & 0x30) >> 1;
LOG_MMC(("a65as write_h, offset: %04x, data: %02x\n", offset, data));
if (data & 0x80)
@@ -1244,7 +1244,7 @@ WRITE8_MEMBER(nes_a65as_device::write_h)
WRITE8_MEMBER(nes_t262_device::write_h)
{
- UINT8 mmc_helper;
+ uint8_t mmc_helper;
LOG_MMC(("t262 write_h, offset: %04x, data: %02x\n", offset, data));
if (m_latch2 || offset == 0)
@@ -1385,7 +1385,7 @@ READ8_MEMBER(nes_vt5201_device::read_h)
WRITE8_MEMBER(nes_810544c_device::write_h)
{
- UINT8 bank = (offset >> 7);
+ uint8_t bank = (offset >> 7);
LOG_MMC(("810544 write_h, offset: %04x, data: %02x\n", offset, data));
if (!BIT(offset, 6))
@@ -1409,8 +1409,8 @@ WRITE8_MEMBER(nes_810544c_device::write_h)
WRITE8_MEMBER(nes_ntd03_device::write_h)
{
- UINT8 pbank = (offset >> 10) & 0x1e;
- UINT8 cbank = ((offset & 0x300) >> 5) | (offset & 0x07);
+ uint8_t pbank = (offset >> 10) & 0x1e;
+ uint8_t cbank = ((offset & 0x300) >> 5) | (offset & 0x07);
LOG_MMC(("ntd03 write_h, offset: %04x, data: %02x\n", offset, data));
if (BIT(offset, 7))
@@ -1531,7 +1531,7 @@ WRITE8_MEMBER(nes_bmc_gka_device::write_h)
WRITE8_MEMBER(nes_bmc_gkb_device::write_h)
{
- UINT8 bank = (offset & 0x40) ? 0 : 1;
+ uint8_t bank = (offset & 0x40) ? 0 : 1;
LOG_MMC(("bmc_gkb write_h, offset: %04x, data: %02x\n", offset, data));
prg16_89ab(offset & ~bank);
@@ -1553,7 +1553,7 @@ WRITE8_MEMBER(nes_bmc_gkb_device::write_h)
WRITE8_MEMBER(nes_bmc_ws_device::write_m)
{
- UINT8 mmc_helper;
+ uint8_t mmc_helper;
LOG_MMC(("bmc_ws write_m, offset: %04x, data: %02x\n", offset, data));
if (offset < 0x1000)
@@ -1658,7 +1658,7 @@ READ8_MEMBER(nes_bmc_8157_device::read_h)
LOG_MMC(("bmc_8157 read_h, offset: %04x\n", offset));
// m_dipsetting = ioport("CARTDIPS")->read();
-// UINT8 val = hi_access_rom(offset);
+// uint8_t val = hi_access_rom(offset);
// return val | m_noise; // the first write_h sets m_noise=0xff or 0 depending on dsw
return hi_access_rom(offset);
@@ -1829,8 +1829,8 @@ WRITE8_MEMBER(nes_bmc_22games_device::write_h)
void nes_bmc_64y2k_device::set_prg()
{
- UINT8 helper1 = (m_reg[1] & 0x1f);
- UINT8 helper2 = (helper1 << 1) | ((m_reg[1] & 0x40) >> 6);
+ uint8_t helper1 = (m_reg[1] & 0x1f);
+ uint8_t helper2 = (helper1 << 1) | ((m_reg[1] & 0x40) >> 6);
if (m_reg[0] & 0x80)
{
@@ -2212,8 +2212,8 @@ WRITE8_MEMBER(nes_bmc_76in1_device::write_h)
WRITE8_MEMBER(nes_bmc_110in1_device::write_h)
{
- UINT8 helper1 = (offset >> 12) ? 0 : 1;
- UINT8 helper2 = ((offset >> 8) & 0x40) | ((offset >> 6) & 0x3f);
+ uint8_t helper1 = (offset >> 12) ? 0 : 1;
+ uint8_t helper2 = ((offset >> 8) & 0x40) | ((offset >> 6) & 0x3f);
LOG_MMC(("bmc_110in1 write_h, offset: %04x, data: %02x\n", offset, data));
diff --git a/src/devices/bus/nes/multigame.h b/src/devices/bus/nes/multigame.h
index e9ecced4a7a..65c803910e8 100644
--- a/src/devices/bus/nes/multigame.h
+++ b/src/devices/bus/nes/multigame.h
@@ -12,7 +12,7 @@ class nes_action52_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_action52_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_action52_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_caltron_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_caltron_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_caltron_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -38,7 +38,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
};
@@ -48,7 +48,7 @@ class nes_rumblestat_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_rumblestat_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_rumblestat_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -58,7 +58,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_prg, m_chr;
+ uint8_t m_prg, m_chr;
};
@@ -68,7 +68,7 @@ class nes_svision16_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_svision16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_svision16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -80,7 +80,7 @@ public:
private:
void update_prg();
- UINT8 m_latch1, m_latch2;
+ uint8_t m_latch1, m_latch2;
};
@@ -90,7 +90,7 @@ class nes_n625092_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_n625092_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_n625092_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -99,8 +99,8 @@ public:
virtual void pcb_reset() override;
private:
- void set_prg(UINT8 reg1, UINT8 reg2);
- UINT8 m_latch1, m_latch2;
+ void set_prg(uint8_t reg1, uint8_t reg2);
+ uint8_t m_latch1, m_latch2;
};
@@ -110,7 +110,7 @@ class nes_a65as_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_a65as_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_a65as_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -126,7 +126,7 @@ class nes_t262_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_t262_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_t262_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -135,7 +135,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch1, m_latch2;
+ uint8_t m_latch1, m_latch2;
};
@@ -145,7 +145,7 @@ class nes_novel1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_novel1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_novel1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -161,7 +161,7 @@ class nes_novel2_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_novel2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_novel2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -177,7 +177,7 @@ class nes_studyngame_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_studyngame_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_studyngame_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -193,7 +193,7 @@ class nes_sgun20in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sgun20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sgun20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -209,7 +209,7 @@ class nes_vt5201_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_vt5201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_vt5201_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -219,7 +219,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch, m_dipsetting;
+ uint8_t m_latch, m_dipsetting;
};
@@ -229,7 +229,7 @@ class nes_810544c_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_810544c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_810544c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -245,7 +245,7 @@ class nes_ntd03_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ntd03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ntd03_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -261,7 +261,7 @@ class nes_bmc_gb63_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_gb63_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_gb63_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -273,8 +273,8 @@ public:
private:
void update_banks();
- UINT8 m_latch, m_dipsetting;
- UINT8 m_reg[2];
+ uint8_t m_latch, m_dipsetting;
+ uint8_t m_reg[2];
int m_vram_disable;
};
@@ -284,7 +284,7 @@ class nes_bmc_gka_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_gka_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_gka_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -293,7 +293,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch1, m_latch2;
+ uint8_t m_latch1, m_latch2;
};
@@ -303,7 +303,7 @@ class nes_bmc_gkb_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_gkb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_gkb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -319,7 +319,7 @@ class nes_bmc_ws_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_ws_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_ws_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -328,7 +328,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
};
@@ -338,7 +338,7 @@ class nes_bmc_11160_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_11160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_11160_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -354,7 +354,7 @@ class nes_bmc_g146_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_g146_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_g146_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -370,7 +370,7 @@ class nes_bmc_8157_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_8157_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_8157_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -387,7 +387,7 @@ class nes_bmc_hik300_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_hik300_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_hik300_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -403,7 +403,7 @@ class nes_bmc_s700_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_s700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_s700_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -419,7 +419,7 @@ class nes_bmc_ball11_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_ball11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_ball11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -430,7 +430,7 @@ public:
private:
void set_banks();
- UINT8 m_reg[2];
+ uint8_t m_reg[2];
};
@@ -440,7 +440,7 @@ class nes_bmc_22games_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_22games_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_22games_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -456,7 +456,7 @@ class nes_bmc_64y2k_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_64y2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_64y2k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -467,7 +467,7 @@ public:
private:
void set_prg();
- UINT8 m_reg[4];
+ uint8_t m_reg[4];
};
@@ -477,7 +477,7 @@ class nes_bmc_12in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_12in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_12in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -487,7 +487,7 @@ public:
private:
void update_banks();
- UINT8 m_reg[3];
+ uint8_t m_reg[3];
};
@@ -497,7 +497,7 @@ class nes_bmc_20in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -513,7 +513,7 @@ class nes_bmc_21in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_21in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_21in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -529,7 +529,7 @@ class nes_bmc_31in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_31in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_31in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -545,7 +545,7 @@ class nes_bmc_35in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_35in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_35in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -561,7 +561,7 @@ class nes_bmc_36in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_36in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_36in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -577,7 +577,7 @@ class nes_bmc_64in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_64in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_64in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -593,7 +593,7 @@ class nes_bmc_70in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_70in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_70in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -603,8 +603,8 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_mode;
- UINT8 m_reg[2];
+ uint8_t m_mode;
+ uint8_t m_reg[2];
};
@@ -614,7 +614,7 @@ class nes_bmc_72in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_72in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_72in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -630,7 +630,7 @@ class nes_bmc_76in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_76in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_76in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -639,7 +639,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch1, m_latch2;
+ uint8_t m_latch1, m_latch2;
};
@@ -649,7 +649,7 @@ class nes_bmc_110in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_110in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_110in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -665,7 +665,7 @@ class nes_bmc_150in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_150in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_150in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -681,7 +681,7 @@ class nes_bmc_190in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_190in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_190in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -697,7 +697,7 @@ class nes_bmc_800in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_800in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_800in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -707,8 +707,8 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_mode;
- UINT8 m_reg[2];
+ uint8_t m_mode;
+ uint8_t m_reg[2];
};
@@ -718,7 +718,7 @@ class nes_bmc_1200in1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_1200in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_1200in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -728,7 +728,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_vram_protect;
+ uint8_t m_vram_protect;
};
@@ -738,7 +738,7 @@ class nes_bmc_gold150_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_gold150_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_gold150_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -748,7 +748,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
};
@@ -758,7 +758,7 @@ class nes_bmc_gold260_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_gold260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_gold260_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -774,7 +774,7 @@ class nes_bmc_ch001_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_ch001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_ch001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -784,7 +784,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
};
@@ -794,7 +794,7 @@ class nes_bmc_super22_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_super22_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_super22_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -810,7 +810,7 @@ class nes_bmc_4in1reset_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_4in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_4in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -826,7 +826,7 @@ class nes_bmc_42in1reset_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bmc_42in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bmc_42in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -836,7 +836,7 @@ public:
private:
int m_latch;
- UINT8 m_reg[2];
+ uint8_t m_reg[2];
};
diff --git a/src/devices/bus/nes/namcot.cpp b/src/devices/bus/nes/namcot.cpp
index 2d9bf4bfc69..e65f15906be 100644
--- a/src/devices/bus/nes/namcot.cpp
+++ b/src/devices/bus/nes/namcot.cpp
@@ -49,42 +49,42 @@ const device_type NES_NAMCOT340 = &device_creator<nes_namcot340_device>;
const device_type NES_NAMCOT163 = &device_creator<nes_namcot163_device>;
-nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0)
{
}
-nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_namcot3433_device::nes_namcot3433_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_NAMCOT3433, "NES Cart Namcot 3433 & 3443 / DxROM PCB", tag, owner, clock, "nes_namcot3433", __FILE__), m_latch(0)
{
}
-nes_namcot3446_device::nes_namcot3446_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_namcot3446_device::nes_namcot3446_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_NAMCOT3446, "NES Cart Namcot 3446 PCB", tag, owner, clock, "nes_namcot3446", __FILE__), m_latch(0)
{
}
-nes_namcot3425_device::nes_namcot3425_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_namcot3425_device::nes_namcot3425_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_NAMCOT3425, "NES Cart Namcot 3425 PCB", tag, owner, clock, "nes_namcot3425", __FILE__), m_latch(0)
{
}
-nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_namcot340_device::nes_namcot340_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_NAMCOT175, "NES Cart Namcot 340 PCB", tag, owner, clock, "nes_namcot340", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
-nes_namcot175_device::nes_namcot175_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_namcot175_device::nes_namcot175_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_namcot340_device(mconfig, NES_NAMCOT340, "NES Cart Namcot 175 PCB", tag, owner, clock, "nes_namcot175", __FILE__), m_wram_protect(0)
{
}
-nes_namcot163_device::nes_namcot163_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_namcot163_device::nes_namcot163_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_namcot340_device(mconfig, NES_NAMCOT163, "NES Cart Namcot 163 PCB", tag, owner, clock, "nes_namcot163", __FILE__), m_wram_protect(0), m_latch(0), m_chr_bank(0)
{
}
@@ -338,7 +338,7 @@ WRITE8_MEMBER(nes_namcot3446_device::write_h)
WRITE8_MEMBER(nes_namcot3425_device::write_h)
{
- UINT8 mode;
+ uint8_t mode;
LOG_MMC(("namcot3425 write_h, offset: %04x, data: %02x\n", offset, data));
if (offset >= 0x2000)
return;
@@ -639,7 +639,7 @@ READ8_MEMBER(nes_namcot163_device::read_l)
}
}
-void nes_namcot163_device::set_mirror(UINT8 page, UINT8 data)
+void nes_namcot163_device::set_mirror(uint8_t page, uint8_t data)
{
if (data < 0xe0)
set_nt_page(page, VROM, data, 0);
diff --git a/src/devices/bus/nes/namcot.h b/src/devices/bus/nes/namcot.h
index 6499218a752..bb65a0c8953 100644
--- a/src/devices/bus/nes/namcot.h
+++ b/src/devices/bus/nes/namcot.h
@@ -12,8 +12,8 @@ class nes_namcot3433_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_namcot3433_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_namcot3433_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_namcot3433_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_namcot3433_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -23,7 +23,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
};
@@ -33,7 +33,7 @@ class nes_namcot3446_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_namcot3446_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_namcot3446_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -42,7 +42,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
};
@@ -52,7 +52,7 @@ class nes_namcot3425_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_namcot3425_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_namcot3425_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -61,8 +61,8 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
- UINT8 m_reg[4];
+ uint8_t m_latch;
+ uint8_t m_reg[4];
};
@@ -72,8 +72,8 @@ class nes_namcot340_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_namcot340_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_namcot340_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_namcot340_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_namcot340_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -88,7 +88,7 @@ public:
virtual void pcb_reset() override;
protected:
- UINT16 m_irq_count;
+ uint16_t m_irq_count;
int m_irq_enable;
static const device_timer_id TIMER_IRQ = 0;
@@ -96,7 +96,7 @@ protected:
// Namcot-163 chip contains 8K of internal ram, possibly battery backed up (not emulated yet)
// was it also present in 175 & 340 chips?
- UINT8 m_n163_ram[0x2000];
+ uint8_t m_n163_ram[0x2000];
};
@@ -106,7 +106,7 @@ class nes_namcot175_device : public nes_namcot340_device
{
public:
// construction/destruction
- nes_namcot175_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_namcot175_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -117,7 +117,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_wram_protect;
+ uint8_t m_wram_protect;
};
@@ -127,7 +127,7 @@ class nes_namcot163_device : public nes_namcot340_device
{
public:
// construction/destruction
- nes_namcot163_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_namcot163_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -144,9 +144,9 @@ public:
virtual void pcb_reset() override;
private:
- void set_mirror(UINT8 page, UINT8 data);
+ void set_mirror(uint8_t page, uint8_t data);
- UINT8 m_wram_protect, m_latch, m_chr_bank;
+ uint8_t m_wram_protect, m_latch, m_chr_bank;
// TODO: add emulation of the sound part of the chip
};
diff --git a/src/devices/bus/nes/nanjing.cpp b/src/devices/bus/nes/nanjing.cpp
index 9c4ea8bf3b1..8163cb7e156 100644
--- a/src/devices/bus/nes/nanjing.cpp
+++ b/src/devices/bus/nes/nanjing.cpp
@@ -33,7 +33,7 @@
const device_type NES_NANJING = &device_creator<nes_nanjing_device>;
-nes_nanjing_device::nes_nanjing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_nanjing_device::nes_nanjing_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_NANJING, "NES Cart Nanjing PCB", tag, owner, clock, "nes_nanjing", __FILE__),
m_count(0),
m_latch1(0),
@@ -124,7 +124,7 @@ WRITE8_MEMBER(nes_nanjing_device::write_l)
if (offset == 0x1101) // 0x5101
{
- UINT8 temp = m_count;
+ uint8_t temp = m_count;
m_count = data;
if ((temp & ~data) & 1)
@@ -151,7 +151,7 @@ WRITE8_MEMBER(nes_nanjing_device::write_l)
READ8_MEMBER(nes_nanjing_device::read_l)
{
- UINT8 value = 0;
+ uint8_t value = 0;
LOG_MMC(("nanjing read_l, offset: %04x\n", offset));
offset += 0x100;
diff --git a/src/devices/bus/nes/nanjing.h b/src/devices/bus/nes/nanjing.h
index 3fe4d670527..c7f886ba107 100644
--- a/src/devices/bus/nes/nanjing.h
+++ b/src/devices/bus/nes/nanjing.h
@@ -12,7 +12,7 @@ class nes_nanjing_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_nanjing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_nanjing_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -23,9 +23,9 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_count;
- UINT8 m_reg[2];
- UINT8 m_latch1, m_latch2;
+ uint8_t m_count;
+ uint8_t m_reg[2];
+ uint8_t m_latch1, m_latch2;
};
diff --git a/src/devices/bus/nes/nes_ines.hxx b/src/devices/bus/nes/nes_ines.hxx
index 9fd1e5a90eb..c7214ee9bc0 100644
--- a/src/devices/bus/nes/nes_ines.hxx
+++ b/src/devices/bus/nes/nes_ines.hxx
@@ -339,10 +339,10 @@ void ines_mapr_setup( int mapper, int *pcb_id )
void nes_cart_slot_device::call_load_ines()
{
- UINT32 vram_size = 0, prgram_size = 0, battery_size = 0, mapper_sram_size = 0;
- UINT32 prg_size, vrom_size;
- UINT8 header[0x10];
- UINT8 mapper, submapper = 0, local_options;
+ uint32_t vram_size = 0, prgram_size = 0, battery_size = 0, mapper_sram_size = 0;
+ uint32_t prg_size, vrom_size;
+ uint8_t header[0x10];
+ uint8_t mapper, submapper = 0, local_options;
bool ines20 = FALSE, prg16k;
std::string mapinfo;
int pcb_id = 0, mapint1 = 0, mapint2 = 0, mapint3 = 0, mapint4 = 0;
@@ -797,8 +797,8 @@ void nes_cart_slot_device::call_load_ines()
// A few boards have internal RAM with a battery (MMC6, Taito X1-005 & X1-017, etc.)
if (battery_size || mapper_sram_size)
{
- UINT32 tot_size = battery_size + mapper_sram_size;
- std::vector<UINT8> temp_nvram(tot_size);
+ uint32_t tot_size = battery_size + mapper_sram_size;
+ std::vector<uint8_t> temp_nvram(tot_size);
battery_load(&temp_nvram[0], tot_size, 0x00);
if (battery_size)
{
@@ -811,9 +811,9 @@ void nes_cart_slot_device::call_load_ines()
}
}
-const char * nes_cart_slot_device::get_default_card_ines(UINT8 *ROM, UINT32 len)
+const char * nes_cart_slot_device::get_default_card_ines(uint8_t *ROM, uint32_t len)
{
- UINT8 mapper, submapper = 0;
+ uint8_t mapper, submapper = 0;
bool ines20 = FALSE;
std::string mapinfo;
int pcb_id = 0, mapint1 = 0, mapint2 = 0, mapint3 = 0, mapint4 = 0;
diff --git a/src/devices/bus/nes/nes_pcb.hxx b/src/devices/bus/nes/nes_pcb.hxx
index 67a8d731cac..cc4def22dc0 100644
--- a/src/devices/bus/nes/nes_pcb.hxx
+++ b/src/devices/bus/nes/nes_pcb.hxx
@@ -436,10 +436,10 @@ static int nes_cart_get_line( const char *feature )
void nes_cart_slot_device::call_load_pcb()
{
- UINT32 vram_size = 0, prgram_size = 0, battery_size = 0, mapper_sram_size = 0;
+ uint32_t vram_size = 0, prgram_size = 0, battery_size = 0, mapper_sram_size = 0;
// SETUP step 1: getting PRG, VROM, VRAM sizes
- UINT32 prg_size = get_software_region_length("prg");
- UINT32 vrom_size = get_software_region_length("chr");
+ uint32_t prg_size = get_software_region_length("prg");
+ uint32_t vrom_size = get_software_region_length("chr");
vram_size = get_software_region_length("vram");
vram_size += get_software_region_length("vram2");
@@ -595,13 +595,13 @@ void nes_cart_slot_device::call_load_pcb()
// A few boards have internal RAM with a battery (MMC6, Taito X1-005 & X1-017, etc.)
if (battery_size || mapper_sram_size)
{
- UINT32 tot_size = battery_size + mapper_sram_size;
- std::vector<UINT8> temp_nvram(tot_size);
+ uint32_t tot_size = battery_size + mapper_sram_size;
+ std::vector<uint8_t> temp_nvram(tot_size);
// some games relies on specific battery patterns to work
// (e.g. Silva Saga does not work with SRAM fully initialized to 0x00)
// and we use the info from xml here to prepare a default NVRAM
- std::vector<UINT8> default_nvram(tot_size);
+ std::vector<uint8_t> default_nvram(tot_size);
if (battery_size)
memcpy(&default_nvram[0], get_software_region("bwram"), battery_size);
if (mapper_sram_size)
diff --git a/src/devices/bus/nes/nes_slot.cpp b/src/devices/bus/nes/nes_slot.cpp
index b63d2742246..596ca7d8d40 100644
--- a/src/devices/bus/nes/nes_slot.cpp
+++ b/src/devices/bus/nes/nes_slot.cpp
@@ -158,7 +158,7 @@ void device_nes_cart_interface::prg_alloc(size_t size, const char *tag)
// A few pirate carts have PRG made of 32K + 2K or some weird similar config
// in this case we treat the banking as if this 'extra' PRG is not present and
// the pcb code has to handle it by accessing directly m_prg!
- printf("Warning! The loaded PRG has size not a multiple of 8KB (0x%X)\n", (UINT32)size);
+ printf("Warning! The loaded PRG has size not a multiple of 8KB (0x%X)\n", (uint32_t)size);
m_prg_chunks--;
}
@@ -259,7 +259,7 @@ inline int device_nes_cart_interface::prg_8k_bank_num(int bank_8k)
return bank_8k;
// case 2: otherwise return a mirror using the bank_map!
-// UINT8 temp = bank_8k;
+// uint8_t temp = bank_8k;
bank_8k &= m_prg_mask;
bank_8k -= (m_prg_mask/2 + 1);
// printf("bank: accessed %x (top: %x), returned %x\n", temp, (m_prg_chunks << 1) - 1, m_prg_bank_map[bank_8k]);
@@ -479,7 +479,7 @@ void device_nes_cart_interface::chr1_x(int start, int bank, int source)
void device_nes_cart_interface::set_nt_page(int page, int source, int bank, int writable)
{
- UINT8* base_ptr;
+ uint8_t* base_ptr;
switch (source)
{
@@ -570,7 +570,7 @@ void device_nes_cart_interface::set_nt_mirroring(int mirroring)
// Helper function for the few mappers reading from 0x8000-0xffff for protection
// so that they can access the ROM after the protection handling (which overwrites
// the memory banks)
-UINT8 device_nes_cart_interface::hi_access_rom(UINT32 offset)
+uint8_t device_nes_cart_interface::hi_access_rom(uint32_t offset)
{
int bank = (offset & 0x6000) >> 13;
return m_prg[m_prg_bank[bank] * 0x2000 + (offset & 0x1fff)];
@@ -580,7 +580,7 @@ UINT8 device_nes_cart_interface::hi_access_rom(UINT32 offset)
// Tests by blargg showed that in many of the boards suffering of CPU/ROM
// conflicts the behaviour can be accurately emulated by writing not the
// original data, but data & rom[offset]
-UINT8 device_nes_cart_interface::account_bus_conflict(UINT32 offset, UINT8 data)
+uint8_t device_nes_cart_interface::account_bus_conflict(uint32_t offset, uint8_t data)
{
// pirate variants of boards subject to bus conflict are often not subject to it
// so we allow to set m_bus_conflict to FALSE at loading time when necessary
@@ -668,7 +668,7 @@ WRITE8_MEMBER(device_nes_cart_interface::write_h)
}
-void device_nes_cart_interface::pcb_start(running_machine &machine, UINT8 *ciram_ptr, bool cart_mounted)
+void device_nes_cart_interface::pcb_start(running_machine &machine, uint8_t *ciram_ptr, bool cart_mounted)
{
// HACK: to reduce tagmap lookups for PPU-related IRQs, we add a hook to the
// main NES CPU here, even if it does not belong to this device.
@@ -742,7 +742,7 @@ void device_nes_cart_interface::nes_banks_restore()
//-------------------------------------------------
// nes_cart_slot_device - constructor
//-------------------------------------------------
-nes_cart_slot_device::nes_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_cart_slot_device::nes_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_CART_SLOT, "NES Cartridge Slot", tag, owner, clock, "nes_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -782,7 +782,7 @@ void nes_cart_slot_device::device_config_complete()
}
-void nes_cart_slot_device::pcb_start(UINT8 *ciram_ptr)
+void nes_cart_slot_device::pcb_start(uint8_t *ciram_ptr)
{
if (m_cart)
m_cart->pcb_start(machine(), ciram_ptr, exists());
@@ -885,8 +885,8 @@ void nes_cart_slot_device::call_unload()
{
if (m_cart->get_battery_size() || m_cart->get_mapper_sram_size())
{
- UINT32 tot_size = m_cart->get_battery_size() + m_cart->get_mapper_sram_size();
- std::vector<UINT8> temp_nvram(tot_size);
+ uint32_t tot_size = m_cart->get_battery_size() + m_cart->get_mapper_sram_size();
+ std::vector<uint8_t> temp_nvram(tot_size);
if (m_cart->get_battery_size())
memcpy(&temp_nvram[0], m_cart->get_battery_base(), m_cart->get_battery_size());
if (m_cart->get_mapper_sram_size())
@@ -907,8 +907,8 @@ std::string nes_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string = "nrom";
- UINT32 len = m_file->size();
- std::vector<UINT8> rom(len);
+ uint32_t len = m_file->size();
+ std::vector<uint8_t> rom(len);
m_file->read(&rom[0], len);
@@ -935,7 +935,7 @@ READ8_MEMBER(nes_cart_slot_device::read_l)
{
if (m_cart)
{
- UINT8 val = m_cart->read_l(space, offset);
+ uint8_t val = m_cart->read_l(space, offset);
// update open bus
m_cart->set_open_bus(((offset + 0x4100) & 0xff00) >> 8);
return val;
@@ -948,7 +948,7 @@ READ8_MEMBER(nes_cart_slot_device::read_m)
{
if (m_cart)
{
- UINT8 val = m_cart->read_m(space, offset);
+ uint8_t val = m_cart->read_m(space, offset);
// update open bus
m_cart->set_open_bus(((offset + 0x6000) & 0xff00) >> 8);
return val;
@@ -961,7 +961,7 @@ READ8_MEMBER(nes_cart_slot_device::read_h)
{
if (m_cart)
{
- UINT8 val = m_cart->read_h(space, offset);
+ uint8_t val = m_cart->read_h(space, offset);
// update open bus
m_cart->set_open_bus(((offset + 0x8000) & 0xff00) >> 8);
return val;
@@ -974,7 +974,7 @@ READ8_MEMBER(nes_cart_slot_device::read_ex)
{
if (m_cart)
{
- UINT8 val = m_cart->read_ex(space, offset);
+ uint8_t val = m_cart->read_ex(space, offset);
// update open bus
m_cart->set_open_bus(((offset + 0x4020) & 0xff00) >> 8);
return val;
diff --git a/src/devices/bus/nes/nes_slot.h b/src/devices/bus/nes/nes_slot.h
index ab906ed6162..55adc6780e4 100644
--- a/src/devices/bus/nes/nes_slot.h
+++ b/src/devices/bus/nes/nes_slot.h
@@ -201,45 +201,45 @@ public:
void set_vrc_lines(int PRG_A, int PRG_B, int CHR) { m_vrc_ls_prg_a = PRG_A; m_vrc_ls_prg_b = PRG_B; m_vrc_ls_chr = CHR; }
void set_x1_005_alt(bool val) { m_x1_005_alt_mirroring = val; }
void set_bus_conflict(bool val) { m_bus_conflict = val; }
- void set_open_bus(UINT8 val) { m_open_bus = val; }
-
- UINT8* get_prg_base() { return m_prg; }
- UINT8* get_prgram_base() { return &m_prgram[0]; }
- UINT8* get_vrom_base() { return m_vrom; }
- UINT8* get_vram_base() { return &m_vram[0]; }
- UINT8* get_battery_base() { return &m_battery[0]; }
- UINT8* get_mapper_sram_base() { return m_mapper_sram; }
-
- UINT32 get_prg_size() { return m_prg_size; }
- UINT32 get_prgram_size() { return m_prgram.size(); }
- UINT32 get_vrom_size() { return m_vrom_size; }
- UINT32 get_vram_size() { return m_vram.size(); }
- UINT32 get_battery_size() { return m_battery.size(); }
- UINT32 get_mapper_sram_size() { return m_mapper_sram_size; }
+ void set_open_bus(uint8_t val) { m_open_bus = val; }
+
+ uint8_t* get_prg_base() { return m_prg; }
+ uint8_t* get_prgram_base() { return &m_prgram[0]; }
+ uint8_t* get_vrom_base() { return m_vrom; }
+ uint8_t* get_vram_base() { return &m_vram[0]; }
+ uint8_t* get_battery_base() { return &m_battery[0]; }
+ uint8_t* get_mapper_sram_base() { return m_mapper_sram; }
+
+ uint32_t get_prg_size() { return m_prg_size; }
+ uint32_t get_prgram_size() { return m_prgram.size(); }
+ uint32_t get_vrom_size() { return m_vrom_size; }
+ uint32_t get_vram_size() { return m_vram.size(); }
+ uint32_t get_battery_size() { return m_battery.size(); }
+ uint32_t get_mapper_sram_size() { return m_mapper_sram_size; }
virtual void ppu_latch(offs_t offset) {}
virtual void hblank_irq(int scanline, int vblank, int blanked) {}
virtual void scanline_irq(int scanline, int vblank, int blanked) {}
virtual void pcb_reset() {} // many pcb expect specific PRG/CHR banking at start
- virtual void pcb_start(running_machine &machine, UINT8 *ciram_ptr, bool cart_mounted);
+ virtual void pcb_start(running_machine &machine, uint8_t *ciram_ptr, bool cart_mounted);
void pcb_reg_postload(running_machine &machine);
void nes_banks_restore();
- UINT8 hi_access_rom(UINT32 offset); // helper ROM access for a bunch of PCB reading 0x8000-0xffff for protection too
- UINT8 account_bus_conflict(UINT32 offset, UINT8 data);
+ uint8_t hi_access_rom(uint32_t offset); // helper ROM access for a bunch of PCB reading 0x8000-0xffff for protection too
+ uint8_t account_bus_conflict(uint32_t offset, uint8_t data);
protected:
// internal state
- UINT8 *m_prg;
- UINT8 *m_vrom;
- UINT8 *m_ciram;
- std::vector<UINT8> m_prgram;
- std::vector<UINT8> m_vram;
- std::vector<UINT8> m_battery;
- UINT32 m_prg_size;
- UINT32 m_vrom_size;
+ uint8_t *m_prg;
+ uint8_t *m_vrom;
+ uint8_t *m_ciram;
+ std::vector<uint8_t> m_prgram;
+ std::vector<uint8_t> m_vram;
+ std::vector<uint8_t> m_battery;
+ uint32_t m_prg_size;
+ uint32_t m_vrom_size;
// HACK: to reduce tagmap lookups for PPU-related IRQs, we add a hook to the
// main NES CPU here, even if it does not belong to this device.
@@ -247,9 +247,9 @@ protected:
// these are specific of some boards but must be accessible from the driver
// E.g. additional save ram for HKROM, X1-005 & X1-017 boards, or ExRAM for MMC5
- UINT8 *m_mapper_sram;
- std::vector<UINT8> m_ext_ntram;
- UINT32 m_mapper_sram_size;
+ uint8_t *m_mapper_sram;
+ std::vector<uint8_t> m_ext_ntram;
+ uint32_t m_mapper_sram_size;
int m_ce_mask;
int m_ce_state;
@@ -261,15 +261,15 @@ protected:
bool m_pcb_ctrl_mirror, m_four_screen_vram, m_has_trainer;
bool m_x1_005_alt_mirroring; // temp hack for two kind of mirroring in Taito X1-005 boards (to be replaced with pin checking)
bool m_bus_conflict;
- UINT8 m_open_bus;
+ uint8_t m_open_bus;
// PRG
inline int prg_8k_bank_num(int bank);
inline void update_prg_banks(int prg_bank_start, int prg_bank_end);
memory_bank *m_prg_bank_mem[4];
int m_prg_bank[4];
- UINT32 m_prg_chunks;
- UINT32 m_prg_mask;
+ uint32_t m_prg_chunks;
+ uint32_t m_prg_mask;
// PRG helpers
void prg32(int bank);
@@ -290,10 +290,10 @@ protected:
//because some of these change multiple times per scanline!
int m_chr_src[8]; //defines source of base pointer
int m_chr_orig[8]; //defines offset of 0x400 byte segment at base pointer
- UINT8 *m_chr_access[8]; //source translated + origin -> valid pointer!
+ uint8_t *m_chr_access[8]; //source translated + origin -> valid pointer!
- UINT32 m_vrom_chunks;
- UINT32 m_vram_chunks;
+ uint32_t m_vrom_chunks;
+ uint32_t m_vram_chunks;
// CHR helpers
void chr8(int bank, int source);
@@ -321,12 +321,12 @@ protected:
int m_nt_src[4];
int m_nt_orig[4];
int m_nt_writable[4];
- UINT8 *m_nt_access[4]; //quick banking structure for a maximum of 4K of RAM/ROM/ExRAM
+ uint8_t *m_nt_access[4]; //quick banking structure for a maximum of 4K of RAM/ROM/ExRAM
void set_nt_page(int page, int source, int bank, int writable);
void set_nt_mirroring(int mirroring);
- std::vector<UINT16> m_prg_bank_map;
+ std::vector<uint16_t> m_prg_bank_map;
};
void nes_partialhash(util::hash_collection &dest, const unsigned char *data, unsigned long length, const char *functions);
@@ -339,7 +339,7 @@ class nes_cart_slot_device : public device_t,
{
public:
// construction/destruction
- nes_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~nes_cart_slot_device();
// device-level overrides
@@ -367,8 +367,8 @@ public:
// slot interface overrides
virtual std::string get_default_card_software() override;
- const char * get_default_card_ines(UINT8 *ROM, UINT32 len);
- const char * get_default_card_unif(UINT8 *ROM, UINT32 len);
+ const char * get_default_card_ines(uint8_t *ROM, uint32_t len);
+ const char * get_default_card_unif(uint8_t *ROM, uint32_t len);
const char * nes_get_slot(int pcb_id);
int nes_get_pcb_id(const char *slot);
@@ -387,7 +387,7 @@ public:
int get_pcb_id() { return m_pcb_id; };
- void pcb_start(UINT8 *ciram_ptr);
+ void pcb_start(uint8_t *ciram_ptr);
void pcb_reset();
// temporarily here
diff --git a/src/devices/bus/nes/nes_unif.hxx b/src/devices/bus/nes/nes_unif.hxx
index ff5d9e1384d..168ca61a7ab 100644
--- a/src/devices/bus/nes/nes_unif.hxx
+++ b/src/devices/bus/nes/nes_unif.hxx
@@ -202,20 +202,20 @@ void unif_mapr_setup( const char *board, int *pcb_id, int *battery, int *prgram,
void nes_cart_slot_device::call_load_unif()
{
- UINT32 vram_size = 0, prgram_size = 0, battery_size = 0, mapper_sram_size = 0;
+ uint32_t vram_size = 0, prgram_size = 0, battery_size = 0, mapper_sram_size = 0;
// SETUP step 1: running through the file and getting PRG, VROM sizes
- UINT32 unif_ver = 0, chunk_length = 0, read_length = 0x20;
- UINT32 prg_start = 0, chr_start = 0;
- UINT32 size = length(), prg_size = 0, vrom_size = 0;
- UINT8 buffer[4], mirror = 0;
+ uint32_t unif_ver = 0, chunk_length = 0, read_length = 0x20;
+ uint32_t prg_start = 0, chr_start = 0;
+ uint32_t size = length(), prg_size = 0, vrom_size = 0;
+ uint8_t buffer[4], mirror = 0;
char magic2[4];
char unif_mapr[32]; // here we should store MAPR chunks
bool mapr_chunk_found = FALSE, small_prg = FALSE;
// allocate space to temporarily store PRG & CHR banks
- std::vector<UINT8> temp_prg(256 * 0x4000);
- std::vector<UINT8> temp_chr(256 * 0x2000);
- UINT8 temp_byte = 0;
+ std::vector<uint8_t> temp_prg(256 * 0x4000);
+ std::vector<uint8_t> temp_chr(256 * 0x2000);
+ uint8_t temp_byte = 0;
fseek(4, SEEK_SET);
fread(&buffer, 4);
@@ -540,8 +540,8 @@ void nes_cart_slot_device::call_load_unif()
// A few boards have internal RAM with a battery (MMC6, Taito X1-005 & X1-017, etc.)
if (battery_size || mapper_sram_size)
{
- UINT32 tot_size = battery_size + mapper_sram_size;
- std::vector<UINT8> temp_nvram(tot_size);
+ uint32_t tot_size = battery_size + mapper_sram_size;
+ std::vector<uint8_t> temp_nvram(tot_size);
battery_load(&temp_nvram[0], tot_size, 0x00);
if (battery_size)
{
@@ -555,9 +555,9 @@ void nes_cart_slot_device::call_load_unif()
logerror("UNIF support is only very preliminary.\n");
}
-const char * nes_cart_slot_device::get_default_card_unif(UINT8 *ROM, UINT32 len)
+const char * nes_cart_slot_device::get_default_card_unif(uint8_t *ROM, uint32_t len)
{
- UINT32 chunk_length = 0, read_length = 0x20;
+ uint32_t chunk_length = 0, read_length = 0x20;
int pcb_id = 0, battery = 0, prgram = 0, vram_chunks = 0;
char unif_mapr[32];
diff --git a/src/devices/bus/nes/ntdec.cpp b/src/devices/bus/nes/ntdec.cpp
index 77b983137a3..2e75216664d 100644
--- a/src/devices/bus/nes/ntdec.cpp
+++ b/src/devices/bus/nes/ntdec.cpp
@@ -38,13 +38,13 @@ const device_type NES_NTDEC_ASDER = &device_creator<nes_ntdec_asder_device>;
const device_type NES_NTDEC_FH = &device_creator<nes_ntdec_fh_device>;
-nes_ntdec_asder_device::nes_ntdec_asder_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ntdec_asder_device::nes_ntdec_asder_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_NTDEC_ASDER, "NES Cart NTDEC Asder PCB", tag, owner, clock, "nes_ntdec_asder", __FILE__),
m_latch(0)
{
}
-nes_ntdec_fh_device::nes_ntdec_fh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ntdec_fh_device::nes_ntdec_fh_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_NTDEC_FH, "NES Cart NTDEC Fighting Hero PCB", tag, owner, clock, "nes_ntdec_fh", __FILE__)
{
}
diff --git a/src/devices/bus/nes/ntdec.h b/src/devices/bus/nes/ntdec.h
index bc6906179ce..daa7ba8acdf 100644
--- a/src/devices/bus/nes/ntdec.h
+++ b/src/devices/bus/nes/ntdec.h
@@ -12,7 +12,7 @@ class nes_ntdec_asder_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ntdec_asder_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ntdec_asder_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -21,7 +21,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
};
@@ -31,7 +31,7 @@ class nes_ntdec_fh_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ntdec_fh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ntdec_fh_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/nxrom.cpp b/src/devices/bus/nes/nxrom.cpp
index c7fb9a90f3b..4af56430356 100644
--- a/src/devices/bus/nes/nxrom.cpp
+++ b/src/devices/bus/nes/nxrom.cpp
@@ -59,74 +59,74 @@ const device_type NES_UN1ROM = &device_creator<nes_un1rom_device>;
const device_type NES_NOCHR = &device_creator<nes_nochr_device>;
-nes_nrom_device::nes_nrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_nrom_device::nes_nrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nes_cart_interface( mconfig, *this )
{
}
-nes_nrom_device::nes_nrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_nrom_device::nes_nrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, NES_NROM, "NES Cart NROM PCB", tag, owner, clock, "nes_nrom", __FILE__),
device_nes_cart_interface( mconfig, *this )
{
}
-nes_nrom368_device::nes_nrom368_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_nrom368_device::nes_nrom368_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_NROM368, "NES Cart NROM-368 PCB", tag, owner, clock, "nes_nrom368", __FILE__)
{
}
-nes_fcbasic_device::nes_fcbasic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_fcbasic_device::nes_fcbasic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_FCBASIC, "NES Cart Famicom BASIC PCB", tag, owner, clock, "nes_fcbasic", __FILE__)
{
}
-nes_axrom_device::nes_axrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_axrom_device::nes_axrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_AXROM, "NES Cart AxROM PCB", tag, owner, clock, "nes_axrom", __FILE__)
{
}
-nes_bxrom_device::nes_bxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bxrom_device::nes_bxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_BXROM, "NES Cart BxROM PCB", tag, owner, clock, "nes_bxrom", __FILE__)
{
}
-nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_chr_open_bus(0)
{
}
-nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_cnrom_device::nes_cnrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_CNROM, "NES Cart CNROM PCB", tag, owner, clock, "nes_cnrom", __FILE__), m_chr_open_bus(0)
{
}
-nes_cprom_device::nes_cprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_cprom_device::nes_cprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_CPROM, "NES Cart CPROM PCB", tag, owner, clock, "nes_cprom", __FILE__)
{
}
-nes_gxrom_device::nes_gxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_gxrom_device::nes_gxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_GXROM, "NES Cart GxROM PCB", tag, owner, clock, "nes_gxrom", __FILE__)
{
}
-nes_uxrom_device::nes_uxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_uxrom_device::nes_uxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_UXROM, "NES Cart UxROM PCB", tag, owner, clock, "nes_uxrom", __FILE__)
{
}
-nes_uxrom_cc_device::nes_uxrom_cc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_uxrom_cc_device::nes_uxrom_cc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_UXROM_CC, "NES Cart UNROM M5 PCB (Crazy Climber)", tag, owner, clock, "nes_uxrom_cc", __FILE__)
{
}
-nes_un1rom_device::nes_un1rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_un1rom_device::nes_un1rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_UN1ROM, "NES Cart UN1ROM PCB", tag, owner, clock, "nes_un1rom", __FILE__)
{
}
-nes_nochr_device::nes_nochr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_nochr_device::nes_nochr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_NOCHR, "NES Cart NoCash NOCHR PCB", tag, owner, clock, "nes_nochr", __FILE__)
{
}
diff --git a/src/devices/bus/nes/nxrom.h b/src/devices/bus/nes/nxrom.h
index e813e4f1ad3..c4f112bb68e 100644
--- a/src/devices/bus/nes/nxrom.h
+++ b/src/devices/bus/nes/nxrom.h
@@ -14,8 +14,8 @@ class nes_nrom_device : public device_t,
{
public:
// construction/destruction
- nes_nrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_nrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_nrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_nrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void device_start() override { common_start(); }
@@ -31,7 +31,7 @@ class nes_nrom368_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_nrom368_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_nrom368_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_READ8_MEMBER(read_l) override;
virtual DECLARE_READ8_MEMBER(read_m) override;
@@ -45,7 +45,7 @@ class nes_fcbasic_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_fcbasic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fcbasic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// emulate the additional WRAM
};
@@ -57,7 +57,7 @@ class nes_axrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_axrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_axrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -73,7 +73,7 @@ class nes_bxrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_bxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -89,8 +89,8 @@ class nes_cnrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_cnrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_cnrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cnrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_cnrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -100,7 +100,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_chr_open_bus;
+ uint8_t m_chr_open_bus;
};
@@ -110,7 +110,7 @@ class nes_cprom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_cprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -126,7 +126,7 @@ class nes_gxrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_gxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_gxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -142,7 +142,7 @@ class nes_uxrom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_uxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_uxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -158,7 +158,7 @@ class nes_uxrom_cc_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_uxrom_cc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_uxrom_cc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -174,7 +174,7 @@ class nes_un1rom_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_un1rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_un1rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -190,7 +190,7 @@ class nes_nochr_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_nochr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_nochr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_READ8_MEMBER(chr_r) override;
diff --git a/src/devices/bus/nes/pirate.cpp b/src/devices/bus/nes/pirate.cpp
index 9d31e1b7a1f..69e6117b977 100644
--- a/src/devices/bus/nes/pirate.cpp
+++ b/src/devices/bus/nes/pirate.cpp
@@ -53,87 +53,87 @@ const device_type NES_TF1201 = &device_creator<nes_tf1201_device>;
const device_type NES_CITYFIGHT = &device_creator<nes_cityfight_device>;
-nes_agci_device::nes_agci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_agci_device::nes_agci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_AGCI_50282, "NES Cart AGCI 50282 PCB", tag, owner, clock, "nes_agci50282", __FILE__)
{
}
-nes_dreamtech_device::nes_dreamtech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_dreamtech_device::nes_dreamtech_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_DREAMTECH01, "NES Cart Dreamtech01 PCB", tag, owner, clock, "nes_dreamtech", __FILE__)
{
}
-nes_fukutake_device::nes_fukutake_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_fukutake_device::nes_fukutake_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_FUKUTAKE, "NES Cart Fukutake Study Box PCB", tag, owner, clock, "nes_fukutake", __FILE__), m_latch(0)
{
}
-nes_futuremedia_device::nes_futuremedia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_futuremedia_device::nes_futuremedia_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_FUTUREMEDIA, "NES Cart FutureMedia PCB", tag, owner, clock, "nes_futuremedia", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_clear(0), m_irq_enable(0)
{
}
-nes_magseries_device::nes_magseries_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_magseries_device::nes_magseries_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_MAGSERIES, "NES Cart Magical Series PCB", tag, owner, clock, "nes_magseries", __FILE__)
{
}
-nes_daou306_device::nes_daou306_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_daou306_device::nes_daou306_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_DAOU306, "NES Cart Daou 306 PCB", tag, owner, clock, "nes_daou306", __FILE__)
{
}
-nes_subor0_device::nes_subor0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_subor0_device::nes_subor0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SUBOR0, "NES Cart Subor Type 0 PCB", tag, owner, clock, "nes_subor0", __FILE__)
{
}
-nes_subor1_device::nes_subor1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_subor1_device::nes_subor1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SUBOR1, "NES Cart Subor Type 1 PCB", tag, owner, clock, "nes_subor1", __FILE__)
{
}
-nes_cc21_device::nes_cc21_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_cc21_device::nes_cc21_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_CC21, "NES Cart CC-21 PCB", tag, owner, clock, "nes_cc21", __FILE__)
{
}
-nes_xiaozy_device::nes_xiaozy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_xiaozy_device::nes_xiaozy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_XIAOZY, "NES Cart Xiao Zhuan Yuan PCB", tag, owner, clock, "nes_xiaozy", __FILE__)
{
}
-nes_edu2k_device::nes_edu2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_edu2k_device::nes_edu2k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_EDU2K, "NES Cart Educational Computer 2000 PCB", tag, owner, clock, "nes_edu2k", __FILE__), m_latch(0)
{
}
-nes_t230_device::nes_t230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_t230_device::nes_t230_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_T230, "NES Cart T-230 PCB", tag, owner, clock, "nes_t230", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_enable(0), m_irq_enable_latch(0)
{
}
-nes_mk2_device::nes_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_mk2_device::nes_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_MK2, "NES Cart Mortal Kombat 2 PCB", tag, owner, clock, "nes_mk2", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_clear(0), m_irq_enable(0)
{
}
-nes_whero_device::nes_whero_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_whero_device::nes_whero_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_WHERO, "NES Cart World Heroes PCB", tag, owner, clock, "nes_whero", __FILE__), m_reg(0), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0)
{
}
-nes_43272_device::nes_43272_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_43272_device::nes_43272_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_43272, "NES Cart UNL-43272 PCB", tag, owner, clock, "nes_43272", __FILE__), m_latch(0)
{
}
-nes_tf1201_device::nes_tf1201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tf1201_device::nes_tf1201_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_TF1201, "NES Cart UNL-TF1201 PCB", tag, owner, clock, "nes_tf1201", __FILE__), m_prg(0), m_swap(0), m_irq_count(0), m_irq_enable(0), m_irq_enable_latch(0)
{
}
-nes_cityfight_device::nes_cityfight_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_cityfight_device::nes_cityfight_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_TF1201, "NES Cart City Fighter PCB", tag, owner, clock, "nes_cityfight", __FILE__), m_prg_reg(0), m_prg_mode(0), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr)
{
}
@@ -472,7 +472,7 @@ WRITE8_MEMBER(nes_agci_device::write_h)
LOG_MMC(("agci write_h, offset: %04x, data: %02x\n", offset, data));
// this pcb is subject to bus conflict
- UINT8 temp = account_bus_conflict(offset, 0xff);
+ uint8_t temp = account_bus_conflict(offset, 0xff);
data = (data & temp) | (temp & 1);
chr8(data >> 4, CHRROM);
@@ -739,7 +739,7 @@ WRITE8_MEMBER(nes_daou306_device::write_h)
WRITE8_MEMBER(nes_subor0_device::write_h)
{
- UINT8 subor_helper1, subor_helper2;
+ uint8_t subor_helper1, subor_helper2;
LOG_MMC(("subor0 write_h, offset: %04x, data: %02x\n", offset, data));
m_reg[(offset >> 13) & 0x03] = data;
@@ -777,7 +777,7 @@ WRITE8_MEMBER(nes_subor0_device::write_h)
WRITE8_MEMBER(nes_subor1_device::write_h)
{
- UINT8 subor_helper1, subor_helper2;
+ uint8_t subor_helper1, subor_helper2;
LOG_MMC(("subor1 write_h, offset: %04x, data: %02x\n", offset, data));
m_reg[(offset >> 13) & 0x03] = data;
@@ -1139,7 +1139,7 @@ WRITE8_MEMBER(nes_43272_device::write_h)
READ8_MEMBER(nes_43272_device::read_h)
{
- UINT8 mask = (m_latch & 0x400) ? 0xfe : 0xff;
+ uint8_t mask = (m_latch & 0x400) ? 0xfe : 0xff;
LOG_MMC(("unl_43272 read_h, offset: %04x\n", offset));
return hi_access_rom(offset & mask);
diff --git a/src/devices/bus/nes/pirate.h b/src/devices/bus/nes/pirate.h
index c9425d5e263..3a8bd1c09ea 100644
--- a/src/devices/bus/nes/pirate.h
+++ b/src/devices/bus/nes/pirate.h
@@ -12,7 +12,7 @@ class nes_agci_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_agci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_agci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_dreamtech_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_dreamtech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_dreamtech_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -44,7 +44,7 @@ class nes_fukutake_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_fukutake_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fukutake_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -56,8 +56,8 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
- UINT8 m_ram[0xb00];
+ uint8_t m_latch;
+ uint8_t m_ram[0xb00];
};
@@ -67,7 +67,7 @@ class nes_futuremedia_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_futuremedia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_futuremedia_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -77,8 +77,8 @@ public:
virtual void pcb_reset() override;
private:
- UINT16 m_irq_count, m_irq_count_latch;
- UINT8 m_irq_clear;
+ uint16_t m_irq_count, m_irq_count_latch;
+ uint8_t m_irq_clear;
int m_irq_enable;
};
@@ -89,7 +89,7 @@ class nes_magseries_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_magseries_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_magseries_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -105,7 +105,7 @@ class nes_daou306_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_daou306_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_daou306_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -114,7 +114,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg[16];
+ uint8_t m_reg[16];
};
@@ -124,7 +124,7 @@ class nes_subor0_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_subor0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_subor0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -133,7 +133,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg[4];
+ uint8_t m_reg[4];
};
@@ -143,7 +143,7 @@ class nes_subor1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_subor1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_subor1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -152,7 +152,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg[4];
+ uint8_t m_reg[4];
};
@@ -162,7 +162,7 @@ class nes_cc21_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_cc21_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cc21_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -178,7 +178,7 @@ class nes_xiaozy_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_xiaozy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_xiaozy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -194,7 +194,7 @@ class nes_edu2k_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_edu2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_edu2k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -205,7 +205,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
};
@@ -215,7 +215,7 @@ class nes_t230_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_t230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_t230_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -225,11 +225,11 @@ public:
virtual void pcb_reset() override;
private:
- UINT16 m_irq_count, m_irq_count_latch;
- UINT8 m_irq_mode;
+ uint16_t m_irq_count, m_irq_count_latch;
+ uint8_t m_irq_mode;
int m_irq_enable, m_irq_enable_latch;
- UINT8 m_mmc_vrom_bank[8];
+ uint8_t m_mmc_vrom_bank[8];
};
@@ -239,7 +239,7 @@ class nes_mk2_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -249,8 +249,8 @@ public:
virtual void pcb_reset() override;
private:
- UINT16 m_irq_count, m_irq_count_latch;
- UINT8 m_irq_clear;
+ uint16_t m_irq_count, m_irq_count_latch;
+ uint8_t m_irq_clear;
int m_irq_enable;
};
@@ -261,7 +261,7 @@ class nes_whero_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_whero_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_whero_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -271,10 +271,10 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg;
- UINT8 m_mmc_vrom_bank[8];
+ uint8_t m_reg;
+ uint8_t m_mmc_vrom_bank[8];
- UINT16 m_irq_count, m_irq_count_latch;
+ uint16_t m_irq_count, m_irq_count_latch;
int m_irq_enable, m_irq_enable_latch;
// int m_irq_mode;
};
@@ -286,7 +286,7 @@ class nes_43272_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_43272_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_43272_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -296,7 +296,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT16 m_latch;
+ uint16_t m_latch;
};
@@ -306,7 +306,7 @@ class nes_tf1201_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_tf1201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tf1201_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -317,11 +317,11 @@ public:
private:
void update_prg();
- UINT8 m_prg, m_swap;
- UINT16 m_irq_count;
+ uint8_t m_prg, m_swap;
+ uint16_t m_irq_count;
int m_irq_enable, m_irq_enable_latch;
- UINT8 m_mmc_vrom_bank[8];
+ uint8_t m_mmc_vrom_bank[8];
};
@@ -331,7 +331,7 @@ class nes_cityfight_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_cityfight_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_cityfight_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -342,14 +342,14 @@ public:
private:
void update_prg();
- UINT8 m_prg_reg, m_prg_mode;
- UINT16 m_irq_count;
+ uint8_t m_prg_reg, m_prg_mode;
+ uint16_t m_irq_count;
int m_irq_enable;
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
- UINT8 m_mmc_vrom_bank[8];
+ uint8_t m_mmc_vrom_bank[8];
};
@@ -361,7 +361,7 @@ class nes_fujiya_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_fujiya_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fujiya_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -371,7 +371,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
};
#endif
diff --git a/src/devices/bus/nes/pt554.cpp b/src/devices/bus/nes/pt554.cpp
index c9fec996e8e..2794a78a55e 100644
--- a/src/devices/bus/nes/pt554.cpp
+++ b/src/devices/bus/nes/pt554.cpp
@@ -34,7 +34,7 @@
const device_type NES_BANDAI_PT554 = &device_creator<nes_bandai_pt554_device>;
-nes_bandai_pt554_device::nes_bandai_pt554_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_bandai_pt554_device::nes_bandai_pt554_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_cnrom_device(mconfig, NES_BANDAI_PT554, "NES Cart Bandai PT-554 PCB", tag, owner, clock, "nes_bandai_pt554", __FILE__),
m_samples(*this, "samples")
{
diff --git a/src/devices/bus/nes/pt554.h b/src/devices/bus/nes/pt554.h
index b42cc048d5e..2dc1fe6f6f0 100644
--- a/src/devices/bus/nes/pt554.h
+++ b/src/devices/bus/nes/pt554.h
@@ -12,7 +12,7 @@ class nes_bandai_pt554_device : public nes_cnrom_device
{
public:
// construction/destruction
- nes_bandai_pt554_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bandai_pt554_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nes/racermate.cpp b/src/devices/bus/nes/racermate.cpp
index 9f549dc1f2d..f56733d2127 100644
--- a/src/devices/bus/nes/racermate.cpp
+++ b/src/devices/bus/nes/racermate.cpp
@@ -35,7 +35,7 @@
const device_type NES_RACERMATE = &device_creator<nes_racermate_device>;
-nes_racermate_device::nes_racermate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_racermate_device::nes_racermate_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_RACERMATE, "NES Cart Racermate PCB", tag, owner, clock, "nes_racermate", __FILE__),
m_latch(0)
{
diff --git a/src/devices/bus/nes/racermate.h b/src/devices/bus/nes/racermate.h
index 3ba50b399ae..da7a5f5174b 100644
--- a/src/devices/bus/nes/racermate.h
+++ b/src/devices/bus/nes/racermate.h
@@ -12,7 +12,7 @@ class nes_racermate_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_racermate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_racermate_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -22,7 +22,7 @@ public:
private:
void update_banks();
- UINT8 m_latch;
+ uint8_t m_latch;
};
diff --git a/src/devices/bus/nes/rcm.cpp b/src/devices/bus/nes/rcm.cpp
index a599dcbd432..30f867cb39b 100644
--- a/src/devices/bus/nes/rcm.cpp
+++ b/src/devices/bus/nes/rcm.cpp
@@ -46,27 +46,27 @@ const device_type NES_TF9IN1 = &device_creator<nes_tf9_device>;
const device_type NES_3DBLOCK = &device_creator<nes_3dblock_device>;
-nes_gs2015_device::nes_gs2015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_gs2015_device::nes_gs2015_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_GS2015, "NES Cart RCM GS-2015 PCB", tag, owner, clock, "nes_gs2015", __FILE__)
{
}
-nes_gs2004_device::nes_gs2004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_gs2004_device::nes_gs2004_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_GS2004, "NES Cart RCM GS-2004 PCB", tag, owner, clock, "nes_gs2004", __FILE__)
{
}
-nes_gs2013_device::nes_gs2013_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_gs2013_device::nes_gs2013_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_GS2013, "NES Cart RCM GS-2013 PCB", tag, owner, clock, "nes_gs2013", __FILE__)
{
}
-nes_tf9_device::nes_tf9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tf9_device::nes_tf9_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_TF9IN1, "NES Cart RCM Tetris Family 9 in 1 PCB", tag, owner, clock, "nes_tetrisfam", __FILE__)
{
}
-nes_3dblock_device::nes_3dblock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_3dblock_device::nes_3dblock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_3DBLOCK, "NES Cart RCM 3D Block PCB", tag, owner, clock, "nes_3dblock", __FILE__), m_irq_count(0)
{
}
diff --git a/src/devices/bus/nes/rcm.h b/src/devices/bus/nes/rcm.h
index 0b78c1e41bf..d7858cbdb53 100644
--- a/src/devices/bus/nes/rcm.h
+++ b/src/devices/bus/nes/rcm.h
@@ -12,7 +12,7 @@ class nes_gs2015_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_gs2015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_gs2015_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -30,7 +30,7 @@ class nes_gs2004_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_gs2004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_gs2004_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -46,7 +46,7 @@ class nes_gs2013_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_gs2013_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_gs2013_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -62,7 +62,7 @@ class nes_tf9_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_tf9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tf9_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -78,7 +78,7 @@ class nes_3dblock_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_3dblock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_3dblock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -88,8 +88,8 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_reg[4];
- UINT8 m_irq_count;
+ uint8_t m_reg[4];
+ uint8_t m_irq_count;
};
diff --git a/src/devices/bus/nes/rexsoft.cpp b/src/devices/bus/nes/rexsoft.cpp
index ed2b7246726..de49c5d9af9 100644
--- a/src/devices/bus/nes/rexsoft.cpp
+++ b/src/devices/bus/nes/rexsoft.cpp
@@ -39,13 +39,13 @@ const device_type NES_REX_DBZ5 = &device_creator<nes_rex_dbz5_device>;
const device_type NES_REX_SL1632 = &device_creator<nes_rex_sl1632_device>;
-nes_rex_dbz5_device::nes_rex_dbz5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_rex_dbz5_device::nes_rex_dbz5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_REX_DBZ5, "NES Cart Rex Soft DragonBall Z V PCB", tag, owner, clock, "nes_rex_dbz5", __FILE__),
m_extra(0)
{
}
-nes_rex_sl1632_device::nes_rex_sl1632_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_rex_sl1632_device::nes_rex_sl1632_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_REX_SL1632, "NES Cart Rex Soft SL-1632 PCB", tag, owner, clock, "nes_rex_sl1632", __FILE__), m_mode(0), m_mirror(0)
{
}
@@ -154,7 +154,7 @@ void nes_rex_sl1632_device::set_prg(int prg_base, int prg_mask)
if (m_mode & 0x02)
{
// here standard MMC3 bankswitch
- UINT8 prg_flip = (m_latch & 0x40) ? 2 : 0;
+ uint8_t prg_flip = (m_latch & 0x40) ? 2 : 0;
prg_cb(0, prg_base | (m_mmc_prg_bank[0 ^ prg_flip] & prg_mask));
prg_cb(1, prg_base | (m_mmc_prg_bank[1] & prg_mask));
@@ -170,12 +170,12 @@ void nes_rex_sl1632_device::set_prg(int prg_base, int prg_mask)
}
}
-void nes_rex_sl1632_device::set_chr(UINT8 chr, int chr_base, int chr_mask)
+void nes_rex_sl1632_device::set_chr(uint8_t chr, int chr_base, int chr_mask)
{
- static const UINT8 conv_table[8] = {5, 5, 5, 5, 3, 3, 1, 1};
- UINT8 chr_page = (m_latch & 0x80) >> 5;
- UINT8 bank[8];
- UINT8 chr_base2[8];
+ static const uint8_t conv_table[8] = {5, 5, 5, 5, 3, 3, 1, 1};
+ uint8_t chr_page = (m_latch & 0x80) >> 5;
+ uint8_t bank[8];
+ uint8_t chr_base2[8];
if (m_mode & 0x02)
{
@@ -210,7 +210,7 @@ void nes_rex_sl1632_device::set_chr(UINT8 chr, int chr_base, int chr_mask)
WRITE8_MEMBER(nes_rex_sl1632_device::write_h)
{
- UINT8 helper1, helper2;
+ uint8_t helper1, helper2;
LOG_MMC(("rex_sl1632 write_h, offset: %04x, data: %02x\n", offset, data));
if (offset == 0x2131)
diff --git a/src/devices/bus/nes/rexsoft.h b/src/devices/bus/nes/rexsoft.h
index 0b9799ee168..996b22baf13 100644
--- a/src/devices/bus/nes/rexsoft.h
+++ b/src/devices/bus/nes/rexsoft.h
@@ -12,7 +12,7 @@ class nes_rex_dbz5_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_rex_dbz5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_rex_dbz5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -24,7 +24,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_extra;
+ uint8_t m_extra;
};
@@ -34,7 +34,7 @@ class nes_rex_sl1632_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_rex_sl1632_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_rex_sl1632_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -44,10 +44,10 @@ public:
protected:
virtual void set_prg(int prg_base, int prg_mask) override;
- virtual void set_chr(UINT8 chr, int chr_base, int chr_mask) override;
+ virtual void set_chr(uint8_t chr, int chr_base, int chr_mask) override;
- UINT8 m_mode, m_mirror;
- UINT8 m_extra_bank[12];
+ uint8_t m_mode, m_mirror;
+ uint8_t m_extra_bank[12];
};
diff --git a/src/devices/bus/nes/sachen.cpp b/src/devices/bus/nes/sachen.cpp
index a5128b1bf6a..e000b23216e 100644
--- a/src/devices/bus/nes/sachen.cpp
+++ b/src/devices/bus/nes/sachen.cpp
@@ -60,82 +60,82 @@ const device_type NES_SACHEN_8259C = &device_creator<nes_sachen_8259c_device>;
const device_type NES_SACHEN_8259D = &device_creator<nes_sachen_8259d_device>;
-nes_sachen_sa009_device::nes_sachen_sa009_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_sa009_device::nes_sachen_sa009_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SACHEN_SA009, "NES Cart Sachen SA009 PCB", tag, owner, clock, "nes_sa009", __FILE__)
{
}
-nes_sachen_sa0036_device::nes_sachen_sa0036_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_sa0036_device::nes_sachen_sa0036_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SACHEN_SA0036, "NES Cart Sachen sa0036 PCB", tag, owner, clock, "nes_sa0036", __FILE__)
{
}
-nes_sachen_sa0037_device::nes_sachen_sa0037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_sa0037_device::nes_sachen_sa0037_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SACHEN_SA0037, "NES Cart Sachen sa0037 PCB", tag, owner, clock, "nes_sa0037", __FILE__)
{
}
-nes_sachen_sa72007_device::nes_sachen_sa72007_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_sa72007_device::nes_sachen_sa72007_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SACHEN_SA72007, "NES Cart Sachen SA72007 PCB", tag, owner, clock, "nes_sa72007", __FILE__)
{
}
-nes_sachen_sa72008_device::nes_sachen_sa72008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_sa72008_device::nes_sachen_sa72008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SACHEN_SA72008, "NES Cart Sachen SA72008 PCB", tag, owner, clock, "nes_sa72008", __FILE__)
{
}
-nes_sachen_tca01_device::nes_sachen_tca01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_tca01_device::nes_sachen_tca01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SACHEN_TCA01, "NES Cart Sachen TCA-01 PCB", tag, owner, clock, "nes_tca01", __FILE__)
{
}
-nes_sachen_tcu01_device::nes_sachen_tcu01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_tcu01_device::nes_sachen_tcu01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SACHEN_TCU01, "NES Cart Sachen TCU-01 PCB", tag, owner, clock, "nes_tcu01", __FILE__)
{
}
-nes_sachen_tcu02_device::nes_sachen_tcu02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_tcu02_device::nes_sachen_tcu02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SACHEN_TCU02, "NES Cart Sachen TCU-02 PCB", tag, owner, clock, "nes_tcu02", __FILE__), m_latch(0)
{
}
-nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_latch(0), m_mmc_vrom_bank(0)
{
}
-nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_74x374_device::nes_sachen_74x374_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SACHEN_74X374, "NES Cart Sachen 74*374 PCB", tag, owner, clock, "nes_s74x34", __FILE__), m_latch(0), m_mmc_vrom_bank(0)
{
}
-nes_sachen_74x374_alt_device::nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_74x374_alt_device::nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_sachen_74x374_device(mconfig, NES_SACHEN_74X374_ALT, "NES Cart Sachen 74*374 Alt PCB", tag, owner, clock, "nes_s74x34a", __FILE__)
{
}
-nes_sachen_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_sachen_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_sachen_74x374_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_sachen_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_8259a_device::nes_sachen_8259a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_sachen_74x374_device(mconfig, NES_SACHEN_8259A, "NES Cart Sachen 8259A PCB", tag, owner, clock, "nes_s8259a", __FILE__)
{
}
-nes_sachen_8259b_device::nes_sachen_8259b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_8259b_device::nes_sachen_8259b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_sachen_8259a_device(mconfig, NES_SACHEN_8259B, "NES Cart Sachen 8259B PCB", tag, owner, clock, "nes_s8259b", __FILE__)
{
}
-nes_sachen_8259c_device::nes_sachen_8259c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_8259c_device::nes_sachen_8259c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_sachen_8259a_device(mconfig, NES_SACHEN_8259C, "NES Cart Sachen 8259C PCB", tag, owner, clock, "nes_s8259c", __FILE__)
{
}
-nes_sachen_8259d_device::nes_sachen_8259d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sachen_8259d_device::nes_sachen_8259d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_sachen_8259a_device(mconfig, NES_SACHEN_8259D, "NES Cart Sachen 8259D PCB", tag, owner, clock, "nes_s8259d", __FILE__)
{
}
@@ -488,7 +488,7 @@ READ8_MEMBER(nes_sachen_tcu02_device::read_l)
-------------------------------------------------*/
-void nes_sachen_74x374_device::set_mirror(UINT8 nt) // also used by mappers 137, 138, 139, 141
+void nes_sachen_74x374_device::set_mirror(uint8_t nt) // also used by mappers 137, 138, 139, 141
{
switch (nt)
{
@@ -614,8 +614,8 @@ WRITE8_MEMBER(nes_sachen_74x374_alt_device::write_l)
void nes_sachen_8259a_device::chr_update()
{
- UINT8 bank_helper1 = m_reg[7] & 0x01;
- UINT8 bank_helper2 = (m_reg[4] & 0x07) << 3;
+ uint8_t bank_helper1 = m_reg[7] & 0x01;
+ uint8_t bank_helper2 = (m_reg[4] & 0x07) << 3;
if (m_chr_source == CHRROM)
{
@@ -657,8 +657,8 @@ WRITE8_MEMBER(nes_sachen_8259a_device::write_l)
void nes_sachen_8259b_device::chr_update()
{
- UINT8 bank_helper1 = m_reg[7] & 0x01;
- UINT8 bank_helper2 = (m_reg[4] & 0x07) << 3;
+ uint8_t bank_helper1 = m_reg[7] & 0x01;
+ uint8_t bank_helper2 = (m_reg[4] & 0x07) << 3;
if (m_chr_source == CHRROM)
{
@@ -671,8 +671,8 @@ void nes_sachen_8259b_device::chr_update()
void nes_sachen_8259c_device::chr_update()
{
- UINT8 bank_helper1 = m_reg[7] & 0x01;
- UINT8 bank_helper2 = (m_reg[4] & 0x07) << 3;
+ uint8_t bank_helper1 = m_reg[7] & 0x01;
+ uint8_t bank_helper2 = (m_reg[4] & 0x07) << 3;
if (m_chr_source == CHRROM)
{
diff --git a/src/devices/bus/nes/sachen.h b/src/devices/bus/nes/sachen.h
index 066a5e86a57..2c309a55a06 100644
--- a/src/devices/bus/nes/sachen.h
+++ b/src/devices/bus/nes/sachen.h
@@ -12,7 +12,7 @@ class nes_sachen_sa009_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_sa009_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_sa009_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -28,7 +28,7 @@ class nes_sachen_sa0036_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_sa0036_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_sa0036_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -44,7 +44,7 @@ class nes_sachen_sa0037_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_sa0037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_sa0037_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -60,7 +60,7 @@ class nes_sachen_sa72007_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_sa72007_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_sa72007_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -76,7 +76,7 @@ class nes_sachen_sa72008_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_sa72008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_sa72008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -92,7 +92,7 @@ class nes_sachen_tca01_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_tca01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_tca01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -108,7 +108,7 @@ class nes_sachen_tcu01_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_tcu01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_tcu01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -126,7 +126,7 @@ class nes_sachen_tcu02_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_tcu02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_tcu02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -136,7 +136,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
};
@@ -146,8 +146,8 @@ class nes_sachen_74x374_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sachen_74x374_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_sachen_74x374_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_74x374_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_sachen_74x374_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -157,8 +157,8 @@ public:
virtual void pcb_reset() override;
protected:
- void set_mirror(UINT8 nt);
- UINT8 m_latch, m_mmc_vrom_bank;
+ void set_mirror(uint8_t nt);
+ uint8_t m_latch, m_mmc_vrom_bank;
};
@@ -168,7 +168,7 @@ class nes_sachen_74x374_alt_device : public nes_sachen_74x374_device
{
public:
// construction/destruction
- nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_READ8_MEMBER(read_l) override { return 0xff; } // no read_l here
@@ -182,8 +182,8 @@ class nes_sachen_8259a_device : public nes_sachen_74x374_device
{
public:
// construction/destruction
- nes_sachen_8259a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_sachen_8259a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_8259a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_sachen_8259a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -194,7 +194,7 @@ public:
protected:
virtual void chr_update();
- UINT8 m_reg[8];
+ uint8_t m_reg[8];
};
@@ -204,7 +204,7 @@ class nes_sachen_8259b_device : public nes_sachen_8259a_device
{
public:
// construction/destruction
- nes_sachen_8259b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_8259b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual void chr_update() override;
@@ -217,7 +217,7 @@ class nes_sachen_8259c_device : public nes_sachen_8259a_device
{
public:
// construction/destruction
- nes_sachen_8259c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_8259c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual void chr_update() override;
@@ -230,7 +230,7 @@ class nes_sachen_8259d_device : public nes_sachen_8259a_device
{
public:
// construction/destruction
- nes_sachen_8259d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sachen_8259d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void pcb_reset() override;
diff --git a/src/devices/bus/nes/somari.cpp b/src/devices/bus/nes/somari.cpp
index 39af6273eee..9990ae8d9db 100644
--- a/src/devices/bus/nes/somari.cpp
+++ b/src/devices/bus/nes/somari.cpp
@@ -39,7 +39,7 @@
const device_type NES_SOMARI = &device_creator<nes_somari_device>;
-nes_somari_device::nes_somari_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_somari_device::nes_somari_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_SOMARI, "NES Cart Team Somari PCB", tag, owner, clock, "nes_somari", __FILE__),
m_board_mode(0),
m_mmc3_mirror_reg(0),
@@ -195,7 +195,7 @@ WRITE8_MEMBER(nes_somari_device::mmc1_w)
// MMC3 Mode emulation
WRITE8_MEMBER(nes_somari_device::mmc3_w)
{
- UINT8 mmc_helper, cmd;
+ uint8_t mmc_helper, cmd;
assert(m_board_mode == 1);
@@ -244,7 +244,7 @@ WRITE8_MEMBER(nes_somari_device::mmc3_w)
// VRC2 Mode emulation
WRITE8_MEMBER(nes_somari_device::vrc2_w)
{
- UINT8 bank, shift;
+ uint8_t bank, shift;
assert(m_board_mode == 0);
@@ -293,7 +293,7 @@ void nes_somari_device::update_prg()
break;
case SOMARI_MMC3_MODE:
{
- UINT8 prg_flip = (m_latch & 0x40) ? 2 : 0;
+ uint8_t prg_flip = (m_latch & 0x40) ? 2 : 0;
prg8_x(0, m_mmc_prg_bank[0 ^ prg_flip]);
prg8_x(1, m_mmc_prg_bank[1]);
prg8_x(2, m_mmc_prg_bank[2 ^ prg_flip]);
@@ -303,7 +303,7 @@ void nes_somari_device::update_prg()
case SOMARI_MMC1_MODE:
// case SOMARI_MMC1_MODE_AGAIN:
{
- UINT8 prg_offset = m_mmc1_reg[1] & 0x10;
+ uint8_t prg_offset = m_mmc1_reg[1] & 0x10;
switch (m_mmc1_reg[0] & 0x0c)
{
@@ -335,7 +335,7 @@ void nes_somari_device::update_chr()
break;
case SOMARI_MMC3_MODE:
{
- UINT8 chr_page = (m_latch & 0x80) >> 5;
+ uint8_t chr_page = (m_latch & 0x80) >> 5;
chr1_x(chr_page ^ 0, m_chr_base | ((m_mmc_vrom_bank[0] & ~0x01)), CHRROM);
chr1_x(chr_page ^ 1, m_chr_base | ((m_mmc_vrom_bank[0] | 0x01)), CHRROM);
chr1_x(chr_page ^ 2, m_chr_base | ((m_mmc_vrom_bank[1] & ~0x01)), CHRROM);
diff --git a/src/devices/bus/nes/somari.h b/src/devices/bus/nes/somari.h
index 340bdc1d439..6ccb8b73867 100644
--- a/src/devices/bus/nes/somari.h
+++ b/src/devices/bus/nes/somari.h
@@ -12,7 +12,7 @@ class nes_somari_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_somari_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_somari_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -30,20 +30,20 @@ private:
void update_mirror();
void bank_update_switchmode();
- UINT8 m_board_mode;
+ uint8_t m_board_mode;
// MMC3 - inherited from txrom
- UINT8 m_mmc3_mirror_reg;
+ uint8_t m_mmc3_mirror_reg;
// MMC1
- UINT8 m_count;
- UINT8 m_mmc1_latch;
- UINT8 m_mmc1_reg[4];
+ uint8_t m_count;
+ uint8_t m_mmc1_latch;
+ uint8_t m_mmc1_reg[4];
// VRC2
- UINT8 m_vrc_prg_bank[2];
- UINT8 m_vrc_vrom_bank[8];
- UINT8 m_vrc_mirror_reg;
+ uint8_t m_vrc_prg_bank[2];
+ uint8_t m_vrc_vrom_bank[8];
+ uint8_t m_vrc_mirror_reg;
};
diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp
index 8cc1929b308..133bdcf2858 100644
--- a/src/devices/bus/nes/sunsoft.cpp
+++ b/src/devices/bus/nes/sunsoft.cpp
@@ -48,42 +48,42 @@ const device_type NES_SUNSOFT_FME7 = &device_creator<nes_sunsoft_fme7_device>;
const device_type NES_SUNSOFT_5 = &device_creator<nes_sunsoft_5_device>;
-nes_sunsoft_1_device::nes_sunsoft_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sunsoft_1_device::nes_sunsoft_1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SUNSOFT_1, "NES Cart Sunsoft 1 PCB", tag, owner, clock, "nes_sun1", __FILE__)
{
}
-nes_sunsoft_2_device::nes_sunsoft_2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sunsoft_2_device::nes_sunsoft_2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SUNSOFT_2, "NES Cart Sunsoft 2 PCB", tag, owner, clock, "nes_sun2", __FILE__)
{
}
-nes_sunsoft_3_device::nes_sunsoft_3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sunsoft_3_device::nes_sunsoft_3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SUNSOFT_3, "NES Cart Sunsoft 3 PCB", tag, owner, clock, "nes_sun3", __FILE__), m_irq_count(0), m_irq_enable(0), m_irq_toggle(0), irq_timer(nullptr)
{
}
-nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_reg(0), m_latch1(0), m_latch2(0), m_wram_enable(0)
{
}
-nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sunsoft_4_device::nes_sunsoft_4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SUNSOFT_4, "NES Cart Sunsoft 4 PCB", tag, owner, clock, "nes_sun4", __FILE__), m_reg(0), m_latch1(0), m_latch2(0), m_wram_enable(0)
{
}
-nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_wram_bank(0)
{
}
-nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sunsoft_fme7_device::nes_sunsoft_fme7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_SUNSOFT_4, "NES Cart Sunsoft FME7 PCB", tag, owner, clock, "nes_fme7", __FILE__), m_irq_count(0), m_irq_enable(0), irq_timer(nullptr), m_latch(0), m_wram_bank(0)
{
}
-nes_sunsoft_5_device::nes_sunsoft_5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sunsoft_5_device::nes_sunsoft_5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_sunsoft_fme7_device(mconfig, NES_SUNSOFT_5, "NES Cart Sunsoft 5A/5B PCB", tag, owner, clock, "nes_sun5", __FILE__),
m_ym2149(*this, "ay")
{
@@ -236,7 +236,7 @@ WRITE8_MEMBER(nes_sunsoft_1_device::write_m)
WRITE8_MEMBER(nes_sunsoft_2_device::write_h)
{
- UINT8 helper = (data & 0x07) | ((data & 0x80) ? 0x08 : 0x00);
+ uint8_t helper = (data & 0x07) | ((data & 0x80) ? 0x08 : 0x00);
LOG_MMC(("Sunsoft 2 write_h, offset: %04x, data: %02x\n", offset, data));
// this pcb is subject to bus conflict
@@ -534,7 +534,7 @@ WRITE8_MEMBER(nes_sunsoft_fme7_device::fme7_write)
WRITE8_MEMBER(nes_sunsoft_fme7_device::write_m)
{
- UINT8 bank = m_wram_bank & 0x3f;
+ uint8_t bank = m_wram_bank & 0x3f;
LOG_MMC(("Sunsoft FME7 write_m, offset: %04x, data: %02x\n", offset, data));
if (!(m_wram_bank & 0x40)) // is PRG ROM, no write
@@ -550,7 +550,7 @@ WRITE8_MEMBER(nes_sunsoft_fme7_device::write_m)
READ8_MEMBER(nes_sunsoft_fme7_device::read_m)
{
- UINT8 bank = m_wram_bank & 0x3f;
+ uint8_t bank = m_wram_bank & 0x3f;
LOG_MMC(("Sunsoft FME7 read_m, offset: %04x\n", offset));
if (!(m_wram_bank & 0x40)) // is PRG ROM
diff --git a/src/devices/bus/nes/sunsoft.h b/src/devices/bus/nes/sunsoft.h
index 8e55a80ce39..9a0d7561b9c 100644
--- a/src/devices/bus/nes/sunsoft.h
+++ b/src/devices/bus/nes/sunsoft.h
@@ -13,7 +13,7 @@ class nes_sunsoft_1_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sunsoft_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sunsoft_1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -29,7 +29,7 @@ class nes_sunsoft_2_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sunsoft_2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sunsoft_2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -45,7 +45,7 @@ class nes_sunsoft_3_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sunsoft_3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sunsoft_3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -55,7 +55,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT16 m_irq_count;
+ uint16_t m_irq_count;
int m_irq_enable, m_irq_toggle;
static const device_timer_id TIMER_IRQ = 0;
@@ -69,8 +69,8 @@ class nes_sunsoft_4_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sunsoft_4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_sunsoft_4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sunsoft_4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_sunsoft_4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -92,8 +92,8 @@ class nes_sunsoft_fme7_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_sunsoft_fme7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sunsoft_fme7_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_sunsoft_fme7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -106,14 +106,14 @@ public:
virtual void pcb_reset() override;
private:
- UINT16 m_irq_count;
+ uint16_t m_irq_count;
int m_irq_enable;
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
- UINT8 m_latch;
- UINT8 m_wram_bank;
+ uint8_t m_latch;
+ uint8_t m_wram_bank;
};
@@ -123,7 +123,7 @@ class nes_sunsoft_5_device : public nes_sunsoft_fme7_device
{
public:
// construction/destruction
- nes_sunsoft_5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sunsoft_5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nes/sunsoft_dcs.cpp b/src/devices/bus/nes/sunsoft_dcs.cpp
index 40c9c69bff0..5e3fc043259 100644
--- a/src/devices/bus/nes/sunsoft_dcs.cpp
+++ b/src/devices/bus/nes/sunsoft_dcs.cpp
@@ -50,7 +50,7 @@ ntb_cart_interface::~ntb_cart_interface()
const device_type NES_NTB_SLOT = &device_creator<nes_ntb_slot_device>;
-nes_ntb_slot_device::nes_ntb_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_ntb_slot_device::nes_ntb_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_NTB_SLOT, "NES NTB Cartridge Slot", tag, owner, clock, "nes_ntb_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr)
@@ -80,7 +80,7 @@ image_init_result nes_ntb_slot_device::call_load()
{
if (m_cart)
{
- UINT8 *ROM = m_cart->get_cart_base();
+ uint8_t *ROM = m_cart->get_cart_base();
if (!ROM)
return image_init_result::FAIL;
@@ -122,7 +122,7 @@ ROM_END
const device_type NES_NTB_ROM = &device_creator<nes_ntb_rom_device>;
-nes_ntb_rom_device::nes_ntb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ntb_rom_device::nes_ntb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, NES_NTB_ROM, "NES NTB ROM", tag, owner, clock, "nes_ntbrom", __FILE__),
ntb_cart_interface( mconfig, *this )
{
@@ -130,7 +130,7 @@ nes_ntb_rom_device::nes_ntb_rom_device(const machine_config &mconfig, const char
void nes_ntb_rom_device::device_start()
{
- m_rom = (UINT8*)memregion("ntbrom")->base();
+ m_rom = (uint8_t*)memregion("ntbrom")->base();
}
const tiny_rom_entry *nes_ntb_rom_device::device_rom_region() const
@@ -138,7 +138,7 @@ const tiny_rom_entry *nes_ntb_rom_device::device_rom_region() const
return ROM_NAME( ntb_rom );
}
-UINT8 *nes_ntb_rom_device::get_cart_base()
+uint8_t *nes_ntb_rom_device::get_cart_base()
{
return m_rom;
}
@@ -156,7 +156,7 @@ UINT8 *nes_ntb_rom_device::get_cart_base()
const device_type NES_SUNSOFT_DCS = &device_creator<nes_sunsoft_dcs_device>;
-nes_sunsoft_dcs_device::nes_sunsoft_dcs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_sunsoft_dcs_device::nes_sunsoft_dcs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_sunsoft_4_device(mconfig, NES_SUNSOFT_DCS, "NES Cart Sunsoft DCS PCB", tag, owner, clock, "nes_dcs", __FILE__), m_timer_on(0), m_exrom_enable(0),
m_subslot(*this, "ntb_slot"), ntb_enable_timer(nullptr)
{
diff --git a/src/devices/bus/nes/sunsoft_dcs.h b/src/devices/bus/nes/sunsoft_dcs.h
index 2428632824a..5aa8590c3ae 100644
--- a/src/devices/bus/nes/sunsoft_dcs.h
+++ b/src/devices/bus/nes/sunsoft_dcs.h
@@ -25,11 +25,11 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(read) { return m_rom[offset]; }
- UINT8 *get_cart_base() { return m_rom; }
+ uint8_t *get_cart_base() { return m_rom; }
protected:
// internal state
- UINT8 *m_rom;
+ uint8_t *m_rom;
};
// ======================> nes_ntb_slot_device
@@ -40,7 +40,7 @@ class nes_ntb_slot_device : public device_t,
{
public:
// construction/destruction
- nes_ntb_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ntb_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~nes_ntb_slot_device();
// device-level overrides
@@ -90,11 +90,11 @@ class nes_ntb_rom_device : public device_t,
{
public:
// construction/destruction
- nes_ntb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ntb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
- virtual UINT8* get_cart_base();
+ virtual uint8_t* get_cart_base();
protected:
// device-level overrides
@@ -120,7 +120,7 @@ class nes_sunsoft_dcs_device : public nes_sunsoft_4_device
{
public:
// construction/destruction
- nes_sunsoft_dcs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_sunsoft_dcs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/taito.cpp b/src/devices/bus/nes/taito.cpp
index 6d3a4e68941..38f156080ae 100644
--- a/src/devices/bus/nes/taito.cpp
+++ b/src/devices/bus/nes/taito.cpp
@@ -47,27 +47,27 @@ const device_type NES_X1_005 = &device_creator<nes_x1_005_device>;
const device_type NES_X1_017 = &device_creator<nes_x1_017_device>;
-nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tc0190fmc_device::nes_tc0190fmc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_TC0190FMC, "NES Cart Taito TC0190FMC PCB", tag, owner, clock, "nes_tc0190fmc", __FILE__)
{
}
-nes_tc0190fmc_pal16r4_device::nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tc0190fmc_pal16r4_device::nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_tc0190fmc_device(mconfig, NES_TC0190FMC_PAL16R4, "NES Cart Taito TC0190FMC + PAL16R4 PCB", tag, owner, clock, "nes_tc0190pal", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0)
{
}
-nes_x1_005_device::nes_x1_005_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_x1_005_device::nes_x1_005_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_X1_005, "NES Cart Taito X1-005 PCB", tag, owner, clock, "nes_x1_005", __FILE__), m_latch(0)
{
}
-nes_x1_017_device::nes_x1_017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_x1_017_device::nes_x1_017_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_X1_017, "NES Cart Taito X1-017 PCB", tag, owner, clock, "nes_x1_017", __FILE__), m_latch(0)
{
}
diff --git a/src/devices/bus/nes/taito.h b/src/devices/bus/nes/taito.h
index 38fa05d960c..8d33ecd4c5e 100644
--- a/src/devices/bus/nes/taito.h
+++ b/src/devices/bus/nes/taito.h
@@ -12,8 +12,8 @@ class nes_tc0190fmc_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_tc0190fmc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_tc0190fmc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tc0190fmc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_tc0190fmc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -30,7 +30,7 @@ class nes_tc0190fmc_pal16r4_device : public nes_tc0190fmc_device
{
public:
// construction/destruction
- nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -40,7 +40,7 @@ public:
virtual void pcb_reset() override;
private:
- UINT16 m_irq_count, m_irq_count_latch;
+ uint16_t m_irq_count, m_irq_count_latch;
int m_irq_enable;
};
@@ -51,7 +51,7 @@ class nes_x1_005_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_x1_005_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_x1_005_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -61,9 +61,9 @@ public:
virtual void pcb_reset() override;
private:
- UINT8 m_latch;
+ uint8_t m_latch;
// Taito X1-005 chip contains 80 bytes of internal ram, possibly battery backed up
- UINT8 m_x1_005_ram[0x80];
+ uint8_t m_x1_005_ram[0x80];
};
@@ -73,7 +73,7 @@ class nes_x1_017_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_x1_017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_x1_017_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -84,11 +84,11 @@ public:
private:
void set_chr();
- UINT8 m_latch;
- UINT8 m_reg[3]; //mapper ram protect
- UINT8 m_mmc_vrom_bank[6];
+ uint8_t m_latch;
+ uint8_t m_reg[3]; //mapper ram protect
+ uint8_t m_mmc_vrom_bank[6];
// Taito X1-017 chip contains 5K of internal ram, battery backed up
- UINT8 m_x1_017_ram[0x1400];
+ uint8_t m_x1_017_ram[0x1400];
};
diff --git a/src/devices/bus/nes/tengen.cpp b/src/devices/bus/nes/tengen.cpp
index 828519a0e71..af37dc223e0 100644
--- a/src/devices/bus/nes/tengen.cpp
+++ b/src/devices/bus/nes/tengen.cpp
@@ -43,22 +43,22 @@ const device_type NES_TENGEN_800032 = &device_creator<nes_tengen032_device>;
const device_type NES_TENGEN_800037 = &device_creator<nes_tengen037_device>;
-nes_tengen008_device::nes_tengen008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tengen008_device::nes_tengen008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_TENGEN_800008, "NES Cart Tengen 800008 PCB", tag, owner, clock, "nes_tengen008", __FILE__)
{
}
-nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_reset(0), m_irq_enable(0), m_latch(0), irq_timer(nullptr)
{
}
-nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tengen032_device::nes_tengen032_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_TENGEN_800032, "NES Cart Tengen 800032 PCB", tag, owner, clock, "nes_tengen032", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_mode(0), m_irq_reset(0), m_irq_enable(0), m_latch(0), irq_timer(nullptr)
{
}
-nes_tengen037_device::nes_tengen037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_tengen037_device::nes_tengen037_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_tengen032_device(mconfig, NES_TENGEN_800037, "NES Cart Tengen 800037 PCB", tag, owner, clock, "nes_tengen037", __FILE__)
{
}
@@ -204,7 +204,7 @@ void nes_tengen032_device::hblank_irq(int scanline, int vblank, int blanked)
void nes_tengen032_device::set_prg()
{
- UINT8 prg_mode = m_latch & 0x40;
+ uint8_t prg_mode = m_latch & 0x40;
prg8_89(m_mmc_prg_bank[prg_mode ? 2: 0]);
prg8_ab(m_mmc_prg_bank[prg_mode ? 0: 1]);
@@ -218,7 +218,7 @@ void nes_tengen032_device::chr_cb(int start, int bank, int source)
void nes_tengen032_device::set_chr()
{
- UINT8 chr_page = (m_latch & 0x80) >> 5;
+ uint8_t chr_page = (m_latch & 0x80) >> 5;
if (m_latch & 0x20)
{
@@ -243,7 +243,7 @@ void nes_tengen032_device::set_chr()
WRITE8_MEMBER(nes_tengen032_device::tengen032_write)
{
- UINT8 helper, cmd;
+ uint8_t helper, cmd;
LOG_MMC(("tengen032_write, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x6001)
diff --git a/src/devices/bus/nes/tengen.h b/src/devices/bus/nes/tengen.h
index d812443b613..3fb9cba0c88 100644
--- a/src/devices/bus/nes/tengen.h
+++ b/src/devices/bus/nes/tengen.h
@@ -12,7 +12,7 @@ class nes_tengen008_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_tengen008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tengen008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -28,8 +28,8 @@ class nes_tengen032_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_tengen032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_tengen032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tengen032_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_tengen032_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -46,13 +46,13 @@ protected:
void set_chr();
void irq_clock(int blanked);
- UINT16 m_irq_count, m_irq_count_latch;
- UINT8 m_irq_mode, m_irq_reset;
+ uint16_t m_irq_count, m_irq_count_latch;
+ uint8_t m_irq_mode, m_irq_reset;
int m_irq_enable;
- UINT8 m_latch;
- UINT8 m_mmc_prg_bank[3];
- UINT8 m_mmc_vrom_bank[8];
+ uint8_t m_latch;
+ uint8_t m_mmc_prg_bank[3];
+ uint8_t m_mmc_vrom_bank[8];
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
@@ -66,7 +66,7 @@ class nes_tengen037_device : public nes_tengen032_device
{
public:
// construction/destruction
- nes_tengen037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_tengen037_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
diff --git a/src/devices/bus/nes/txc.cpp b/src/devices/bus/nes/txc.cpp
index 8392ed61a68..daa01bca558 100644
--- a/src/devices/bus/nes/txc.cpp
+++ b/src/devices/bus/nes/txc.cpp
@@ -44,32 +44,32 @@ const device_type NES_TXC_STRIKEW = &device_creator<nes_txc_strikew_device>;
const device_type NES_TXC_COMMANDOS = &device_creator<nes_txc_commandos_device>;
-nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_nrom_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_txc_22211_device::nes_txc_22211_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_TXC_22211, "NES Cart TXC 22211 PCB", tag, owner, clock, "nes_txc_22211", __FILE__)
{
}
-nes_txc_dumarc_device::nes_txc_dumarc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_txc_dumarc_device::nes_txc_dumarc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txc_22211_device(mconfig, NES_TXC_DUMARACING, "NES Cart TXC Du Ma Racing PCB", tag, owner, clock, "nes_dumarc", __FILE__)
{
}
-nes_txc_mjblock_device::nes_txc_mjblock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_txc_mjblock_device::nes_txc_mjblock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txc_22211_device(mconfig, NES_TXC_MJBLOCK, "NES Cart TXC Mahjong Block PCB", tag, owner, clock, "nes_mjblock", __FILE__)
{
}
-nes_txc_strikew_device::nes_txc_strikew_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_txc_strikew_device::nes_txc_strikew_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_TXC_STRIKEW, "NES Cart Strike Wolf PCB", tag, owner, clock, "nes_txc_strikew", __FILE__)
{
}
-nes_txc_commandos_device::nes_txc_commandos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_txc_commandos_device::nes_txc_commandos_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_TXC_COMMANDOS, "NES Cart Commandos (and others) PCB", tag, owner, clock, "nes_txc_comm", __FILE__)
{
}
diff --git a/src/devices/bus/nes/txc.h b/src/devices/bus/nes/txc.h
index cd190c51f37..b8c11dddd20 100644
--- a/src/devices/bus/nes/txc.h
+++ b/src/devices/bus/nes/txc.h
@@ -12,8 +12,8 @@ class nes_txc_22211_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_txc_22211_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_txc_22211_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_txc_22211_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_txc_22211_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -24,7 +24,7 @@ public:
virtual void pcb_reset() override;
protected:
- UINT8 m_reg[4];
+ uint8_t m_reg[4];
};
@@ -34,7 +34,7 @@ class nes_txc_dumarc_device : public nes_txc_22211_device
{
public:
// construction/destruction
- nes_txc_dumarc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_txc_dumarc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -47,7 +47,7 @@ class nes_txc_mjblock_device : public nes_txc_22211_device
{
public:
// construction/destruction
- nes_txc_mjblock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_txc_mjblock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_READ8_MEMBER(read_l) override;
@@ -60,7 +60,7 @@ class nes_txc_strikew_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_txc_strikew_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_txc_strikew_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -76,7 +76,7 @@ class nes_txc_commandos_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_txc_commandos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_txc_commandos_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/nes/waixing.cpp b/src/devices/bus/nes/waixing.cpp
index f4dbd58d718..509797a22ab 100644
--- a/src/devices/bus/nes/waixing.cpp
+++ b/src/devices/bus/nes/waixing.cpp
@@ -56,117 +56,117 @@ const device_type NES_WAIXING_WXZS2 = &device_creator<nes_waixing_wxzs2_device>;
const device_type NES_WAIXING_FS304 = &device_creator<nes_waixing_fs304_device>;
-nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_txrom_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_a_device::nes_waixing_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_WAIXING_A, "NES Cart Waixing Type A PCB", tag, owner, clock, "nes_waixing_a", __FILE__)
{
}
-nes_waixing_a1_device::nes_waixing_a1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_a1_device::nes_waixing_a1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_A1, "NES Cart Waixing Type A (Alt) PCB", tag, owner, clock, "nes_waixing_a1", __FILE__)
{
}
-nes_waixing_b_device::nes_waixing_b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_b_device::nes_waixing_b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_B, "NES Cart Waixing Type B PCB", tag, owner, clock, "nes_waixing_b", __FILE__)
{
}
-nes_waixing_c_device::nes_waixing_c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_c_device::nes_waixing_c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_C, "NES Cart Waixing Type C PCB", tag, owner, clock, "nes_waixing_c", __FILE__)
{
}
-nes_waixing_d_device::nes_waixing_d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_d_device::nes_waixing_d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_D, "NES Cart Waixing Type D PCB", tag, owner, clock, "nes_waixing_d", __FILE__)
{
}
-nes_waixing_e_device::nes_waixing_e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_e_device::nes_waixing_e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_E, "NES Cart Waixing Type E PCB", tag, owner, clock, "nes_waixing_e", __FILE__)
{
}
-nes_waixing_f_device::nes_waixing_f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_f_device::nes_waixing_f_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_F, "NES Cart Waixing Type F PCB", tag, owner, clock, "nes_waixing_f", __FILE__)
{
}
-nes_waixing_g_device::nes_waixing_g_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_g_device::nes_waixing_g_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_G, "NES Cart Waixing Type G PCB", tag, owner, clock, "nes_waixing_g", __FILE__)
{
}
-nes_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: nes_txrom_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-nes_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_h_device::nes_waixing_h_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_WAIXING_H, "NES Cart Waixing Type H PCB", tag, owner, clock, "nes_waixing_h", __FILE__)
{
}
-nes_waixing_h1_device::nes_waixing_h1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_h1_device::nes_waixing_h1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_waixing_h_device(mconfig, NES_WAIXING_H1, "NES Cart Waixing Type H (Alt) PCB", tag, owner, clock, "nes_waixing_h1", __FILE__)
{
}
-nes_waixing_i_device::nes_waixing_i_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_i_device::nes_waixing_i_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_I, "NES Cart Waixing Type I PCB", tag, owner, clock, "nes_waixing_i", __FILE__)
{
}
-nes_waixing_j_device::nes_waixing_j_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_j_device::nes_waixing_j_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_waixing_a_device(mconfig, NES_WAIXING_J, "NES Cart Waixing Type J PCB", tag, owner, clock, "nes_waixing_j", __FILE__)
{
}
-nes_waixing_sh2_device::nes_waixing_sh2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_sh2_device::nes_waixing_sh2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_WAIXING_SH2, "NES Cart Waixing SH2 PCB", tag, owner, clock, "nes_waixing_sh2", __FILE__)
{
}
-nes_waixing_sec_device::nes_waixing_sec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_sec_device::nes_waixing_sec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_txrom_device(mconfig, NES_WAIXING_SEC, "NES Cart Waixing Security Chip PCB", tag, owner, clock, "nes_waixing_sec", __FILE__), m_reg(0)
{
}
-nes_waixing_sgz_device::nes_waixing_sgz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_sgz_device::nes_waixing_sgz_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_WAIXING_SGZ, "NES Cart Waixing San Guo Zhi PCB", tag, owner, clock, "nes_waixing_sgz", __FILE__), m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_enable_latch(0)
{
}
-nes_waixing_sgzlz_device::nes_waixing_sgzlz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_sgzlz_device::nes_waixing_sgzlz_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_WAIXING_SGZLZ, "NES Cart Waixing San Guo Zhong Lie Zhuan PCB", tag, owner, clock, "nes_waixing_sgzlz", __FILE__), m_latch(0)
{
}
-nes_waixing_ffv_device::nes_waixing_ffv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_ffv_device::nes_waixing_ffv_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_WAIXING_FFV, "NES Cart Waixing Final Fantasy V PCB", tag, owner, clock, "nes_waixing_ffv", __FILE__)
{
}
-nes_waixing_wxzs_device::nes_waixing_wxzs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_wxzs_device::nes_waixing_wxzs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_WAIXING_WXZS, "NES Cart Waixing Wai Xing Zhan Shi PCB", tag, owner, clock, "nes_waixing_wxzs", __FILE__)
{
}
-nes_waixing_dq8_device::nes_waixing_dq8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_dq8_device::nes_waixing_dq8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_WAIXING_DQ8, "NES Cart Waixing Dragon Quest VIII PCB", tag, owner, clock, "nes_waixing_dq8", __FILE__)
{
}
-nes_waixing_wxzs2_device::nes_waixing_wxzs2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_wxzs2_device::nes_waixing_wxzs2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_WAIXING_WXZS2, "NES Cart Waixing Wai Xing Zhan Shi 2 PCB", tag, owner, clock, "nes_waixing_wxzs2", __FILE__)
{
}
-nes_waixing_fs304_device::nes_waixing_fs304_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_waixing_fs304_device::nes_waixing_fs304_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: nes_nrom_device(mconfig, NES_WAIXING_FS304, "NES Cart Waixing FS-304 PCB", tag, owner, clock, "nes_waixing_fs304", __FILE__)
{
}
@@ -401,7 +401,7 @@ void nes_waixing_fs304_device::pcb_reset()
-------------------------------------------------*/
/* MIRROR_LOW and MIRROR_HIGH are swapped! */
-void nes_waixing_a_device::set_mirror(UINT8 nt)
+void nes_waixing_a_device::set_mirror(uint8_t nt)
{
switch (nt)
{
@@ -591,7 +591,7 @@ void nes_waixing_f_device::prg_cb(int start, int bank)
void nes_waixing_f_device::set_prg( int prg_base, int prg_mask )
{
- UINT8 prg_flip = (m_latch & 0x40) ? 2 : 0;
+ uint8_t prg_flip = (m_latch & 0x40) ? 2 : 0;
prg_cb(0, m_mmc_prg_bank[0 ^ prg_flip]);
prg_cb(1, m_mmc_prg_bank[1]);
@@ -601,7 +601,7 @@ void nes_waixing_f_device::set_prg( int prg_base, int prg_mask )
WRITE8_MEMBER(nes_waixing_f_device::write_h)
{
- UINT8 cmd;
+ uint8_t cmd;
LOG_MMC(("waixing_f write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x6001)
@@ -656,9 +656,9 @@ void nes_waixing_g_device::chr_cb(int start, int bank, int source)
chr1_x(start, bank, chr_src);
}
-void nes_waixing_g_device::set_chr(UINT8 chr, int chr_base, int chr_mask)
+void nes_waixing_g_device::set_chr(uint8_t chr, int chr_base, int chr_mask)
{
- UINT8 chr_page = (m_latch & 0x80) >> 5;
+ uint8_t chr_page = (m_latch & 0x80) >> 5;
chr_cb(chr_page ^ 0, chr_base | (m_mmc_vrom_bank[0] & chr_mask), chr);
chr_cb(chr_page ^ 1, chr_base | (m_mmc_vrom_bank[6] & chr_mask), chr);
@@ -672,7 +672,7 @@ void nes_waixing_g_device::set_chr(UINT8 chr, int chr_base, int chr_mask)
WRITE8_MEMBER(nes_waixing_g_device::write_h)
{
- UINT8 cmd;
+ uint8_t cmd;
LOG_MMC(("waixing_g write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x6001)
@@ -735,7 +735,7 @@ void nes_waixing_h_device::chr_cb(int start, int bank, int source)
WRITE8_MEMBER(nes_waixing_h_device::write_h)
{
- UINT8 cmd;
+ uint8_t cmd;
LOG_MMC(("waixing_h write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x6001)
@@ -776,7 +776,7 @@ WRITE8_MEMBER(nes_waixing_h_device::write_h)
WRITE8_MEMBER(nes_waixing_h1_device::write_h)
{
- UINT8 cmd;
+ uint8_t cmd;
LOG_MMC(("waixing_h1 write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x6001)
@@ -826,7 +826,7 @@ WRITE8_MEMBER(nes_waixing_h1_device::write_h)
void nes_waixing_j_device::set_prg( int prg_base, int prg_mask )
{
- UINT8 prg_flip = (m_latch & 0x40) ? 2 : 0;
+ uint8_t prg_flip = (m_latch & 0x40) ? 2 : 0;
prg_cb(0, m_reg[0 ^ prg_flip]);
prg_cb(1, m_reg[1]);
@@ -836,7 +836,7 @@ void nes_waixing_j_device::set_prg( int prg_base, int prg_mask )
WRITE8_MEMBER(nes_waixing_j_device::write_h)
{
- UINT8 cmd;
+ uint8_t cmd;
LOG_MMC(("waixing_f write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x6001)
@@ -892,7 +892,7 @@ void nes_waixing_sh2_device::chr_cb(int start, int bank, int source)
READ8_MEMBER(nes_waixing_sh2_device::chr_r)
{
int bank = offset >> 10;
- UINT8 val = m_chr_access[bank][offset & 0x3ff]; // this would be usual return value
+ uint8_t val = m_chr_access[bank][offset & 0x3ff]; // this would be usual return value
int chr_helper;
switch (offset & 0xff8)
@@ -983,7 +983,7 @@ void nes_waixing_sgz_device::hblank_irq(int scanline, int vblank, int blanked)
WRITE8_MEMBER(nes_waixing_sgz_device::write_h)
{
- UINT8 helper, bank;
+ uint8_t helper, bank;
LOG_MMC(("waixing_sgz write_h, offset: %04x, data: %02x\n", offset, data));
switch (offset & 0x7000)
@@ -1077,7 +1077,7 @@ WRITE8_MEMBER(nes_waixing_sgzlz_device::write_l)
WRITE8_MEMBER(nes_waixing_ffv_device::write_l)
{
- UINT8 helper;
+ uint8_t helper;
LOG_MMC(("waixing_ffv write_l, offset: %04x, data: %02x\n", offset, data));
offset += 0x100; /* the checks work better on addresses */
@@ -1177,8 +1177,8 @@ WRITE8_MEMBER(nes_waixing_dq8_device::write_h)
WRITE8_MEMBER(nes_waixing_wxzs2_device::write_h)
{
- UINT8 flip = (data & 0x80) >> 7;
- UINT8 helper = (data & 0x7f) << 1;
+ uint8_t flip = (data & 0x80) >> 7;
+ uint8_t helper = (data & 0x7f) << 1;
LOG_MMC(("waixing_wxzs2 write_h, offset: %04x, data: %02x\n", offset, data));
diff --git a/src/devices/bus/nes/waixing.h b/src/devices/bus/nes/waixing.h
index 132b3673cee..98d03b725b7 100644
--- a/src/devices/bus/nes/waixing.h
+++ b/src/devices/bus/nes/waixing.h
@@ -12,8 +12,8 @@ class nes_waixing_a_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_waixing_a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_waixing_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_waixing_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -26,8 +26,8 @@ public:
virtual void pcb_reset() override;
protected:
- void set_mirror(UINT8 nt);
- UINT8 mapper_ram[0x400];
+ void set_mirror(uint8_t nt);
+ uint8_t mapper_ram[0x400];
};
@@ -37,7 +37,7 @@ class nes_waixing_a1_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_a1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_a1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void chr_cb(int start, int bank, int source) override;
};
@@ -49,7 +49,7 @@ class nes_waixing_b_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void chr_cb(int start, int bank, int source) override;
@@ -62,7 +62,7 @@ class nes_waixing_c_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void chr_cb(int start, int bank, int source) override;
@@ -75,7 +75,7 @@ class nes_waixing_d_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void chr_cb(int start, int bank, int source) override;
@@ -88,7 +88,7 @@ class nes_waixing_e_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void chr_cb(int start, int bank, int source) override;
@@ -101,7 +101,7 @@ class nes_waixing_f_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_f_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -120,7 +120,7 @@ class nes_waixing_g_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_g_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_g_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -129,7 +129,7 @@ public:
virtual void pcb_reset() override;
protected:
- virtual void set_chr(UINT8 chr, int chr_base, int chr_mask) override;
+ virtual void set_chr(uint8_t chr, int chr_base, int chr_mask) override;
};
@@ -139,8 +139,8 @@ class nes_waixing_h_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_waixing_h_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_waixing_h_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_h_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_waixing_h_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -156,7 +156,7 @@ class nes_waixing_h1_device : public nes_waixing_h_device
{
public:
// construction/destruction
- nes_waixing_h1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_h1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual DECLARE_WRITE8_MEMBER(write_h) override;
@@ -171,7 +171,7 @@ class nes_waixing_i_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_i_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_i_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// still to emulate this variant
};
@@ -183,7 +183,7 @@ class nes_waixing_j_device : public nes_waixing_a_device
{
public:
// construction/destruction
- nes_waixing_j_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_j_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -193,7 +193,7 @@ public:
protected:
virtual void set_prg(int prg_base, int prg_mask) override;
- UINT8 m_reg[4];
+ uint8_t m_reg[4];
};
@@ -203,7 +203,7 @@ class nes_waixing_sh2_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_waixing_sh2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_sh2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -213,7 +213,7 @@ public:
virtual void pcb_reset() override;
protected:
- UINT8 m_reg[2];
+ uint8_t m_reg[2];
};
@@ -223,7 +223,7 @@ class nes_waixing_sec_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_waixing_sec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_sec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -234,7 +234,7 @@ public:
virtual void pcb_reset() override;
protected:
- UINT8 m_reg;
+ uint8_t m_reg;
};
@@ -244,7 +244,7 @@ class nes_waixing_sgz_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_waixing_sgz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_sgz_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -254,10 +254,10 @@ public:
virtual void pcb_reset() override;
protected:
- UINT16 m_irq_count, m_irq_count_latch;
+ uint16_t m_irq_count, m_irq_count_latch;
int m_irq_enable, m_irq_enable_latch;
- UINT8 m_mmc_vrom_bank[8];
+ uint8_t m_mmc_vrom_bank[8];
};
@@ -267,7 +267,7 @@ class nes_waixing_sgzlz_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_waixing_sgzlz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_sgzlz_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -276,7 +276,7 @@ public:
virtual void pcb_reset() override;
protected:
- UINT8 m_latch;
+ uint8_t m_latch;
};
@@ -286,7 +286,7 @@ class nes_waixing_ffv_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_waixing_ffv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_ffv_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -295,7 +295,7 @@ public:
virtual void pcb_reset() override;
protected:
- UINT8 m_reg[2];
+ uint8_t m_reg[2];
};
@@ -305,7 +305,7 @@ class nes_waixing_wxzs_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_waixing_wxzs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_wxzs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -321,7 +321,7 @@ class nes_waixing_dq8_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_waixing_dq8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_dq8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -337,7 +337,7 @@ class nes_waixing_wxzs2_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_waixing_wxzs2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_wxzs2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -353,7 +353,7 @@ class nes_waixing_fs304_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_waixing_fs304_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_waixing_fs304_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -362,7 +362,7 @@ public:
virtual void pcb_reset() override;
protected:
- UINT8 m_reg[4];
+ uint8_t m_reg[4];
};
diff --git a/src/devices/bus/nes_ctrl/4score.cpp b/src/devices/bus/nes_ctrl/4score.cpp
index e5adb5feb97..f1d602090b6 100644
--- a/src/devices/bus/nes_ctrl/4score.cpp
+++ b/src/devices/bus/nes_ctrl/4score.cpp
@@ -110,20 +110,20 @@ ioport_constructor nes_4score_p2p4_device::device_input_ports() const
// nes_4score_device - constructor
//-------------------------------------------------
-nes_4score_device::nes_4score_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_4score_device::nes_4score_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nes_control_port_interface(mconfig, *this), m_latch(0)
{
}
-nes_4score_p1p3_device::nes_4score_p1p3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_4score_p1p3_device::nes_4score_p1p3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
nes_4score_device(mconfig, NES_4SCORE_P1P3, "Nintendo Four Score Adapter P1/P3", tag, owner, clock, "nes_4score_p1p3", __FILE__),
m_joypad1(*this, "PAD1"),
m_joypad3(*this, "PAD3")
{
}
-nes_4score_p2p4_device::nes_4score_p2p4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_4score_p2p4_device::nes_4score_p2p4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
nes_4score_device(mconfig, NES_4SCORE_P2P4, "Nintendo Four Score Adapter P2/P4", tag, owner, clock, "nes_4score_p2p4", __FILE__),
m_joypad2(*this, "PAD2"),
m_joypad4(*this, "PAD4")
@@ -155,9 +155,9 @@ void nes_4score_device::device_reset()
// read
//-------------------------------------------------
-UINT8 nes_4score_device::read_bit0()
+uint8_t nes_4score_device::read_bit0()
{
- UINT8 ret = m_latch & 1;
+ uint8_t ret = m_latch & 1;
m_latch >>= 1;
return ret;
}
@@ -166,7 +166,7 @@ UINT8 nes_4score_device::read_bit0()
// write
//-------------------------------------------------
-void nes_4score_p1p3_device::write(UINT8 data)
+void nes_4score_p1p3_device::write(uint8_t data)
{
if (data & 0x01)
return;
@@ -177,7 +177,7 @@ void nes_4score_p1p3_device::write(UINT8 data)
m_latch |= (0x08 << 16); // signature
}
-void nes_4score_p2p4_device::write(UINT8 data)
+void nes_4score_p2p4_device::write(uint8_t data)
{
if (data & 0x01)
return;
diff --git a/src/devices/bus/nes_ctrl/4score.h b/src/devices/bus/nes_ctrl/4score.h
index c05cb403b39..543e9b85414 100644
--- a/src/devices/bus/nes_ctrl/4score.h
+++ b/src/devices/bus/nes_ctrl/4score.h
@@ -26,17 +26,17 @@ class nes_4score_device : public device_t,
{
public:
// construction/destruction
- nes_4score_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nes_4score_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_bit0() override;
+ virtual uint8_t read_bit0() override;
protected:
- UINT32 m_latch;
+ uint32_t m_latch;
};
// ======================> nes_4score_p1p3_device
@@ -45,12 +45,12 @@ class nes_4score_p1p3_device : public nes_4score_device
{
public:
// construction/destruction
- nes_4score_p1p3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_4score_p1p3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
protected:
- virtual void write(UINT8 data) override;
+ virtual void write(uint8_t data) override;
private:
required_ioport m_joypad1;
@@ -63,12 +63,12 @@ class nes_4score_p2p4_device : public nes_4score_device
{
public:
// construction/destruction
- nes_4score_p2p4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_4score_p2p4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
protected:
- virtual void write(UINT8 data) override;
+ virtual void write(uint8_t data) override;
private:
required_ioport m_joypad2;
diff --git a/src/devices/bus/nes_ctrl/arkpaddle.cpp b/src/devices/bus/nes_ctrl/arkpaddle.cpp
index 15755d283ca..7f47510d551 100644
--- a/src/devices/bus/nes_ctrl/arkpaddle.cpp
+++ b/src/devices/bus/nes_ctrl/arkpaddle.cpp
@@ -44,7 +44,7 @@ ioport_constructor nes_vaus_device::device_input_ports() const
// nes_vaus_device - constructor
//-------------------------------------------------
-nes_vaus_device::nes_vaus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+nes_vaus_device::nes_vaus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nes_control_port_interface(mconfig, *this),
m_paddle(*this, "PADDLE"),
@@ -52,7 +52,7 @@ nes_vaus_device::nes_vaus_device(const machine_config &mconfig, device_type type
{
}
-nes_vaus_device::nes_vaus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_vaus_device::nes_vaus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_ARKPADDLE, "NES Arkanoid Vaus Controller", tag, owner, clock, "nes_vaus", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_paddle(*this, "PADDLE"),
@@ -60,7 +60,7 @@ nes_vaus_device::nes_vaus_device(const machine_config &mconfig, const char *tag,
{
}
-nes_vausfc_device::nes_vausfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_vausfc_device::nes_vausfc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
nes_vaus_device(mconfig, NES_ARKPADDLE_FC, "FC Arkanoid Vaus Controller", tag, owner, clock, "nes_vausfc", __FILE__)
{
}
@@ -92,18 +92,18 @@ void nes_vaus_device::device_reset()
// read
//-------------------------------------------------
-UINT8 nes_vaus_device::read_bit34()
+uint8_t nes_vaus_device::read_bit34()
{
- UINT8 ret = (m_button->read() << 3);
+ uint8_t ret = (m_button->read() << 3);
ret |= (m_latch & 0x80) >> 3;
m_latch <<= 1;
m_latch &= 0xff;
return ret;
}
-UINT8 nes_vausfc_device::read_exp(offs_t offset)
+uint8_t nes_vausfc_device::read_exp(offs_t offset)
{
- UINT8 ret;
+ uint8_t ret;
if (offset == 0) //$4016
ret = m_button->read() << 1;
else //$4017
@@ -119,12 +119,12 @@ UINT8 nes_vausfc_device::read_exp(offs_t offset)
// write
//-------------------------------------------------
-void nes_vaus_device::write(UINT8 data)
+void nes_vaus_device::write(uint8_t data)
{
int old = m_start_conv;
if (data == 0 && old == 1)
- m_latch = (UINT8) (m_paddle->read() ^ 0xff);
+ m_latch = (uint8_t) (m_paddle->read() ^ 0xff);
m_start_conv = data;
}
diff --git a/src/devices/bus/nes_ctrl/arkpaddle.h b/src/devices/bus/nes_ctrl/arkpaddle.h
index d693bb7c0b7..13bd03f7e02 100644
--- a/src/devices/bus/nes_ctrl/arkpaddle.h
+++ b/src/devices/bus/nes_ctrl/arkpaddle.h
@@ -27,8 +27,8 @@ class nes_vaus_device : public device_t,
{
public:
// construction/destruction
- nes_vaus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_vaus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_vaus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_vaus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -38,13 +38,13 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_bit34() override;
- virtual void write(UINT8 data) override;
+ virtual uint8_t read_bit34() override;
+ virtual void write(uint8_t data) override;
required_ioport m_paddle;
required_ioport m_button;
- UINT8 m_start_conv;
- UINT32 m_latch;
+ uint8_t m_start_conv;
+ uint32_t m_latch;
};
@@ -54,11 +54,11 @@ class nes_vausfc_device : public nes_vaus_device
{
public:
// construction/destruction
- nes_vausfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_vausfc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
- virtual UINT8 read_bit34() override { return 0; }
- virtual UINT8 read_exp(offs_t offset) override;
+ virtual uint8_t read_bit34() override { return 0; }
+ virtual uint8_t read_exp(offs_t offset) override;
};
diff --git a/src/devices/bus/nes_ctrl/bcbattle.cpp b/src/devices/bus/nes_ctrl/bcbattle.cpp
index 336a14e92c8..04491e262c0 100644
--- a/src/devices/bus/nes_ctrl/bcbattle.cpp
+++ b/src/devices/bus/nes_ctrl/bcbattle.cpp
@@ -81,7 +81,7 @@ void nes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, int
// nes_bcbattle_device - constructor
//-------------------------------------------------
-nes_bcbattle_device::nes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_bcbattle_device::nes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_BARCODE_BATTLER, "Epoch Barcode Battler (FC)", tag, owner, clock, "nes_bcbattle", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_reader(*this, "battler"), m_pending_code(0), m_new_code(0), m_transmitting(0), m_cur_bit(0), m_cur_byte(0), battler_timer(nullptr)
@@ -171,9 +171,9 @@ int nes_bcbattle_device::read_current_bit()
return 0;
}
-UINT8 nes_bcbattle_device::read_exp(offs_t offset)
+uint8_t nes_bcbattle_device::read_exp(offs_t offset)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (offset == 1) //$4017
{
ret |= read_current_bit() << 2;
diff --git a/src/devices/bus/nes_ctrl/bcbattle.h b/src/devices/bus/nes_ctrl/bcbattle.h
index cbc7125c041..3d4e8f0d467 100644
--- a/src/devices/bus/nes_ctrl/bcbattle.h
+++ b/src/devices/bus/nes_ctrl/bcbattle.h
@@ -27,7 +27,7 @@ class nes_bcbattle_device : public device_t,
{
public:
// construction/destruction
- nes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -37,12 +37,12 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_exp(offs_t offset) override;
+ virtual uint8_t read_exp(offs_t offset) override;
int read_current_bit();
static const device_timer_id TIMER_BATTLER = 1;
required_device<barcode_reader_device> m_reader;
- UINT8 m_current_barcode[20];
+ uint8_t m_current_barcode[20];
int m_pending_code, m_new_code, m_transmitting, m_cur_bit, m_cur_byte;
emu_timer *battler_timer;
};
diff --git a/src/devices/bus/nes_ctrl/ctrl.cpp b/src/devices/bus/nes_ctrl/ctrl.cpp
index a1ef7dc9c1a..66afea1e4bc 100644
--- a/src/devices/bus/nes_ctrl/ctrl.cpp
+++ b/src/devices/bus/nes_ctrl/ctrl.cpp
@@ -100,7 +100,7 @@ device_nes_control_port_interface::~device_nes_control_port_interface()
// nes_control_port_device - constructor
//-------------------------------------------------
-nes_control_port_device::nes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_control_port_device::nes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_CONTROL_PORT, "Nintendo NES/FC control port", tag, owner, clock, "nes_control_port", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr)
{
@@ -127,31 +127,31 @@ void nes_control_port_device::device_start()
}
-UINT8 nes_control_port_device::read_bit0()
+uint8_t nes_control_port_device::read_bit0()
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_device)
data = m_device->read_bit0();
return data;
}
-UINT8 nes_control_port_device::read_bit34()
+uint8_t nes_control_port_device::read_bit34()
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_device)
data = m_device->read_bit34();
return data;
}
-UINT8 nes_control_port_device::read_exp(offs_t offset)
+uint8_t nes_control_port_device::read_exp(offs_t offset)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_device)
data = m_device->read_exp(offset);
return data;
}
-void nes_control_port_device::write(UINT8 data)
+void nes_control_port_device::write(uint8_t data)
{
if (m_device)
m_device->write(data);
diff --git a/src/devices/bus/nes_ctrl/ctrl.h b/src/devices/bus/nes_ctrl/ctrl.h
index e899258547c..51d478eed49 100644
--- a/src/devices/bus/nes_ctrl/ctrl.h
+++ b/src/devices/bus/nes_ctrl/ctrl.h
@@ -32,10 +32,10 @@ public:
device_nes_control_port_interface(const machine_config &mconfig, device_t &device);
virtual ~device_nes_control_port_interface();
- virtual UINT8 read_bit0() { return 0; };
- virtual UINT8 read_bit34() { return 0; };
- virtual UINT8 read_exp(offs_t offset) { return 0; };
- virtual void write(UINT8 data) { };
+ virtual uint8_t read_bit0() { return 0; };
+ virtual uint8_t read_bit34() { return 0; };
+ virtual uint8_t read_exp(offs_t offset) { return 0; };
+ virtual void write(uint8_t data) { };
protected:
nes_control_port_device *m_port;
@@ -53,15 +53,15 @@ class nes_control_port_device : public device_t,
{
public:
// construction/destruction
- nes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~nes_control_port_device();
static void set_brightpixel_callback(device_t &device, nesctrl_brightpixel_delegate callback) { downcast<nes_control_port_device &>(device).m_brightpixel_cb = callback; }
- UINT8 read_bit0();
- UINT8 read_bit34();
- UINT8 read_exp(offs_t offset);
- void write(UINT8 data);
+ uint8_t read_bit0();
+ uint8_t read_bit34();
+ uint8_t read_exp(offs_t offset);
+ void write(uint8_t data);
nesctrl_brightpixel_delegate m_brightpixel_cb;
diff --git a/src/devices/bus/nes_ctrl/fckeybrd.cpp b/src/devices/bus/nes_ctrl/fckeybrd.cpp
index b4c6dde6033..1222b93f3e0 100644
--- a/src/devices/bus/nes_ctrl/fckeybrd.cpp
+++ b/src/devices/bus/nes_ctrl/fckeybrd.cpp
@@ -144,7 +144,7 @@ machine_config_constructor nes_fckeybrd_device::device_mconfig_additions() const
// nes_fckeybrd_device - constructor
//-------------------------------------------------
-nes_fckeybrd_device::nes_fckeybrd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_fckeybrd_device::nes_fckeybrd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, NES_FCKEYBOARD, "Nintendo Family Computer Keyboard Component", tag, owner, clock, "nes_fckeybrd", __FILE__)
, device_nes_control_port_interface(mconfig, *this)
, m_cassette(*this, "tape")
@@ -181,9 +181,9 @@ void nes_fckeybrd_device::device_reset()
// read
//-------------------------------------------------
-UINT8 nes_fckeybrd_device::read_exp(offs_t offset)
+uint8_t nes_fckeybrd_device::read_exp(offs_t offset)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (offset == 0) //$4016
{
// FC Keyboard: tape input
@@ -212,7 +212,7 @@ UINT8 nes_fckeybrd_device::read_exp(offs_t offset)
// write
//-------------------------------------------------
-void nes_fckeybrd_device::write(UINT8 data)
+void nes_fckeybrd_device::write(uint8_t data)
{
// tape output (not fully tested)
if ((m_cassette->get_state() & CASSETTE_MASK_UISTATE) == CASSETTE_RECORD)
@@ -220,7 +220,7 @@ void nes_fckeybrd_device::write(UINT8 data)
if (BIT(data, 2)) // keyboard active
{
- UINT8 out = BIT(data, 1); // scan
+ uint8_t out = BIT(data, 1); // scan
if (m_fck_mode && !out && ++m_fck_scan > 9)
m_fck_scan = 0;
diff --git a/src/devices/bus/nes_ctrl/fckeybrd.h b/src/devices/bus/nes_ctrl/fckeybrd.h
index f4cdc02ba39..4f70f5762a8 100644
--- a/src/devices/bus/nes_ctrl/fckeybrd.h
+++ b/src/devices/bus/nes_ctrl/fckeybrd.h
@@ -27,7 +27,7 @@ class nes_fckeybrd_device : public device_t,
{
public:
// construction/destruction
- nes_fckeybrd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fckeybrd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -37,13 +37,13 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_exp(offs_t offset) override;
- virtual void write(UINT8 data) override;
+ virtual uint8_t read_exp(offs_t offset) override;
+ virtual void write(uint8_t data) override;
private:
required_device<cassette_image_device> m_cassette;
required_ioport_array<9> m_kbd;
- UINT8 m_fck_scan, m_fck_mode;
+ uint8_t m_fck_scan, m_fck_mode;
};
diff --git a/src/devices/bus/nes_ctrl/ftrainer.cpp b/src/devices/bus/nes_ctrl/ftrainer.cpp
index 93edab2425a..8a7a17d550d 100644
--- a/src/devices/bus/nes_ctrl/ftrainer.cpp
+++ b/src/devices/bus/nes_ctrl/ftrainer.cpp
@@ -83,7 +83,7 @@ ioport_constructor nes_ftrainer_device::device_input_ports() const
// nes_ftrainer_device - constructor
//-------------------------------------------------
-nes_ftrainer_device::nes_ftrainer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_ftrainer_device::nes_ftrainer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, NES_FTRAINER, "Bandai Family Trainer", tag, owner, clock, "nes_famtrain", __FILE__)
, device_nes_control_port_interface(mconfig, *this)
, m_trainer(*this, "FT_COL.%u", 0)
@@ -116,9 +116,9 @@ void nes_ftrainer_device::device_reset()
// read
//-------------------------------------------------
-UINT8 nes_ftrainer_device::read_exp(offs_t offset)
+uint8_t nes_ftrainer_device::read_exp(offs_t offset)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (offset == 1) //$4017
{
if (!BIT(m_row_scan, 0))
@@ -147,7 +147,7 @@ UINT8 nes_ftrainer_device::read_exp(offs_t offset)
// write
//-------------------------------------------------
-void nes_ftrainer_device::write(UINT8 data)
+void nes_ftrainer_device::write(uint8_t data)
{
// select row to scan
m_row_scan = data & 0x07;
diff --git a/src/devices/bus/nes_ctrl/ftrainer.h b/src/devices/bus/nes_ctrl/ftrainer.h
index f426f4e6a2c..f984c901cf2 100644
--- a/src/devices/bus/nes_ctrl/ftrainer.h
+++ b/src/devices/bus/nes_ctrl/ftrainer.h
@@ -26,7 +26,7 @@ class nes_ftrainer_device : public device_t,
{
public:
// construction/destruction
- nes_ftrainer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ftrainer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
@@ -35,12 +35,12 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_exp(offs_t offset) override;
- virtual void write(UINT8 data) override;
+ virtual uint8_t read_exp(offs_t offset) override;
+ virtual void write(uint8_t data) override;
private:
required_ioport_array<4> m_trainer;
- UINT8 m_row_scan;
+ uint8_t m_row_scan;
};
diff --git a/src/devices/bus/nes_ctrl/hori.cpp b/src/devices/bus/nes_ctrl/hori.cpp
index cecf1f05dbc..7281a61bf13 100644
--- a/src/devices/bus/nes_ctrl/hori.cpp
+++ b/src/devices/bus/nes_ctrl/hori.cpp
@@ -89,7 +89,7 @@ machine_config_constructor nes_hori4p_device::device_mconfig_additions() const
// nes_horitwin_device - constructor
//-------------------------------------------------
-nes_horitwin_device::nes_horitwin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_horitwin_device::nes_horitwin_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_HORITWIN, "Hori Twin Adapter", tag, owner, clock, "nes_horitwin", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_port1(*this, "port1"),
@@ -97,7 +97,7 @@ nes_horitwin_device::nes_horitwin_device(const machine_config &mconfig, const ch
{
}
-nes_hori4p_device::nes_hori4p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_hori4p_device::nes_hori4p_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_HORI4P, "Hori 4P Adapter", tag, owner, clock, "nes_hori4p", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_port1(*this, "port1"),
@@ -113,9 +113,9 @@ nes_hori4p_device::nes_hori4p_device(const machine_config &mconfig, const char *
// read
//-------------------------------------------------
-UINT8 nes_horitwin_device::read_exp(offs_t offset)
+uint8_t nes_horitwin_device::read_exp(offs_t offset)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (offset == 0) //$4016
ret |= (m_port1->read_bit0() << 1);
else //$4017
@@ -123,9 +123,9 @@ UINT8 nes_horitwin_device::read_exp(offs_t offset)
return ret;
}
-UINT8 nes_hori4p_device::read_exp(offs_t offset)
+uint8_t nes_hori4p_device::read_exp(offs_t offset)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (m_cfg->read() == 0) // 2P
{
if (offset == 0) //$4016
@@ -153,13 +153,13 @@ UINT8 nes_hori4p_device::read_exp(offs_t offset)
// write
//-------------------------------------------------
-void nes_horitwin_device::write(UINT8 data)
+void nes_horitwin_device::write(uint8_t data)
{
m_port1->write(data);
m_port2->write(data);
}
-void nes_hori4p_device::write(UINT8 data)
+void nes_hori4p_device::write(uint8_t data)
{
m_port1->write(data);
m_port2->write(data);
diff --git a/src/devices/bus/nes_ctrl/hori.h b/src/devices/bus/nes_ctrl/hori.h
index 613a8bdac7c..1205b400025 100644
--- a/src/devices/bus/nes_ctrl/hori.h
+++ b/src/devices/bus/nes_ctrl/hori.h
@@ -26,7 +26,7 @@ class nes_horitwin_device : public device_t,
{
public:
// construction/destruction
- nes_horitwin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_horitwin_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -34,8 +34,8 @@ protected:
// device-level overrides
virtual void device_start() override {}
- virtual UINT8 read_exp(offs_t offset) override;
- virtual void write(UINT8 data) override;
+ virtual uint8_t read_exp(offs_t offset) override;
+ virtual void write(uint8_t data) override;
private:
required_device<nes_control_port_device> m_port1;
@@ -49,7 +49,7 @@ class nes_hori4p_device : public device_t,
{
public:
// construction/destruction
- nes_hori4p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_hori4p_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -58,8 +58,8 @@ protected:
// device-level overrides
virtual void device_start() override {}
- virtual UINT8 read_exp(offs_t offset) override;
- virtual void write(UINT8 data) override;
+ virtual uint8_t read_exp(offs_t offset) override;
+ virtual void write(uint8_t data) override;
private:
required_device<nes_control_port_device> m_port1;
diff --git a/src/devices/bus/nes_ctrl/joypad.cpp b/src/devices/bus/nes_ctrl/joypad.cpp
index 7a78d08f2c7..08652d408cf 100644
--- a/src/devices/bus/nes_ctrl/joypad.cpp
+++ b/src/devices/bus/nes_ctrl/joypad.cpp
@@ -173,36 +173,36 @@ machine_config_constructor nes_arcstick_device::device_mconfig_additions() const
// nes_joypad_device - constructor
//-------------------------------------------------
-nes_joypad_device::nes_joypad_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nes_joypad_device::nes_joypad_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nes_control_port_interface(mconfig, *this),
m_joypad(*this, "JOYPAD"), m_latch(0)
{
}
-nes_joypad_device::nes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_joypad_device::nes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_JOYPAD, "Nintendo NES / FC Control Pad", tag, owner, clock, "nes_joypad", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_joypad(*this, "JOYPAD"), m_latch(0)
{
}
-nes_fcpad2_device::nes_fcpad2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_fcpad2_device::nes_fcpad2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
nes_joypad_device(mconfig, NES_FCPAD_P2, "Nintendo Family Computer P2 Pad", tag, owner, clock, "nes_fcpad2", __FILE__)
{
}
-nes_ccpadl_device::nes_ccpadl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_ccpadl_device::nes_ccpadl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
nes_joypad_device(mconfig, NES_CCPAD_LEFT, "FC Crazy Climber Left Pad", tag, owner, clock, "nes_ccpadl", __FILE__)
{
}
-nes_ccpadr_device::nes_ccpadr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_ccpadr_device::nes_ccpadr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
nes_joypad_device(mconfig, NES_CCPAD_RIGHT, "FC Crazy Climber Right Pad", tag, owner, clock, "nes_ccpadr", __FILE__)
{
}
-nes_arcstick_device::nes_arcstick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_arcstick_device::nes_arcstick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
nes_joypad_device(mconfig, NES_ARCSTICK, "Nintendo Family Computer Arcade Stick", tag, owner, clock, "nes_arcstick", __FILE__),
m_daisychain(*this, "subexp"),
m_cfg(*this, "CONFIG")
@@ -234,16 +234,16 @@ void nes_joypad_device::device_reset()
// read
//-------------------------------------------------
-UINT8 nes_joypad_device::read_bit0()
+uint8_t nes_joypad_device::read_bit0()
{
- UINT8 ret = m_latch & 1;
+ uint8_t ret = m_latch & 1;
m_latch >>= 1;
return ret;
}
-UINT8 nes_fcpad2_device::read_exp(offs_t offset)
+uint8_t nes_fcpad2_device::read_exp(offs_t offset)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (!offset) // microphone input
ret |= m_joypad->read() & 0x04;
@@ -256,9 +256,9 @@ UINT8 nes_fcpad2_device::read_exp(offs_t offset)
// with each other? currently, we only support the following setup:
// if the first pad is set as P1, the daisy chained pad is checked
// for P2 only, and vice versa.
-UINT8 nes_arcstick_device::read_exp(offs_t offset)
+uint8_t nes_arcstick_device::read_exp(offs_t offset)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (offset == 0) //$4016
{
if ((m_cfg->read() & 2) == 0) // we are P1 input
@@ -287,7 +287,7 @@ UINT8 nes_arcstick_device::read_exp(offs_t offset)
// write
//-------------------------------------------------
-void nes_joypad_device::write(UINT8 data)
+void nes_joypad_device::write(uint8_t data)
{
if (data & 0x01)
return;
@@ -295,7 +295,7 @@ void nes_joypad_device::write(UINT8 data)
m_latch = m_joypad->read();
}
-void nes_fcpad2_device::write(UINT8 data)
+void nes_fcpad2_device::write(uint8_t data)
{
if (data & 0x01)
return;
@@ -304,7 +304,7 @@ void nes_fcpad2_device::write(UINT8 data)
m_latch = m_joypad->read() & ~0x04;
}
-void nes_arcstick_device::write(UINT8 data)
+void nes_arcstick_device::write(uint8_t data)
{
m_daisychain->write(data);
diff --git a/src/devices/bus/nes_ctrl/joypad.h b/src/devices/bus/nes_ctrl/joypad.h
index 8430db4dff9..5af6ed93bf2 100644
--- a/src/devices/bus/nes_ctrl/joypad.h
+++ b/src/devices/bus/nes_ctrl/joypad.h
@@ -26,8 +26,8 @@ class nes_joypad_device : public device_t,
{
public:
// construction/destruction
- nes_joypad_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- nes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_joypad_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ nes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
@@ -36,11 +36,11 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_bit0() override;
- virtual void write(UINT8 data) override;
+ virtual uint8_t read_bit0() override;
+ virtual void write(uint8_t data) override;
required_ioport m_joypad;
- UINT32 m_latch;
+ uint32_t m_latch;
};
// ======================> nes_fcpad2_device
@@ -49,13 +49,13 @@ class nes_fcpad2_device : public nes_joypad_device
{
public:
// construction/destruction
- nes_fcpad2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_fcpad2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
protected:
- virtual UINT8 read_exp(offs_t offset) override;
- virtual void write(UINT8 data) override;
+ virtual uint8_t read_exp(offs_t offset) override;
+ virtual void write(uint8_t data) override;
};
// ======================> nes_ccpadl_device
@@ -64,7 +64,7 @@ class nes_ccpadl_device : public nes_joypad_device
{
public:
// construction/destruction
- nes_ccpadl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ccpadl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
};
@@ -75,7 +75,7 @@ class nes_ccpadr_device : public nes_joypad_device
{
public:
// construction/destruction
- nes_ccpadr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_ccpadr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
};
@@ -86,15 +86,15 @@ class nes_arcstick_device : public nes_joypad_device
{
public:
// construction/destruction
- nes_arcstick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_arcstick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
protected:
- virtual UINT8 read_bit0() override { return 0; }
- virtual UINT8 read_exp(offs_t offset) override;
- virtual void write(UINT8 data) override;
+ virtual uint8_t read_bit0() override { return 0; }
+ virtual uint8_t read_exp(offs_t offset) override;
+ virtual void write(uint8_t data) override;
required_device<nes_control_port_device> m_daisychain;
required_ioport m_cfg;
diff --git a/src/devices/bus/nes_ctrl/konamihs.cpp b/src/devices/bus/nes_ctrl/konamihs.cpp
index 46d5fb1f2fa..c3e998bba7b 100644
--- a/src/devices/bus/nes_ctrl/konamihs.cpp
+++ b/src/devices/bus/nes_ctrl/konamihs.cpp
@@ -42,7 +42,7 @@ ioport_constructor nes_konamihs_device::device_input_ports() const
// nes_konamihs_device - constructor
//-------------------------------------------------
-nes_konamihs_device::nes_konamihs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_konamihs_device::nes_konamihs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_KONAMIHS, "Konami Hyper Shot Controller", tag, owner, clock, "nes_konamihs", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_ipt_p1(*this, "P1"),
@@ -77,9 +77,9 @@ void nes_konamihs_device::device_reset()
// read
//-------------------------------------------------
-UINT8 nes_konamihs_device::read_exp(offs_t offset)
+uint8_t nes_konamihs_device::read_exp(offs_t offset)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (offset == 1) //$4017
{
ret |= m_latch_p1 << 1;
@@ -92,7 +92,7 @@ UINT8 nes_konamihs_device::read_exp(offs_t offset)
// write
//-------------------------------------------------
-void nes_konamihs_device::write(UINT8 data)
+void nes_konamihs_device::write(uint8_t data)
{
if ((data & 0x02) == 0)
m_latch_p1 = m_ipt_p1->read();
diff --git a/src/devices/bus/nes_ctrl/konamihs.h b/src/devices/bus/nes_ctrl/konamihs.h
index da3aca612be..91070ba6e02 100644
--- a/src/devices/bus/nes_ctrl/konamihs.h
+++ b/src/devices/bus/nes_ctrl/konamihs.h
@@ -26,7 +26,7 @@ class nes_konamihs_device : public device_t,
{
public:
// construction/destruction
- nes_konamihs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_konamihs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
@@ -35,12 +35,12 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_exp(offs_t offset) override;
- virtual void write(UINT8 data) override;
+ virtual uint8_t read_exp(offs_t offset) override;
+ virtual void write(uint8_t data) override;
required_ioport m_ipt_p1;
required_ioport m_ipt_p2;
- UINT32 m_latch_p1, m_latch_p2;
+ uint32_t m_latch_p1, m_latch_p2;
};
// device type definition
diff --git a/src/devices/bus/nes_ctrl/miracle.cpp b/src/devices/bus/nes_ctrl/miracle.cpp
index 6fdbc6f273a..0d79645a018 100644
--- a/src/devices/bus/nes_ctrl/miracle.cpp
+++ b/src/devices/bus/nes_ctrl/miracle.cpp
@@ -58,7 +58,7 @@ void nes_miracle_device::device_timer(emu_timer &timer, device_timer_id id, int
// nes_miracle_device - constructor
//-------------------------------------------------
-nes_miracle_device::nes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_miracle_device::nes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_MIRACLE, "Miracle Piano Controller", tag, owner, clock, "nes_miracle", __FILE__),
device_serial_interface(mconfig, *this),
device_nes_control_port_interface(mconfig, *this),
@@ -111,9 +111,9 @@ void nes_miracle_device::device_reset()
// read
//-------------------------------------------------
-UINT8 nes_miracle_device::read_bit0()
+uint8_t nes_miracle_device::read_bit0()
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (m_midi_mode == MIRACLE_MIDI_RECEIVE)
{
@@ -139,7 +139,7 @@ UINT8 nes_miracle_device::read_bit0()
// c4fc = start of recv routine
// c53a = start of send routine
-void nes_miracle_device::write(UINT8 data)
+void nes_miracle_device::write(uint8_t data)
{
// printf("write: %d (%d %02x %d)\n", data & 1, m_sent_bits, m_data_sent, m_midi_mode);
@@ -228,7 +228,7 @@ void nes_miracle_device::write(UINT8 data)
void nes_miracle_device::rcv_complete() // Rx completed receiving byte
{
receive_register_extract();
- UINT8 rcv = get_received_char();
+ uint8_t rcv = get_received_char();
// printf("Got %02x -> [%d]\n", rcv, m_recv_write);
m_recvring[m_recv_write++] = rcv;
@@ -257,13 +257,13 @@ void nes_miracle_device::tra_complete() // Tx completed sending byte
void nes_miracle_device::tra_callback() // Tx send bit
{
- UINT8 bit = transmit_register_get_data_bit();
+ uint8_t bit = transmit_register_get_data_bit();
// send this to midi out
m_midiout->write_txd(bit);
}
-void nes_miracle_device::xmit_char(UINT8 data)
+void nes_miracle_device::xmit_char(uint8_t data)
{
// if tx is busy it'll pick this up automatically when it completes
// if not, send now!
diff --git a/src/devices/bus/nes_ctrl/miracle.h b/src/devices/bus/nes_ctrl/miracle.h
index 6d0730423aa..fee12bca313 100644
--- a/src/devices/bus/nes_ctrl/miracle.h
+++ b/src/devices/bus/nes_ctrl/miracle.h
@@ -31,7 +31,7 @@ public:
static const int RECV_RING_SIZE = 64;
// construction/destruction
- nes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,7 +41,7 @@ public:
virtual void tra_complete() override; // Tx completed sending byte
virtual void tra_callback() override; // Tx send bit
- void xmit_char(UINT8 data);
+ void xmit_char(uint8_t data);
required_device<midi_port_device> m_midiin, m_midiout;
@@ -50,16 +50,16 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_bit0() override;
- virtual void write(UINT8 data) override;
+ virtual uint8_t read_bit0() override;
+ virtual void write(uint8_t data) override;
static const device_timer_id TIMER_STROBE_ON = 0;
emu_timer *strobe_timer;
int m_strobe_on, m_midi_mode, m_sent_bits;
- UINT32 m_strobe_clock;
- UINT8 m_data_sent;
- UINT8 m_xmitring[XMIT_RING_SIZE], m_recvring[RECV_RING_SIZE];
+ uint32_t m_strobe_clock;
+ uint8_t m_data_sent;
+ uint8_t m_xmitring[XMIT_RING_SIZE], m_recvring[RECV_RING_SIZE];
int m_xmit_read, m_xmit_write;
int m_recv_read, m_recv_write;
bool m_tx_busy, m_read_status, m_status_bit;
diff --git a/src/devices/bus/nes_ctrl/mjpanel.cpp b/src/devices/bus/nes_ctrl/mjpanel.cpp
index 988c54f11d1..06cac0fd051 100644
--- a/src/devices/bus/nes_ctrl/mjpanel.cpp
+++ b/src/devices/bus/nes_ctrl/mjpanel.cpp
@@ -69,7 +69,7 @@ ioport_constructor nes_mjpanel_device::device_input_ports() const
// nes_mjpanel_device - constructor
//-------------------------------------------------
-nes_mjpanel_device::nes_mjpanel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_mjpanel_device::nes_mjpanel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, NES_MJPANEL, "Famicom Mahjong Panel", tag, owner, clock, "nes_mjpanel", __FILE__)
, device_nes_control_port_interface(mconfig, *this)
, m_panel(*this, "MJPANEL.%u", 0)
@@ -102,9 +102,9 @@ void nes_mjpanel_device::device_reset()
// read
//-------------------------------------------------
-UINT8 nes_mjpanel_device::read_exp(offs_t offset)
+uint8_t nes_mjpanel_device::read_exp(offs_t offset)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (offset)
{
ret = (m_latch & 1) << 1;
@@ -120,7 +120,7 @@ UINT8 nes_mjpanel_device::read_exp(offs_t offset)
// write
//-------------------------------------------------
-void nes_mjpanel_device::write(UINT8 data)
+void nes_mjpanel_device::write(uint8_t data)
{
if (data & 0x01)
return;
diff --git a/src/devices/bus/nes_ctrl/mjpanel.h b/src/devices/bus/nes_ctrl/mjpanel.h
index ad470cb91e7..23f14f369ea 100644
--- a/src/devices/bus/nes_ctrl/mjpanel.h
+++ b/src/devices/bus/nes_ctrl/mjpanel.h
@@ -26,7 +26,7 @@ class nes_mjpanel_device : public device_t,
{
public:
// construction/destruction
- nes_mjpanel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_mjpanel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
@@ -35,12 +35,12 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_exp(offs_t offset) override;
- virtual void write(UINT8 data) override;
+ virtual uint8_t read_exp(offs_t offset) override;
+ virtual void write(uint8_t data) override;
private:
required_ioport_array<4> m_panel;
- UINT32 m_latch;
+ uint32_t m_latch;
};
diff --git a/src/devices/bus/nes_ctrl/pachinko.cpp b/src/devices/bus/nes_ctrl/pachinko.cpp
index c4fdeb4b5d9..301647e7f15 100644
--- a/src/devices/bus/nes_ctrl/pachinko.cpp
+++ b/src/devices/bus/nes_ctrl/pachinko.cpp
@@ -47,7 +47,7 @@ ioport_constructor nes_pachinko_device::device_input_ports() const
// nes_pachinko_device - constructor
//-------------------------------------------------
-nes_pachinko_device::nes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_pachinko_device::nes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_PACHINKO, "Famicom Pachinko Controller", tag, owner, clock, "nes_pachinko", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_joypad(*this, "JOYPAD"),
@@ -80,9 +80,9 @@ void nes_pachinko_device::device_reset()
// read
//-------------------------------------------------
-UINT8 nes_pachinko_device::read_exp(offs_t offset)
+uint8_t nes_pachinko_device::read_exp(offs_t offset)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
// this controller behaves like a standard P3 joypad, with longer stream of inputs
if (offset == 0) //$4016
{
@@ -96,7 +96,7 @@ UINT8 nes_pachinko_device::read_exp(offs_t offset)
// write
//-------------------------------------------------
-void nes_pachinko_device::write(UINT8 data)
+void nes_pachinko_device::write(uint8_t data)
{
if (data & 0x01)
return;
diff --git a/src/devices/bus/nes_ctrl/pachinko.h b/src/devices/bus/nes_ctrl/pachinko.h
index 04fad189160..b11cdbab5d4 100644
--- a/src/devices/bus/nes_ctrl/pachinko.h
+++ b/src/devices/bus/nes_ctrl/pachinko.h
@@ -26,7 +26,7 @@ class nes_pachinko_device : public device_t,
{
public:
// construction/destruction
- nes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
@@ -35,12 +35,12 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_exp(offs_t offset) override;
- virtual void write(UINT8 data) override;
+ virtual uint8_t read_exp(offs_t offset) override;
+ virtual void write(uint8_t data) override;
required_ioport m_joypad;
required_ioport m_trigger;
- UINT32 m_latch;
+ uint32_t m_latch;
};
// device type definition
diff --git a/src/devices/bus/nes_ctrl/partytap.cpp b/src/devices/bus/nes_ctrl/partytap.cpp
index 2a1acd8adc9..dfa8683f73d 100644
--- a/src/devices/bus/nes_ctrl/partytap.cpp
+++ b/src/devices/bus/nes_ctrl/partytap.cpp
@@ -43,7 +43,7 @@ ioport_constructor nes_partytap_device::device_input_ports() const
// nes_partytap_device - constructor
//-------------------------------------------------
-nes_partytap_device::nes_partytap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_partytap_device::nes_partytap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_PARTYTAP, "Yonezawa Party Tap Controller", tag, owner, clock, "nes_partytap", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_inputs(*this, "INPUTS"), m_mode(0), m_latch(0)
@@ -77,9 +77,9 @@ void nes_partytap_device::device_reset()
// read
//-------------------------------------------------
-UINT8 nes_partytap_device::read_exp(offs_t offset)
+uint8_t nes_partytap_device::read_exp(offs_t offset)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (offset == 1) //$4017
{
ret |= m_latch & 0x1c;
@@ -94,7 +94,7 @@ UINT8 nes_partytap_device::read_exp(offs_t offset)
// write
//-------------------------------------------------
-void nes_partytap_device::write(UINT8 data)
+void nes_partytap_device::write(uint8_t data)
{
// inputs are read in two chunks of 3 bits, before the second one is read bit2 is written here
// probably a mechanism for the game to detect which group of inputs is being read
diff --git a/src/devices/bus/nes_ctrl/partytap.h b/src/devices/bus/nes_ctrl/partytap.h
index f66b7af7eec..0b3f6db9cb3 100644
--- a/src/devices/bus/nes_ctrl/partytap.h
+++ b/src/devices/bus/nes_ctrl/partytap.h
@@ -26,7 +26,7 @@ class nes_partytap_device : public device_t,
{
public:
// construction/destruction
- nes_partytap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_partytap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
@@ -35,12 +35,12 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_exp(offs_t offset) override;
- virtual void write(UINT8 data) override;
+ virtual uint8_t read_exp(offs_t offset) override;
+ virtual void write(uint8_t data) override;
required_ioport m_inputs;
- UINT8 m_mode;
- UINT32 m_latch;
+ uint8_t m_mode;
+ uint32_t m_latch;
};
// device type definition
diff --git a/src/devices/bus/nes_ctrl/powerpad.cpp b/src/devices/bus/nes_ctrl/powerpad.cpp
index 569695d97ca..1f47ea5f99f 100644
--- a/src/devices/bus/nes_ctrl/powerpad.cpp
+++ b/src/devices/bus/nes_ctrl/powerpad.cpp
@@ -77,7 +77,7 @@ ioport_constructor nes_powerpad_device::device_input_ports() const
// nes_powerpad_device - constructor
//-------------------------------------------------
-nes_powerpad_device::nes_powerpad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_powerpad_device::nes_powerpad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_POWERPAD, "Bandai Power Pad", tag, owner, clock, "nes_powerpad", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_ipt1(*this, "POWERPAD1"),
@@ -111,9 +111,9 @@ void nes_powerpad_device::device_reset()
// read
//-------------------------------------------------
-UINT8 nes_powerpad_device::read_bit34()
+uint8_t nes_powerpad_device::read_bit34()
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
ret |= (m_latch[0] & 0x01) << 3;
ret |= (m_latch[1] & 0x01) << 4;
m_latch[0] >>= 1;
@@ -125,7 +125,7 @@ UINT8 nes_powerpad_device::read_bit34()
// write
//-------------------------------------------------
-void nes_powerpad_device::write(UINT8 data)
+void nes_powerpad_device::write(uint8_t data)
{
if (data & 0x01)
return;
diff --git a/src/devices/bus/nes_ctrl/powerpad.h b/src/devices/bus/nes_ctrl/powerpad.h
index a69486e7e23..abfbac02551 100644
--- a/src/devices/bus/nes_ctrl/powerpad.h
+++ b/src/devices/bus/nes_ctrl/powerpad.h
@@ -26,7 +26,7 @@ class nes_powerpad_device : public device_t,
{
public:
// construction/destruction
- nes_powerpad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_powerpad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
@@ -35,13 +35,13 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_bit34() override;
- virtual void write(UINT8 data) override;
+ virtual uint8_t read_bit34() override;
+ virtual void write(uint8_t data) override;
private:
required_ioport m_ipt1;
required_ioport m_ipt2;
- UINT32 m_latch[2];
+ uint32_t m_latch[2];
};
diff --git a/src/devices/bus/nes_ctrl/suborkey.cpp b/src/devices/bus/nes_ctrl/suborkey.cpp
index 3341887c761..d8fe8d6f8b0 100644
--- a/src/devices/bus/nes_ctrl/suborkey.cpp
+++ b/src/devices/bus/nes_ctrl/suborkey.cpp
@@ -160,7 +160,7 @@ ioport_constructor nes_suborkey_device::device_input_ports() const
// nes_suborkey_device - constructor
//-------------------------------------------------
-nes_suborkey_device::nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nes_suborkey_device::nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, NES_SUBORKEYBOARD, "Subor FC Keyboard", tag, owner, clock, "nes_suborkey", __FILE__)
, device_nes_control_port_interface(mconfig, *this)
, m_kbd(*this, "SUBOR.%u", 0)
@@ -196,9 +196,9 @@ void nes_suborkey_device::device_reset()
// read
//-------------------------------------------------
-UINT8 nes_suborkey_device::read_exp(offs_t offset)
+uint8_t nes_suborkey_device::read_exp(offs_t offset)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (offset == 1) //$4017
{
// Subor Keyboard: rows of the keyboard matrix are read 4-bits at time and returned as bit1->bit4
@@ -215,11 +215,11 @@ UINT8 nes_suborkey_device::read_exp(offs_t offset)
// write
//-------------------------------------------------
-void nes_suborkey_device::write(UINT8 data)
+void nes_suborkey_device::write(uint8_t data)
{
if (BIT(data, 2)) // keyboard active
{
- UINT8 out = BIT(data, 1); // scan
+ uint8_t out = BIT(data, 1); // scan
if (m_fck_mode && !out && ++m_fck_scan > 12)
m_fck_scan = 0;
diff --git a/src/devices/bus/nes_ctrl/suborkey.h b/src/devices/bus/nes_ctrl/suborkey.h
index b50b0e3bb94..8970b3b466f 100644
--- a/src/devices/bus/nes_ctrl/suborkey.h
+++ b/src/devices/bus/nes_ctrl/suborkey.h
@@ -26,7 +26,7 @@ class nes_suborkey_device : public device_t,
{
public:
// construction/destruction
- nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
@@ -35,12 +35,12 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_exp(offs_t offset) override;
- virtual void write(UINT8 data) override;
+ virtual uint8_t read_exp(offs_t offset) override;
+ virtual void write(uint8_t data) override;
private:
required_ioport_array<13> m_kbd;
- UINT8 m_fck_scan, m_fck_mode;
+ uint8_t m_fck_scan, m_fck_mode;
};
diff --git a/src/devices/bus/nes_ctrl/zapper.cpp b/src/devices/bus/nes_ctrl/zapper.cpp
index 422b9664f5e..82821ee2ad9 100644
--- a/src/devices/bus/nes_ctrl/zapper.cpp
+++ b/src/devices/bus/nes_ctrl/zapper.cpp
@@ -44,7 +44,7 @@ ioport_constructor nes_zapper_device::device_input_ports() const
// nes_zapper_device - constructor
//-------------------------------------------------
-nes_zapper_device::nes_zapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nes_zapper_device::nes_zapper_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NES_ZAPPER, "Nintendo Zapper Lightgun", tag, owner, clock, "nes_zapper", __FILE__),
device_nes_control_port_interface(mconfig, *this),
m_lightx(*this, "ZAPPER_X"),
@@ -76,9 +76,9 @@ void nes_zapper_device::device_reset()
// read
//-------------------------------------------------
-UINT8 nes_zapper_device::read_bit34()
+uint8_t nes_zapper_device::read_bit34()
{
- UINT8 ret = m_trigger->read();
+ uint8_t ret = m_trigger->read();
if (!m_port->m_brightpixel_cb.isnull() &&
m_port->m_brightpixel_cb(m_lightx->read(), m_lighty->read()))
ret &= ~0x08; // sprite hit
@@ -87,9 +87,9 @@ UINT8 nes_zapper_device::read_bit34()
return ret;
}
-UINT8 nes_zapper_device::read_exp(offs_t offset)
+uint8_t nes_zapper_device::read_exp(offs_t offset)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (offset == 1) // $4017
ret |= nes_zapper_device::read_bit34();
return ret;
diff --git a/src/devices/bus/nes_ctrl/zapper.h b/src/devices/bus/nes_ctrl/zapper.h
index 8aedda7fc7a..22d4cea0664 100644
--- a/src/devices/bus/nes_ctrl/zapper.h
+++ b/src/devices/bus/nes_ctrl/zapper.h
@@ -26,7 +26,7 @@ class nes_zapper_device : public device_t,
{
public:
// construction/destruction
- nes_zapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nes_zapper_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
@@ -35,8 +35,8 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_bit34() override;
- virtual UINT8 read_exp(offs_t offset) override;
+ virtual uint8_t read_bit34() override;
+ virtual uint8_t read_exp(offs_t offset) override;
private:
required_ioport m_lightx;
diff --git a/src/devices/bus/newbrain/eim.cpp b/src/devices/bus/newbrain/eim.cpp
index 599267b3ffb..7be6e38d6cf 100644
--- a/src/devices/bus/newbrain/eim.cpp
+++ b/src/devices/bus/newbrain/eim.cpp
@@ -119,7 +119,7 @@ machine_config_constructor newbrain_eim_t::device_mconfig_additions() const
// newbrain_eim_t - constructor
//-------------------------------------------------
-newbrain_eim_t::newbrain_eim_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+newbrain_eim_t::newbrain_eim_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NEWBRAIN_EIM, "Newbrain EIM", tag, owner, clock, "newbrain_eim", __FILE__),
device_newbrain_expansion_slot_interface(mconfig, *this),
m_ctc(*this, Z80CTC_TAG),
@@ -156,7 +156,7 @@ void newbrain_eim_t::device_reset()
// mreq_r - memory request read
//-------------------------------------------------
-UINT8 newbrain_eim_t::mreq_r(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh)
+uint8_t newbrain_eim_t::mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh)
{
return m_exp->mreq_r(space, offset, data, romov, exrm, raminh);
}
@@ -166,7 +166,7 @@ UINT8 newbrain_eim_t::mreq_r(address_space &space, offs_t offset, UINT8 data, bo
// mreq_w - memory request write
//-------------------------------------------------
-void newbrain_eim_t::mreq_w(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh)
+void newbrain_eim_t::mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh)
{
m_exp->mreq_w(space, offset, data, romov, exrm, raminh);
}
@@ -176,7 +176,7 @@ void newbrain_eim_t::mreq_w(address_space &space, offs_t offset, UINT8 data, boo
// iorq_r - I/O request read
//-------------------------------------------------
-UINT8 newbrain_eim_t::iorq_r(address_space &space, offs_t offset, UINT8 data, bool &prtov)
+uint8_t newbrain_eim_t::iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov)
{
return m_exp->iorq_r(space, offset, data, prtov);
}
@@ -186,7 +186,7 @@ UINT8 newbrain_eim_t::iorq_r(address_space &space, offs_t offset, UINT8 data, bo
// iorq_w - I/O request write
//-------------------------------------------------
-void newbrain_eim_t::iorq_w(address_space &space, offs_t offset, UINT8 data, bool &prtov)
+void newbrain_eim_t::iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov)
{
m_exp->iorq_w(space, offset, data, prtov);
}
diff --git a/src/devices/bus/newbrain/eim.h b/src/devices/bus/newbrain/eim.h
index 2512321783a..824de3daf69 100644
--- a/src/devices/bus/newbrain/eim.h
+++ b/src/devices/bus/newbrain/eim.h
@@ -32,7 +32,7 @@ class newbrain_eim_t : public device_t,
{
public:
// construction/destruction
- newbrain_eim_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ newbrain_eim_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -58,17 +58,17 @@ protected:
virtual void device_reset() override;
// device_newbrain_expansion_slot_interface overrides
- virtual UINT8 mreq_r(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) override;
- virtual void mreq_w(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) override;
- virtual UINT8 iorq_r(address_space &space, offs_t offset, UINT8 data, bool &prtov) override;
- virtual void iorq_w(address_space &space, offs_t offset, UINT8 data, bool &prtov) override;
+ virtual uint8_t mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override;
+ virtual void mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override;
+ virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) override;
+ virtual void iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) override;
private:
required_device<z80ctc_device> m_ctc;
required_device<acia6850_device> m_acia;
required_device<newbrain_expansion_slot_t> m_exp;
required_memory_region m_rom;
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
int m_aciaint;
int m_anint;
diff --git a/src/devices/bus/newbrain/exp.cpp b/src/devices/bus/newbrain/exp.cpp
index b5ddf149114..85684823493 100644
--- a/src/devices/bus/newbrain/exp.cpp
+++ b/src/devices/bus/newbrain/exp.cpp
@@ -42,7 +42,7 @@ device_newbrain_expansion_slot_interface::device_newbrain_expansion_slot_interfa
// newbrain_expansion_slot_t - constructor
//-------------------------------------------------
-newbrain_expansion_slot_t::newbrain_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+newbrain_expansion_slot_t::newbrain_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NEWBRAIN_EXPANSION_SLOT, "NewBrain expansion port", tag, owner, clock, "newbrain_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this), m_card(nullptr)
{
@@ -76,7 +76,7 @@ void newbrain_expansion_slot_t::device_reset()
// mreq_r - memory request read
//-------------------------------------------------
-UINT8 newbrain_expansion_slot_t::mreq_r(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh)
+uint8_t newbrain_expansion_slot_t::mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh)
{
if (m_card != nullptr)
{
@@ -91,7 +91,7 @@ UINT8 newbrain_expansion_slot_t::mreq_r(address_space &space, offs_t offset, UIN
// mreq_w - memory request write
//-------------------------------------------------
-void newbrain_expansion_slot_t::mreq_w(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh)
+void newbrain_expansion_slot_t::mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh)
{
if (m_card != nullptr)
{
@@ -104,7 +104,7 @@ void newbrain_expansion_slot_t::mreq_w(address_space &space, offs_t offset, UINT
// iorq_r - I/O request read
//-------------------------------------------------
-UINT8 newbrain_expansion_slot_t::iorq_r(address_space &space, offs_t offset, UINT8 data, bool &prtov)
+uint8_t newbrain_expansion_slot_t::iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov)
{
if (m_card != nullptr)
{
@@ -119,7 +119,7 @@ UINT8 newbrain_expansion_slot_t::iorq_r(address_space &space, offs_t offset, UIN
// iorq_w - I/O request write
//-------------------------------------------------
-void newbrain_expansion_slot_t::iorq_w(address_space &space, offs_t offset, UINT8 data, bool &prtov)
+void newbrain_expansion_slot_t::iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov)
{
if (m_card != nullptr)
{
diff --git a/src/devices/bus/newbrain/exp.h b/src/devices/bus/newbrain/exp.h
index 52702a08b85..a81194945df 100644
--- a/src/devices/bus/newbrain/exp.h
+++ b/src/devices/bus/newbrain/exp.h
@@ -74,15 +74,15 @@ class newbrain_expansion_slot_t : public device_t,
{
public:
// construction/destruction
- newbrain_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ newbrain_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~newbrain_expansion_slot_t() { }
// computer interface
- UINT8 mreq_r(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh);
- void mreq_w(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh);
+ uint8_t mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh);
+ void mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh);
- UINT8 iorq_r(address_space &space, offs_t offset, UINT8 data, bool &prtov);
- void iorq_w(address_space &space, offs_t offset, UINT8 data, bool &prtov);
+ uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov);
+ void iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov);
protected:
// device-level overrides
@@ -104,12 +104,12 @@ public:
virtual ~device_newbrain_expansion_slot_interface() { }
// memory access
- virtual UINT8 mreq_r(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) { return data; };
- virtual void mreq_w(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) { };
+ virtual uint8_t mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { return data; };
+ virtual void mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { };
// I/O access
- virtual UINT8 iorq_r(address_space &space, offs_t offset, UINT8 data, bool &prtov) { return data; };
- virtual void iorq_w(address_space &space, offs_t offset, UINT8 data, bool &prtov) { };
+ virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) { return data; };
+ virtual void iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) { };
protected:
newbrain_expansion_slot_t *m_slot;
diff --git a/src/devices/bus/newbrain/fdc.cpp b/src/devices/bus/newbrain/fdc.cpp
index d4fadb9df70..f8965589fb5 100644
--- a/src/devices/bus/newbrain/fdc.cpp
+++ b/src/devices/bus/newbrain/fdc.cpp
@@ -136,7 +136,7 @@ machine_config_constructor newbrain_fdc_t::device_mconfig_additions() const
// newbrain_fdc_t - constructor
//-------------------------------------------------
-newbrain_fdc_t::newbrain_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+newbrain_fdc_t::newbrain_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NEWBRAIN_FDC, "NewBrain FDC", tag, owner, clock, "newbrain_fdc", __FILE__),
device_newbrain_expansion_slot_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
@@ -183,7 +183,7 @@ void newbrain_fdc_t::device_reset()
// mreq_r - memory request read
//-------------------------------------------------
-UINT8 newbrain_fdc_t::mreq_r(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh)
+uint8_t newbrain_fdc_t::mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh)
{
return m_exp->mreq_r(space, offset, data, romov, exrm, raminh);
}
@@ -193,7 +193,7 @@ UINT8 newbrain_fdc_t::mreq_r(address_space &space, offs_t offset, UINT8 data, bo
// mreq_w - memory request write
//-------------------------------------------------
-void newbrain_fdc_t::mreq_w(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh)
+void newbrain_fdc_t::mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh)
{
m_exp->mreq_w(space, offset, data, romov, exrm, raminh);
}
@@ -203,7 +203,7 @@ void newbrain_fdc_t::mreq_w(address_space &space, offs_t offset, UINT8 data, boo
// iorq_r - I/O request read
//-------------------------------------------------
-UINT8 newbrain_fdc_t::iorq_r(address_space &space, offs_t offset, UINT8 data, bool &prtov)
+uint8_t newbrain_fdc_t::iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov)
{
return m_exp->iorq_r(space, offset, data, prtov);
}
@@ -213,7 +213,7 @@ UINT8 newbrain_fdc_t::iorq_r(address_space &space, offs_t offset, UINT8 data, bo
// iorq_w - I/O request write
//-------------------------------------------------
-void newbrain_fdc_t::iorq_w(address_space &space, offs_t offset, UINT8 data, bool &prtov)
+void newbrain_fdc_t::iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov)
{
m_exp->iorq_w(space, offset, data, prtov);
diff --git a/src/devices/bus/newbrain/fdc.h b/src/devices/bus/newbrain/fdc.h
index fdb0e5f4fca..2d2d2bc8576 100644
--- a/src/devices/bus/newbrain/fdc.h
+++ b/src/devices/bus/newbrain/fdc.h
@@ -29,7 +29,7 @@ class newbrain_fdc_t : public device_t,
{
public:
// construction/destruction
- newbrain_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ newbrain_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -46,10 +46,10 @@ protected:
virtual void device_reset() override;
// device_newbrain_expansion_slot_interface overrides
- virtual UINT8 mreq_r(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) override;
- virtual void mreq_w(address_space &space, offs_t offset, UINT8 data, bool &romov, int &exrm, bool &raminh) override;
- virtual UINT8 iorq_r(address_space &space, offs_t offset, UINT8 data, bool &prtov) override;
- virtual void iorq_w(address_space &space, offs_t offset, UINT8 data, bool &prtov) override;
+ virtual uint8_t mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override;
+ virtual void mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override;
+ virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) override;
+ virtual void iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) override;
private:
required_device<z80_device> m_maincpu;
diff --git a/src/devices/bus/nubus/nubus.cpp b/src/devices/bus/nubus/nubus.cpp
index cf73062f82b..4df5c1c5560 100644
--- a/src/devices/bus/nubus/nubus.cpp
+++ b/src/devices/bus/nubus/nubus.cpp
@@ -25,7 +25,7 @@ const device_type NUBUS_SLOT = &device_creator<nubus_slot_device>;
//-------------------------------------------------
// nubus_slot_device - constructor
//-------------------------------------------------
-nubus_slot_device::nubus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_slot_device::nubus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NUBUS_SLOT, "NUBUS_SLOT", tag, owner, clock, "nubus_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_nubus_tag(nullptr),
@@ -33,7 +33,7 @@ nubus_slot_device::nubus_slot_device(const machine_config &mconfig, const char *
{
}
-nubus_slot_device::nubus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nubus_slot_device::nubus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this), m_nubus_tag(nullptr), m_nubus_slottag(nullptr)
{
@@ -77,7 +77,7 @@ void nubus_device::static_set_cputag(device_t &device, const char *tag)
// nubus_device - constructor
//-------------------------------------------------
-nubus_device::nubus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_device::nubus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NUBUS, "NUBUS", tag, owner, clock, "nubus", __FILE__), m_maincpu(nullptr),
m_out_irq9_cb(*this),
m_out_irqa_cb(*this),
@@ -88,7 +88,7 @@ nubus_device::nubus_device(const machine_config &mconfig, const char *tag, devic
{
}
-nubus_device::nubus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nubus_device::nubus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_maincpu(nullptr),
m_out_irq9_cb(*this),
m_out_irqa_cb(*this),
@@ -127,7 +127,7 @@ void nubus_device::add_nubus_card(device_nubus_card_interface *card)
m_device_list.append(*card);
}
-void nubus_device::install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler, UINT32 mask)
+void nubus_device::install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler, uint32_t mask)
{
m_maincpu = machine().device<cpu_device>(m_cputag);
int buswidth = m_maincpu->space_config(AS_PROGRAM)->m_databus_width;
@@ -137,14 +137,14 @@ void nubus_device::install_device(offs_t start, offs_t end, read8_delegate rhand
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, mask);
break;
case 64:
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, ((UINT64)mask<<32)|mask);
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, ((uint64_t)mask<<32)|mask);
break;
default:
fatalerror("NUBUS: Bus width %d not supported\n", buswidth);
}
}
-void nubus_device::install_device(offs_t start, offs_t end, read16_delegate rhandler, write16_delegate whandler, UINT32 mask)
+void nubus_device::install_device(offs_t start, offs_t end, read16_delegate rhandler, write16_delegate whandler, uint32_t mask)
{
m_maincpu = machine().device<cpu_device>(m_cputag);
int buswidth = m_maincpu->space_config(AS_PROGRAM)->m_databus_width;
@@ -154,14 +154,14 @@ void nubus_device::install_device(offs_t start, offs_t end, read16_delegate rhan
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, mask);
break;
case 64:
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, ((UINT64)mask<<32)|mask);
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, ((uint64_t)mask<<32)|mask);
break;
default:
fatalerror("NUBUS: Bus width %d not supported\n", buswidth);
}
}
-void nubus_device::install_device(offs_t start, offs_t end, read32_delegate rhandler, write32_delegate whandler, UINT32 mask)
+void nubus_device::install_device(offs_t start, offs_t end, read32_delegate rhandler, write32_delegate whandler, uint32_t mask)
{
m_maincpu = machine().device<cpu_device>(m_cputag);
int buswidth = m_maincpu->space_config(AS_PROGRAM)->m_databus_width;
@@ -171,14 +171,14 @@ void nubus_device::install_device(offs_t start, offs_t end, read32_delegate rhan
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, mask);
break;
case 64:
- m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, ((UINT64)mask<<32)|mask);
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, ((uint64_t)mask<<32)|mask);
break;
default:
fatalerror("NUBUS: Bus width %d not supported\n", buswidth);
}
}
-void nubus_device::install_readonly_device(offs_t start, offs_t end, read32_delegate rhandler, UINT32 mask)
+void nubus_device::install_readonly_device(offs_t start, offs_t end, read32_delegate rhandler, uint32_t mask)
{
m_maincpu = machine().device<cpu_device>(m_cputag);
int buswidth = m_maincpu->space_config(AS_PROGRAM)->m_databus_width;
@@ -188,14 +188,14 @@ void nubus_device::install_readonly_device(offs_t start, offs_t end, read32_dele
m_maincpu->space(AS_PROGRAM).install_read_handler(start, end, rhandler, mask);
break;
case 64:
- m_maincpu->space(AS_PROGRAM).install_read_handler(start, end, rhandler, ((UINT64)mask<<32)|mask);
+ m_maincpu->space(AS_PROGRAM).install_read_handler(start, end, rhandler, ((uint64_t)mask<<32)|mask);
break;
default:
fatalerror("NUBUS: Bus width %d not supported\n", buswidth);
}
}
-void nubus_device::install_writeonly_device(offs_t start, offs_t end, write32_delegate whandler, UINT32 mask)
+void nubus_device::install_writeonly_device(offs_t start, offs_t end, write32_delegate whandler, uint32_t mask)
{
m_maincpu = machine().device<cpu_device>(m_cputag);
int buswidth = m_maincpu->space_config(AS_PROGRAM)->m_databus_width;
@@ -205,14 +205,14 @@ void nubus_device::install_writeonly_device(offs_t start, offs_t end, write32_de
m_maincpu->space(AS_PROGRAM).install_write_handler(start, end, whandler, mask);
break;
case 64:
- m_maincpu->space(AS_PROGRAM).install_write_handler(start, end, whandler, ((UINT64)mask<<32)|mask);
+ m_maincpu->space(AS_PROGRAM).install_write_handler(start, end, whandler, ((uint64_t)mask<<32)|mask);
break;
default:
fatalerror("NUBUS: Bus width %d not supported\n", buswidth);
}
}
-void nubus_device::install_bank(offs_t start, offs_t end, const char *tag, UINT8 *data)
+void nubus_device::install_bank(offs_t start, offs_t end, const char *tag, uint8_t *data)
{
// printf("install_bank: %s @ %x->%x\n", tag, start, end);
m_maincpu = machine().device<cpu_device>(m_cputag);
@@ -312,7 +312,7 @@ void device_nubus_card_interface::set_nubus_device()
m_nubus->add_nubus_card(this);
}
-void device_nubus_card_interface::install_bank(offs_t start, offs_t end, const char *tag, UINT8 *data)
+void device_nubus_card_interface::install_bank(offs_t start, offs_t end, const char *tag, uint8_t *data)
{
char bank[256];
@@ -328,17 +328,17 @@ void device_nubus_card_interface::install_declaration_rom(device_t *dev, const c
{
bool inverted = false;
- UINT8 *rom = device().machine().root_device().memregion(dev->subtag(romregion).c_str())->base();
- UINT32 romlen = device().machine().root_device().memregion(dev->subtag(romregion).c_str())->bytes();
+ uint8_t *rom = device().machine().root_device().memregion(dev->subtag(romregion).c_str())->base();
+ uint32_t romlen = device().machine().root_device().memregion(dev->subtag(romregion).c_str())->bytes();
// printf("ROM length is %x, last bytes are %02x %02x\n", romlen, rom[romlen-2], rom[romlen-1]);
if (reverse_rom)
{
- UINT8 temp;
- UINT32 endptr = romlen-1;
+ uint8_t temp;
+ uint32_t endptr = romlen-1;
- for (UINT32 idx = 0; idx < romlen / 2; idx++)
+ for (uint32_t idx = 0; idx < romlen / 2; idx++)
{
temp = rom[idx];
rom[idx] = rom[endptr];
@@ -347,7 +347,7 @@ void device_nubus_card_interface::install_declaration_rom(device_t *dev, const c
}
}
- UINT8 byteLanes = rom[romlen-1];
+ uint8_t byteLanes = rom[romlen-1];
// check if all bits are inverted
if (rom[romlen-2] == 0xff)
{
@@ -459,7 +459,7 @@ void device_nubus_card_interface::install_declaration_rom(device_t *dev, const c
}
// now install the ROM
- UINT32 addr = get_slotspace() + 0x01000000;
+ uint32_t addr = get_slotspace() + 0x01000000;
char bankname[128];
strcpy(bankname, "rom_");
strcat(bankname, m_nubus_slottag);
@@ -467,7 +467,7 @@ void device_nubus_card_interface::install_declaration_rom(device_t *dev, const c
// printf("Installing ROM at %x, length %x\n", addr, romlen);
if (mirror_all_mb) // mirror the declaration ROM across all 16 megs of the slot space
{
- UINT32 off = 0;
+ uint32_t off = 0;
while(off < 0x1000000) {
m_nubus->install_bank(addr + off, addr+off+romlen-1, bankname, &m_declaration_rom[0]);
off += romlen;
diff --git a/src/devices/bus/nubus/nubus.h b/src/devices/bus/nubus/nubus.h
index cd0b69c1d27..5caaefb29fb 100644
--- a/src/devices/bus/nubus/nubus.h
+++ b/src/devices/bus/nubus/nubus.h
@@ -64,8 +64,8 @@ class nubus_slot_device : public device_t,
{
public:
// construction/destruction
- nubus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nubus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nubus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -87,8 +87,8 @@ class nubus_device : public device_t
{
public:
// construction/destruction
- nubus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nubus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nubus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
~nubus_device() { m_device_list.detach_all(); }
// inline configuration
@@ -101,12 +101,12 @@ public:
template<class _Object> static devcb_base &set_out_irqe_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irqe_cb.set_callback(object); }
void add_nubus_card(device_nubus_card_interface *card);
- void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler, UINT32 mask=0xffffffff);
- void install_device(offs_t start, offs_t end, read16_delegate rhandler, write16_delegate whandler, UINT32 mask=0xffffffff);
- void install_device(offs_t start, offs_t end, read32_delegate rhandler, write32_delegate whandler, UINT32 mask=0xffffffff);
- void install_readonly_device(offs_t start, offs_t end, read32_delegate rhandler, UINT32 mask=0xffffffff);
- void install_writeonly_device(offs_t start, offs_t end, write32_delegate whandler, UINT32 mask=0xffffffff);
- void install_bank(offs_t start, offs_t end, const char *tag, UINT8 *data);
+ void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler, uint32_t mask=0xffffffff);
+ void install_device(offs_t start, offs_t end, read16_delegate rhandler, write16_delegate whandler, uint32_t mask=0xffffffff);
+ void install_device(offs_t start, offs_t end, read32_delegate rhandler, write32_delegate whandler, uint32_t mask=0xffffffff);
+ void install_readonly_device(offs_t start, offs_t end, read32_delegate rhandler, uint32_t mask=0xffffffff);
+ void install_writeonly_device(offs_t start, offs_t end, write32_delegate whandler, uint32_t mask=0xffffffff);
+ void install_bank(offs_t start, offs_t end, const char *tag, uint8_t *data);
void set_irq_line(int slot, int state);
DECLARE_WRITE_LINE_MEMBER( irq9_w );
@@ -156,10 +156,10 @@ public:
// helper functions for card devices
void install_declaration_rom(device_t *dev, const char *romregion, bool mirror_all_mb = false, bool reverse_rom = false);
- void install_bank(offs_t start, offs_t end, const char *tag, UINT8 *data);
+ void install_bank(offs_t start, offs_t end, const char *tag, uint8_t *data);
- UINT32 get_slotspace() { return 0xf0000000 | (m_slot<<24); }
- UINT32 get_super_slotspace() { return m_slot<<28; }
+ uint32_t get_slotspace() { return 0xf0000000 | (m_slot<<24); }
+ uint32_t get_super_slotspace() { return m_slot<<28; }
void raise_slot_irq() { m_nubus->set_irq_line(m_slot, ASSERT_LINE); }
void lower_slot_irq() { m_nubus->set_irq_line(m_slot, CLEAR_LINE); }
@@ -171,7 +171,7 @@ public:
const char *m_nubus_tag, *m_nubus_slottag;
int m_slot;
device_nubus_card_interface *m_next;
- std::vector<UINT8> m_declaration_rom;
+ std::vector<uint8_t> m_declaration_rom;
};
#endif /* __NUBUS_H__ */
diff --git a/src/devices/bus/nubus/nubus_48gc.cpp b/src/devices/bus/nubus/nubus_48gc.cpp
index 2a60b1e5bfb..0906d9dfeb6 100644
--- a/src/devices/bus/nubus/nubus_48gc.cpp
+++ b/src/devices/bus/nubus/nubus_48gc.cpp
@@ -76,7 +76,7 @@ const tiny_rom_entry *nubus_824gc_device::device_rom_region() const
// jmfb_device - constructor
//-------------------------------------------------
-jmfb_device::jmfb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+jmfb_device::jmfb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_screen(nullptr), m_timer(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_stride(0), m_base(0), m_count(0), m_clutoffs(0), m_xres(0), m_yres(0), m_is824(false)
@@ -85,13 +85,13 @@ jmfb_device::jmfb_device(const machine_config &mconfig, device_type type, const
m_screen_tag = m_assembled_tag.c_str();
}
-nubus_48gc_device::nubus_48gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_48gc_device::nubus_48gc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
jmfb_device(mconfig, NUBUS_48GC, "Apple 4*8 video card", tag, owner, clock, "nb_48gc", __FILE__)
{
m_is824 = false;
}
-nubus_824gc_device::nubus_824gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_824gc_device::nubus_824gc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
jmfb_device(mconfig, NUBUS_824GC, "Apple 8*24 video card", tag, owner, clock, "nb_824gc", __FILE__)
{
m_is824 = true;
@@ -103,7 +103,7 @@ nubus_824gc_device::nubus_824gc_device(const machine_config &mconfig, const char
void jmfb_device::device_start()
{
- UINT32 slotspace;
+ uint32_t slotspace;
// set_nubus_device makes m_slot valid
set_nubus_device();
@@ -157,12 +157,12 @@ void jmfb_device::device_timer(emu_timer &timer, device_timer_id tid, int param,
m_timer->adjust(m_screen->time_until_pos(479, 0), 0);
}
-UINT32 jmfb_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t jmfb_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT32 *scanline, *base;
+ uint32_t *scanline, *base;
int x, y;
- UINT8 *vram8 = &m_vram[0];
- UINT8 pixels;
+ uint8_t *vram8 = &m_vram[0];
+ uint8_t pixels;
// first time? kick off the VBL timer
if (!m_screen)
@@ -243,7 +243,7 @@ UINT32 jmfb_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, c
for (y = 0; y < m_yres; y++)
{
scanline = &bitmap.pix32(y);
- base = (UINT32 *)&m_vram[y * m_stride];
+ base = (uint32_t *)&m_vram[y * m_stride];
for (x = 0; x < m_xres; x++)
{
*scanline++ = *base++;
diff --git a/src/devices/bus/nubus/nubus_48gc.h b/src/devices/bus/nubus/nubus_48gc.h
index 32c333113f7..6a435f8c098 100644
--- a/src/devices/bus/nubus/nubus_48gc.h
+++ b/src/devices/bus/nubus/nubus_48gc.h
@@ -21,14 +21,14 @@ class jmfb_device :
{
public:
// construction/destruction
- jmfb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ jmfb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
screen_device *m_screen;
emu_timer *m_timer;
@@ -41,10 +41,10 @@ protected:
DECLARE_WRITE32_MEMBER(mac_48gc_w);
public:
- std::vector<UINT8> m_vram;
- UINT32 m_mode, m_vbl_disable, m_toggle, m_stride, m_base;
- UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
- UINT32 m_registers[0x100];
+ std::vector<uint8_t> m_vram;
+ uint32_t m_mode, m_vbl_disable, m_toggle, m_stride, m_base;
+ uint32_t m_palette[256], m_colors[3], m_count, m_clutoffs;
+ uint32_t m_registers[0x100];
int m_xres, m_yres;
bool m_is824;
std::string m_assembled_tag;
@@ -53,13 +53,13 @@ public:
class nubus_48gc_device : public jmfb_device
{
public:
- nubus_48gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nubus_48gc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class nubus_824gc_device : public jmfb_device
{
public:
- nubus_824gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nubus_824gc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
diff --git a/src/devices/bus/nubus/nubus_asntmc3b.cpp b/src/devices/bus/nubus/nubus_asntmc3b.cpp
index da9b4e9f803..09a872f6de4 100644
--- a/src/devices/bus/nubus/nubus_asntmc3b.cpp
+++ b/src/devices/bus/nubus/nubus_asntmc3b.cpp
@@ -76,19 +76,19 @@ const tiny_rom_entry *nubus_appleenet_device::device_rom_region() const
// nubus_mac8390_device - constructor
//-------------------------------------------------
-nubus_mac8390_device::nubus_mac8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nubus_mac8390_device::nubus_mac8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, NUBUS_ASNTMC3NB, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this),
m_dp83902(*this, MAC8390_839X)
{
}
-nubus_asntmc3nb_device::nubus_asntmc3nb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_asntmc3nb_device::nubus_asntmc3nb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
nubus_mac8390_device(mconfig, NUBUS_ASNTMC3NB, "Asante MC3NB Ethernet card", tag, owner, clock, "nb_amc3b", __FILE__)
{
}
-nubus_appleenet_device::nubus_appleenet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_appleenet_device::nubus_appleenet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
nubus_mac8390_device(mconfig, NUBUS_APPLEENET, "Apple NuBus Ethernet card", tag, owner, clock, "nb_aenet", __FILE__)
{
}
@@ -99,9 +99,9 @@ nubus_appleenet_device::nubus_appleenet_device(const machine_config &mconfig, co
void nubus_mac8390_device::device_start()
{
- UINT32 slotspace;
+ uint32_t slotspace;
char mac[7];
- UINT32 num = rand();
+ uint32_t num = rand();
memset(m_prom, 0x57, 16);
sprintf(mac+2, "\x1b%c%c%c", (num >> 16) & 0xff, (num >> 8) & 0xff, num & 0xff);
mac[0] = mac[1] = 0; // avoid gcc warning
@@ -116,7 +116,7 @@ void nubus_mac8390_device::device_start()
// printf("[ASNTMC3NB %p] slotspace = %x\n", this, slotspace);
// TODO: move 24-bit mirroring down into nubus.c
- UINT32 ofs_24bit = m_slot<<20;
+ uint32_t ofs_24bit = m_slot<<20;
m_nubus->install_device(slotspace+0xd0000, slotspace+0xdffff, read8_delegate(FUNC(nubus_mac8390_device::asntm3b_ram_r), this), write8_delegate(FUNC(nubus_mac8390_device::asntm3b_ram_w), this));
m_nubus->install_device(slotspace+0xe0000, slotspace+0xe003f, read32_delegate(FUNC(nubus_mac8390_device::en_r), this), write32_delegate(FUNC(nubus_mac8390_device::en_w), this));
m_nubus->install_device(slotspace+0xd0000+ofs_24bit, slotspace+0xdffff+ofs_24bit, read8_delegate(FUNC(nubus_mac8390_device::asntm3b_ram_r), this), write8_delegate(FUNC(nubus_mac8390_device::asntm3b_ram_w), this));
diff --git a/src/devices/bus/nubus/nubus_asntmc3b.h b/src/devices/bus/nubus/nubus_asntmc3b.h
index 0f88175df5b..799f4c41470 100644
--- a/src/devices/bus/nubus/nubus_asntmc3b.h
+++ b/src/devices/bus/nubus/nubus_asntmc3b.h
@@ -21,7 +21,7 @@ class nubus_mac8390_device :
{
public:
// construction/destruction
- nubus_mac8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nubus_mac8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -44,20 +44,20 @@ protected:
required_device<dp8390_device> m_dp83902;
private:
- UINT8 m_ram[0x20000];
- UINT8 m_prom[16];
+ uint8_t m_ram[0x20000];
+ uint8_t m_prom[16];
};
class nubus_asntmc3nb_device : public nubus_mac8390_device
{
public:
- nubus_asntmc3nb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nubus_asntmc3nb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class nubus_appleenet_device : public nubus_mac8390_device
{
public:
- nubus_appleenet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nubus_appleenet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
diff --git a/src/devices/bus/nubus/nubus_cb264.cpp b/src/devices/bus/nubus/nubus_cb264.cpp
index 04808f1520a..b7a021a0bd9 100644
--- a/src/devices/bus/nubus/nubus_cb264.cpp
+++ b/src/devices/bus/nubus/nubus_cb264.cpp
@@ -69,13 +69,13 @@ const tiny_rom_entry *nubus_cb264_device::device_rom_region() const
// nubus_cb264_device - constructor
//-------------------------------------------------
-nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NUBUS_CB264, "RasterOps ColorBoard 264 video card", tag, owner, clock, "nb_cb264", __FILE__),
device_nubus_card_interface(mconfig, *this), m_cb264_mode(0), m_cb264_vbl_disable(0), m_cb264_toggle(0), m_count(0), m_clutoffs(0)
{
}
-nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this), m_cb264_mode(0), m_cb264_vbl_disable(0), m_cb264_toggle(0), m_count(0), m_clutoffs(0)
{
@@ -87,7 +87,7 @@ nubus_cb264_device::nubus_cb264_device(const machine_config &mconfig, device_typ
void nubus_cb264_device::device_start()
{
- UINT32 slotspace;
+ uint32_t slotspace;
// set_nubus_device makes m_slot valid
set_nubus_device();
@@ -125,11 +125,11 @@ void nubus_cb264_device::device_reset()
***************************************************************************/
-UINT32 nubus_cb264_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t nubus_cb264_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT32 *scanline, *base;
+ uint32_t *scanline, *base;
int x, y;
- UINT8 pixels;
+ uint8_t pixels;
if (!m_cb264_vbl_disable)
{
@@ -205,7 +205,7 @@ UINT32 nubus_cb264_device::screen_update(screen_device &screen, bitmap_rgb32 &bi
case 4: // 24 bpp
case 7: // ???
{
- UINT32 *vram32 = (UINT32 *)&m_vram[0];
+ uint32_t *vram32 = (uint32_t *)&m_vram[0];
for (y = 0; y < 480; y++)
{
diff --git a/src/devices/bus/nubus/nubus_cb264.h b/src/devices/bus/nubus/nubus_cb264.h
index 5caa7cf6545..766adfd2e89 100644
--- a/src/devices/bus/nubus/nubus_cb264.h
+++ b/src/devices/bus/nubus/nubus_cb264.h
@@ -20,14 +20,14 @@ class nubus_cb264_device :
{
public:
// construction/destruction
- nubus_cb264_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_cb264_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nubus_cb264_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nubus_cb264_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
protected:
// device-level overrides
virtual void device_start() override;
@@ -39,9 +39,9 @@ protected:
DECLARE_WRITE32_MEMBER(cb264_ramdac_w);
public:
- std::vector<UINT8> m_vram;
- UINT32 m_cb264_mode, m_cb264_vbl_disable, m_cb264_toggle;
- UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
+ std::vector<uint8_t> m_vram;
+ uint32_t m_cb264_mode, m_cb264_vbl_disable, m_cb264_toggle;
+ uint32_t m_palette[256], m_colors[3], m_count, m_clutoffs;
};
diff --git a/src/devices/bus/nubus/nubus_image.cpp b/src/devices/bus/nubus/nubus_image.cpp
index 4b7901891ff..7902bf69669 100644
--- a/src/devices/bus/nubus/nubus_image.cpp
+++ b/src/devices/bus/nubus/nubus_image.cpp
@@ -19,11 +19,11 @@
// on big-endian, these are NOPs. (TODO: hey, where did WORDS_BIGENDIAN go since the GENie transition?!)
#if defined(__ppc__) || defined (__PPC__) || defined(__ppc64__) || defined(__PPC64__)
-static UINT32 ni_htonl(UINT32 x) { return x; }
-static UINT32 ni_ntohl(UINT32 x) { return x; }
+static uint32_t ni_htonl(uint32_t x) { return x; }
+static uint32_t ni_ntohl(uint32_t x) { return x; }
#else
-static UINT32 ni_htonl(UINT32 x) { return flipendian_int32(x); }
-static UINT32 ni_ntohl(UINT32 x) { return flipendian_int32(x); }
+static uint32_t ni_htonl(uint32_t x) { return flipendian_int32(x); }
+static uint32_t ni_ntohl(uint32_t x) { return flipendian_int32(x); }
#endif
@@ -34,7 +34,7 @@ class messimg_disk_image_device : public device_t,
{
public:
// construction/destruction
- messimg_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ messimg_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// image-level overrides
virtual iodevice_t image_type() const override { return IO_QUICKLOAD; }
@@ -55,8 +55,8 @@ public:
virtual void device_start() override;
virtual void device_reset() override;
public:
- UINT32 m_size;
- std::unique_ptr<UINT8[]> m_data;
+ uint32_t m_size;
+ std::unique_ptr<uint8_t[]> m_data;
bool m_ejected;
};
@@ -66,7 +66,7 @@ extern const device_type MESSIMG_DISK;
const device_type MESSIMG_DISK = &device_creator<messimg_disk_image_device>;
-messimg_disk_image_device::messimg_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+messimg_disk_image_device::messimg_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MESSIMG_DISK, "Mac image", tag, owner, clock, "messimg_disk_image", __FILE__),
device_image_interface(mconfig, *this), m_size(0), m_data(nullptr), m_ejected(false)
{
@@ -88,14 +88,14 @@ void messimg_disk_image_device::device_start()
if (exists() && fseek(0, SEEK_END) == 0)
{
- m_size = (UINT32)ftell();
+ m_size = (uint32_t)ftell();
}
}
image_init_result messimg_disk_image_device::call_load()
{
fseek(0, SEEK_END);
- m_size = (UINT32)ftell();
+ m_size = (uint32_t)ftell();
if (m_size > (256*1024*1024))
{
printf("Mac image too large: must be 256MB or less!\n");
@@ -103,7 +103,7 @@ image_init_result messimg_disk_image_device::call_load()
return image_init_result::FAIL;
}
- m_data = make_unique_clear<UINT8[]>(m_size);
+ m_data = make_unique_clear<uint8_t[]>(m_size);
fseek(0, SEEK_SET);
fread(m_data.get(), m_size);
m_ejected = false;
@@ -171,13 +171,13 @@ const tiny_rom_entry *nubus_image_device::device_rom_region() const
// nubus_image_device - constructor
//-------------------------------------------------
-nubus_image_device::nubus_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_image_device::nubus_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NUBUS_IMAGE, "Disk Image Pseudo-Card", tag, owner, clock, "nb_image", __FILE__),
device_nubus_card_interface(mconfig, *this), m_image(nullptr)
{
}
-nubus_image_device::nubus_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nubus_image_device::nubus_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this), m_image(nullptr)
{
@@ -189,8 +189,8 @@ nubus_image_device::nubus_image_device(const machine_config &mconfig, device_typ
void nubus_image_device::device_start()
{
- UINT32 slotspace;
- UINT32 superslotspace;
+ uint32_t slotspace;
+ uint32_t superslotspace;
// set_nubus_device makes m_slot valid
set_nubus_device();
@@ -253,7 +253,7 @@ READ32_MEMBER( nubus_image_device::image_r )
WRITE32_MEMBER( nubus_image_device::image_super_w )
{
- UINT32 *image = (UINT32*)m_image->m_data.get();
+ uint32_t *image = (uint32_t*)m_image->m_data.get();
data = ((data & 0xff) << 24) | ((data & 0xff00) << 8) | ((data & 0xff0000) >> 8) | ((data & 0xff000000) >> 24);
mem_mask = ((mem_mask & 0xff) << 24) | ((mem_mask & 0xff00) << 8) | ((mem_mask & 0xff0000) >> 8) | ((mem_mask & 0xff000000) >> 24);
@@ -262,8 +262,8 @@ WRITE32_MEMBER( nubus_image_device::image_super_w )
READ32_MEMBER( nubus_image_device::image_super_r )
{
- UINT32 *image = (UINT32*)m_image->m_data.get();
- UINT32 data = image[offset];
+ uint32_t *image = (uint32_t*)m_image->m_data.get();
+ uint32_t data = image[offset];
return ((data & 0xff) << 24) | ((data & 0xff00) << 8) | ((data & 0xff0000) >> 8) | ((data & 0xff000000) >> 24);
}
@@ -271,7 +271,7 @@ WRITE32_MEMBER( nubus_image_device::file_cmd_w )
{
const osd::directory::entry *dp;
char fullpath[1024];
- UINT64 filesize;
+ uint64_t filesize;
// data = ((data & 0xff) << 24) | ((data & 0xff00) << 8) | ((data & 0xff0000) >> 8) | ((data & 0xff000000) >> 24);
filectx.curcmd = data;
@@ -372,12 +372,12 @@ READ32_MEMBER( nubus_image_device::file_len_r )
WRITE32_MEMBER( nubus_image_device::file_name_w )
{
- ((UINT32*)(filectx.filename))[offset] = ni_ntohl(data);
+ ((uint32_t*)(filectx.filename))[offset] = ni_ntohl(data);
}
READ32_MEMBER( nubus_image_device::file_name_r )
{
- UINT32 ret;
- ret = ni_htonl(((UINT32*)(filectx.filename))[offset]);
+ uint32_t ret;
+ ret = ni_htonl(((uint32_t*)(filectx.filename))[offset]);
return ret;
}
diff --git a/src/devices/bus/nubus/nubus_image.h b/src/devices/bus/nubus/nubus_image.h
index 1b86eed9636..a13de21c624 100644
--- a/src/devices/bus/nubus/nubus_image.h
+++ b/src/devices/bus/nubus/nubus_image.h
@@ -15,13 +15,13 @@
class messimg_disk_image_device;
struct nbfilectx {
- UINT32 curcmd;
- UINT8 filename[128];
- UINT8 curdir[1024];
+ uint32_t curcmd;
+ uint8_t filename[128];
+ uint8_t curdir[1024];
osd::directory::ptr dirp;
osd_file::ptr fd;
- UINT64 filelen;
- UINT32 bytecount;
+ uint64_t filelen;
+ uint32_t bytecount;
};
// ======================> nubus_image_device
@@ -32,8 +32,8 @@ class nubus_image_device :
{
public:
// construction/destruction
- nubus_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nubus_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nubus_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/nubus/nubus_m2hires.cpp b/src/devices/bus/nubus/nubus_m2hires.cpp
index 98217981055..e169586d884 100644
--- a/src/devices/bus/nubus/nubus_m2hires.cpp
+++ b/src/devices/bus/nubus/nubus_m2hires.cpp
@@ -65,7 +65,7 @@ const tiny_rom_entry *nubus_m2hires_device::device_rom_region() const
// nubus_m2hires_device - constructor
//-------------------------------------------------
-nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NUBUS_M2HIRES, "Macintosh II Hi-Resolution video card", tag, owner, clock, "nb_m2hr", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -74,7 +74,7 @@ nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, const
m_screen_tag = m_assembled_tag.c_str();
}
-nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -89,7 +89,7 @@ nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, device
void nubus_m2hires_device::device_start()
{
- UINT32 slotspace;
+ uint32_t slotspace;
// set_nubus_device makes m_slot valid
set_nubus_device();
@@ -100,7 +100,7 @@ void nubus_m2hires_device::device_start()
// printf("[m2hires %p] slotspace = %x\n", this, slotspace);
m_vram.resize(VRAM_SIZE);
- m_vram32 = (UINT32 *)&m_vram[0];
+ m_vram32 = (uint32_t *)&m_vram[0];
m_nubus->install_device(slotspace, slotspace+VRAM_SIZE-1, read32_delegate(FUNC(nubus_m2hires_device::vram_r), this), write32_delegate(FUNC(nubus_m2hires_device::vram_w), this));
m_nubus->install_device(slotspace+0x900000, slotspace+VRAM_SIZE-1+0x900000, read32_delegate(FUNC(nubus_m2hires_device::vram_r), this), write32_delegate(FUNC(nubus_m2hires_device::vram_w), this));
@@ -144,11 +144,11 @@ void nubus_m2hires_device::device_timer(emu_timer &timer, device_timer_id tid, i
***************************************************************************/
-UINT32 nubus_m2hires_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t nubus_m2hires_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT32 *scanline;
+ uint32_t *scanline;
int x, y;
- UINT8 pixels, *vram;
+ uint8_t pixels, *vram;
vram = &m_vram[0x20];
diff --git a/src/devices/bus/nubus/nubus_m2hires.h b/src/devices/bus/nubus/nubus_m2hires.h
index 1f5f932e333..0caa4c249ff 100644
--- a/src/devices/bus/nubus/nubus_m2hires.h
+++ b/src/devices/bus/nubus/nubus_m2hires.h
@@ -21,14 +21,14 @@ class nubus_m2hires_device :
{
public:
// construction/destruction
- nubus_m2hires_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nubus_m2hires_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
protected:
// device-level overrides
virtual void device_start() override;
@@ -41,10 +41,10 @@ protected:
DECLARE_WRITE32_MEMBER(vram_w);
public:
- std::vector<UINT8> m_vram;
- UINT32 *m_vram32;
- UINT32 m_mode, m_vbl_disable, m_toggle;
- UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
+ std::vector<uint8_t> m_vram;
+ uint32_t *m_vram32;
+ uint32_t m_mode, m_vbl_disable, m_toggle;
+ uint32_t m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
std::string m_assembled_tag;
};
diff --git a/src/devices/bus/nubus/nubus_m2video.cpp b/src/devices/bus/nubus/nubus_m2video.cpp
index 1d8134887f8..04db8cffb1b 100644
--- a/src/devices/bus/nubus/nubus_m2video.cpp
+++ b/src/devices/bus/nubus/nubus_m2video.cpp
@@ -66,7 +66,7 @@ const tiny_rom_entry *nubus_m2video_device::device_rom_region() const
// nubus_m2video_device - constructor
//-------------------------------------------------
-nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NUBUS_M2VIDEO, "Macintosh II Video Card", tag, owner, clock, "nb_m2vc", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -75,7 +75,7 @@ nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, const
m_screen_tag = m_assembled_tag.c_str();
}
-nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -90,7 +90,7 @@ nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device
void nubus_m2video_device::device_start()
{
- UINT32 slotspace;
+ uint32_t slotspace;
// set_nubus_device makes m_slot valid
set_nubus_device();
@@ -101,7 +101,7 @@ void nubus_m2video_device::device_start()
// printf("[m2video %p] slotspace = %x\n", this, slotspace);
m_vram.resize(VRAM_SIZE);
- m_vram32 = (UINT32 *)&m_vram[0];
+ m_vram32 = (uint32_t *)&m_vram[0];
m_nubus->install_device(slotspace, slotspace+VRAM_SIZE-1, read32_delegate(FUNC(nubus_m2video_device::vram_r), this), write32_delegate(FUNC(nubus_m2video_device::vram_w), this));
m_nubus->install_device(slotspace+0x900000, slotspace+VRAM_SIZE-1+0x900000, read32_delegate(FUNC(nubus_m2video_device::vram_r), this), write32_delegate(FUNC(nubus_m2video_device::vram_w), this));
@@ -145,11 +145,11 @@ void nubus_m2video_device::device_timer(emu_timer &timer, device_timer_id tid, i
***************************************************************************/
-UINT32 nubus_m2video_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t nubus_m2video_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT32 *scanline;
+ uint32_t *scanline;
int x, y;
- UINT8 pixels, *vram;
+ uint8_t pixels, *vram;
vram = &m_vram[0x20];
diff --git a/src/devices/bus/nubus/nubus_m2video.h b/src/devices/bus/nubus/nubus_m2video.h
index 1ed9e33f3c5..949a10e3f9b 100644
--- a/src/devices/bus/nubus/nubus_m2video.h
+++ b/src/devices/bus/nubus/nubus_m2video.h
@@ -21,14 +21,14 @@ class nubus_m2video_device :
{
public:
// construction/destruction
- nubus_m2video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nubus_m2video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
protected:
// device-level overrides
virtual void device_start() override;
@@ -41,10 +41,10 @@ protected:
DECLARE_WRITE32_MEMBER(vram_w);
public:
- std::vector<UINT8> m_vram;
- UINT32 *m_vram32;
- UINT32 m_mode, m_vbl_disable, m_toggle;
- UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
+ std::vector<uint8_t> m_vram;
+ uint32_t *m_vram32;
+ uint32_t m_mode, m_vbl_disable, m_toggle;
+ uint32_t m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
std::string m_assembled_tag;
};
diff --git a/src/devices/bus/nubus/nubus_radiustpd.cpp b/src/devices/bus/nubus/nubus_radiustpd.cpp
index 42053976689..e12275ab710 100644
--- a/src/devices/bus/nubus/nubus_radiustpd.cpp
+++ b/src/devices/bus/nubus/nubus_radiustpd.cpp
@@ -65,7 +65,7 @@ const tiny_rom_entry *nubus_radiustpd_device::device_rom_region() const
// nubus_radiustpd_device - constructor
//-------------------------------------------------
-nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NUBUS_RADIUSTPD, "Radius Two Page Display video card", tag, owner, clock, "nb_rtpd", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -74,7 +74,7 @@ nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, co
m_screen_tag = m_assembled_tag.c_str();
}
-nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -89,7 +89,7 @@ nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, de
void nubus_radiustpd_device::device_start()
{
- UINT32 slotspace;
+ uint32_t slotspace;
// set_nubus_device makes m_slot valid
set_nubus_device();
@@ -100,7 +100,7 @@ void nubus_radiustpd_device::device_start()
printf("[radiustpd %p] slotspace = %x\n", (void *)this, slotspace);
m_vram.resize(VRAM_SIZE);
- m_vram32 = (UINT32 *)&m_vram[0];
+ m_vram32 = (uint32_t *)&m_vram[0];
m_nubus->install_device(slotspace, slotspace+VRAM_SIZE-1, read32_delegate(FUNC(nubus_radiustpd_device::vram_r), this), write32_delegate(FUNC(nubus_radiustpd_device::vram_w), this));
m_nubus->install_device(slotspace+0x900000, slotspace+VRAM_SIZE-1+0x900000, read32_delegate(FUNC(nubus_radiustpd_device::vram_r), this), write32_delegate(FUNC(nubus_radiustpd_device::vram_w), this));
@@ -145,11 +145,11 @@ void nubus_radiustpd_device::device_timer(emu_timer &timer, device_timer_id tid,
***************************************************************************/
-UINT32 nubus_radiustpd_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t nubus_radiustpd_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT32 *scanline;
+ uint32_t *scanline;
int x, y;
- UINT8 pixels, *vram;
+ uint8_t pixels, *vram;
vram = &m_vram[0x200];
diff --git a/src/devices/bus/nubus/nubus_radiustpd.h b/src/devices/bus/nubus/nubus_radiustpd.h
index e227913a69b..4643633a6a7 100644
--- a/src/devices/bus/nubus/nubus_radiustpd.h
+++ b/src/devices/bus/nubus/nubus_radiustpd.h
@@ -21,14 +21,14 @@ class nubus_radiustpd_device :
{
public:
// construction/destruction
- nubus_radiustpd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nubus_radiustpd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
protected:
// device-level overrides
virtual void device_start() override;
@@ -41,10 +41,10 @@ protected:
DECLARE_WRITE32_MEMBER(vram_w);
public:
- std::vector<UINT8> m_vram;
- UINT32 *m_vram32;
- UINT32 m_mode, m_vbl_disable, m_toggle;
- UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
+ std::vector<uint8_t> m_vram;
+ uint32_t *m_vram32;
+ uint32_t m_mode, m_vbl_disable, m_toggle;
+ uint32_t m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
std::string m_assembled_tag;
};
diff --git a/src/devices/bus/nubus/nubus_spec8.cpp b/src/devices/bus/nubus/nubus_spec8.cpp
index fbe55114daf..db47b70cd83 100644
--- a/src/devices/bus/nubus/nubus_spec8.cpp
+++ b/src/devices/bus/nubus/nubus_spec8.cpp
@@ -67,7 +67,7 @@ const tiny_rom_entry *nubus_spec8s3_device::device_rom_region() const
// nubus_spec8s3_device - constructor
//-------------------------------------------------
-nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NUBUS_SPEC8S3, "SuperMac Spectrum/8 Series III video card", tag, owner, clock, "nb_sp8s3", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_vbl_pending(false), m_parameter(0)
@@ -76,7 +76,7 @@ nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, const
m_screen_tag = m_assembled_tag.c_str();
}
-nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_vbl_pending(false), m_parameter(0)
@@ -91,7 +91,7 @@ nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, device
void nubus_spec8s3_device::device_start()
{
- UINT32 slotspace;
+ uint32_t slotspace;
// set_nubus_device makes m_slot valid
set_nubus_device();
@@ -102,7 +102,7 @@ void nubus_spec8s3_device::device_start()
// printf("[SPEC8S3 %p] slotspace = %x\n", this, slotspace);
m_vram.resize(VRAM_SIZE);
- m_vram32 = (UINT32 *)&m_vram[0];
+ m_vram32 = (uint32_t *)&m_vram[0];
m_nubus->install_device(slotspace, slotspace+VRAM_SIZE-1, read32_delegate(FUNC(nubus_spec8s3_device::vram_r), this), write32_delegate(FUNC(nubus_spec8s3_device::vram_w), this));
m_nubus->install_device(slotspace+0x900000, slotspace+VRAM_SIZE-1+0x900000, read32_delegate(FUNC(nubus_spec8s3_device::vram_r), this), write32_delegate(FUNC(nubus_spec8s3_device::vram_w), this));
m_nubus->install_device(slotspace+0xd0000, slotspace+0xfffff, read32_delegate(FUNC(nubus_spec8s3_device::spec8s3_r), this), write32_delegate(FUNC(nubus_spec8s3_device::spec8s3_w), this));
@@ -148,11 +148,11 @@ void nubus_spec8s3_device::device_timer(emu_timer &timer, device_timer_id tid, i
***************************************************************************/
-UINT32 nubus_spec8s3_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t nubus_spec8s3_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT32 *scanline;
+ uint32_t *scanline;
int x, y;
- UINT8 pixels, *vram;
+ uint8_t pixels, *vram;
vram = &m_vram[0x400];
diff --git a/src/devices/bus/nubus/nubus_spec8.h b/src/devices/bus/nubus/nubus_spec8.h
index 61af612c7a6..0259cd64140 100644
--- a/src/devices/bus/nubus/nubus_spec8.h
+++ b/src/devices/bus/nubus/nubus_spec8.h
@@ -21,15 +21,15 @@ class nubus_spec8s3_device :
{
public:
// construction/destruction
- nubus_spec8s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nubus_spec8s3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
protected:
// device-level overrides
virtual void device_start() override;
@@ -41,18 +41,18 @@ protected:
DECLARE_WRITE32_MEMBER(vram_w);
public:
- std::vector<UINT8> m_vram;
- UINT32 *m_vram32;
- UINT32 m_mode, m_vbl_disable;
- UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
+ std::vector<uint8_t> m_vram;
+ uint32_t *m_vram32;
+ uint32_t m_mode, m_vbl_disable;
+ uint32_t m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
std::string m_assembled_tag;
private:
- //UINT32 m_7xxxxx_regs[0x100000/4];
+ //uint32_t m_7xxxxx_regs[0x100000/4];
//int m_width, m_height, m_patofsx, m_patofsy;
- //UINT32 m_vram_addr, m_vram_src;
- //UINT8 m_fillbytes[256];
+ //uint32_t m_vram_addr, m_vram_src;
+ //uint8_t m_fillbytes[256];
bool m_vbl_pending;
int m_parameter;
};
diff --git a/src/devices/bus/nubus/nubus_specpdq.cpp b/src/devices/bus/nubus/nubus_specpdq.cpp
index a7995cc1ff0..2926d1c2faa 100644
--- a/src/devices/bus/nubus/nubus_specpdq.cpp
+++ b/src/devices/bus/nubus/nubus_specpdq.cpp
@@ -82,7 +82,7 @@ const tiny_rom_entry *nubus_specpdq_device::device_rom_region() const
// nubus_specpdq_device - constructor
//-------------------------------------------------
-nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NUBUS_SPECPDQ, "SuperMac Spectrum PDQ video card", tag, owner, clock, "nb_spdq", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_width(0), m_height(0), m_patofsx(0), m_patofsy(0), m_vram_addr(0), m_vram_src(0),
@@ -92,7 +92,7 @@ nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, const
m_screen_tag = m_assembled_tag.c_str();
}
-nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_count(0), m_clutoffs(0), m_timer(nullptr), m_width(0), m_height(0), m_patofsx(0), m_patofsy(0), m_vram_addr(0), m_vram_src(0),
@@ -108,7 +108,7 @@ nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, device
void nubus_specpdq_device::device_start()
{
- UINT32 slotspace;
+ uint32_t slotspace;
// set_nubus_device makes m_slot valid
set_nubus_device();
@@ -119,7 +119,7 @@ void nubus_specpdq_device::device_start()
// printf("[specpdq %p] slotspace = %x\n", this, slotspace);
m_vram.resize(VRAM_SIZE);
- m_vram32 = (UINT32 *)&m_vram[0];
+ m_vram32 = (uint32_t *)&m_vram[0];
m_nubus->install_device(slotspace, slotspace+VRAM_SIZE-1, read32_delegate(FUNC(nubus_specpdq_device::vram_r), this), write32_delegate(FUNC(nubus_specpdq_device::vram_w), this));
m_nubus->install_device(slotspace+0x400000, slotspace+0xfbffff, read32_delegate(FUNC(nubus_specpdq_device::specpdq_r), this), write32_delegate(FUNC(nubus_specpdq_device::specpdq_w), this));
@@ -161,11 +161,11 @@ void nubus_specpdq_device::device_timer(emu_timer &timer, device_timer_id tid, i
***************************************************************************/
-UINT32 nubus_specpdq_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t nubus_specpdq_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT32 *scanline;
+ uint32_t *scanline;
int x, y;
- UINT8 pixels, *vram;
+ uint8_t pixels, *vram;
// first time? kick off the VBL timer
vram = &m_vram[0x9000];
@@ -426,7 +426,7 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w )
if (data == 2)
{
int x, y;
- UINT8 *vram = &m_vram[m_vram_addr + m_patofsx]; // m_vram_addr is missing the low 2 bits, we add them back here
+ uint8_t *vram = &m_vram[m_vram_addr + m_patofsx]; // m_vram_addr is missing the low 2 bits, we add them back here
// printf("Fill rectangle with %02x %02x %02x %02x, width %d height %d\n", m_fillbytes[0], m_fillbytes[1], m_fillbytes[2], m_fillbytes[3], m_width, m_height);
@@ -441,8 +441,8 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w )
else if ((data == 0x101) || (data == 0x100))
{
int x, y;
- UINT8 *vram = &m_vram[m_vram_addr];
- UINT8 *vramsrc = &m_vram[m_vram_src];
+ uint8_t *vram = &m_vram[m_vram_addr];
+ uint8_t *vramsrc = &m_vram[m_vram_src];
// printf("Copy rectangle, width %d height %d src %x dst %x\n", m_width, m_height, m_vram_addr, m_vram_src);
diff --git a/src/devices/bus/nubus/nubus_specpdq.h b/src/devices/bus/nubus/nubus_specpdq.h
index 8b937ffbe64..819eac4a2f8 100644
--- a/src/devices/bus/nubus/nubus_specpdq.h
+++ b/src/devices/bus/nubus/nubus_specpdq.h
@@ -21,15 +21,15 @@ class nubus_specpdq_device :
{
public:
// construction/destruction
- nubus_specpdq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_specpdq_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nubus_specpdq_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nubus_specpdq_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
protected:
// device-level overrides
virtual void device_start() override;
@@ -41,18 +41,18 @@ protected:
DECLARE_WRITE32_MEMBER(vram_w);
public:
- std::vector<UINT8> m_vram;
- UINT32 *m_vram32;
- UINT32 m_mode, m_vbl_disable;
- UINT32 m_palette_val[256], m_colors[3], m_count, m_clutoffs;
+ std::vector<uint8_t> m_vram;
+ uint32_t *m_vram32;
+ uint32_t m_mode, m_vbl_disable;
+ uint32_t m_palette_val[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
std::string m_assembled_tag;
private:
- UINT32 m_7xxxxx_regs[0x100000/4];
+ uint32_t m_7xxxxx_regs[0x100000/4];
int m_width, m_height, m_patofsx, m_patofsy;
- UINT32 m_vram_addr, m_vram_src;
- UINT8 m_fillbytes[256];
+ uint32_t m_vram_addr, m_vram_src;
+ uint8_t m_fillbytes[256];
required_device<palette_device> m_palette;
};
diff --git a/src/devices/bus/nubus/nubus_vikbw.cpp b/src/devices/bus/nubus/nubus_vikbw.cpp
index fffdd5f7c36..1c12cbba4fa 100644
--- a/src/devices/bus/nubus/nubus_vikbw.cpp
+++ b/src/devices/bus/nubus/nubus_vikbw.cpp
@@ -65,13 +65,13 @@ const tiny_rom_entry *nubus_vikbw_device::device_rom_region() const
// nubus_vikbw_device - constructor
//-------------------------------------------------
-nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NUBUS_VIKBW, "Moniterm Viking video card", tag, owner, clock, "nb_vikbw", __FILE__),
device_nubus_card_interface(mconfig, *this), m_vbl_disable(0)
{
}
-nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_nubus_card_interface(mconfig, *this), m_vbl_disable(0)
{
@@ -83,7 +83,7 @@ nubus_vikbw_device::nubus_vikbw_device(const machine_config &mconfig, device_typ
void nubus_vikbw_device::device_start()
{
- UINT32 slotspace;
+ uint32_t slotspace;
// set_nubus_device makes m_slot valid
set_nubus_device();
@@ -120,11 +120,11 @@ void nubus_vikbw_device::device_reset()
***************************************************************************/
-UINT32 nubus_vikbw_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t nubus_vikbw_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT32 *scanline;
+ uint32_t *scanline;
int x, y;
- UINT8 pixels;
+ uint8_t pixels;
if (!m_vbl_disable)
{
diff --git a/src/devices/bus/nubus/nubus_vikbw.h b/src/devices/bus/nubus/nubus_vikbw.h
index 1a4935a62c5..11d431dd8f0 100644
--- a/src/devices/bus/nubus/nubus_vikbw.h
+++ b/src/devices/bus/nubus/nubus_vikbw.h
@@ -20,14 +20,14 @@ class nubus_vikbw_device :
{
public:
// construction/destruction
- nubus_vikbw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_vikbw_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nubus_vikbw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nubus_vikbw_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
protected:
// device-level overrides
virtual void device_start() override;
@@ -39,8 +39,8 @@ protected:
DECLARE_WRITE32_MEMBER(viking_disable_w);
public:
- std::vector<UINT8> m_vram;
- UINT32 m_vbl_disable, m_palette[2];
+ std::vector<uint8_t> m_vram;
+ uint32_t m_vbl_disable, m_palette[2];
};
diff --git a/src/devices/bus/nubus/nubus_wsportrait.cpp b/src/devices/bus/nubus/nubus_wsportrait.cpp
index 7a666f4ceda..e274a2d812c 100644
--- a/src/devices/bus/nubus/nubus_wsportrait.cpp
+++ b/src/devices/bus/nubus/nubus_wsportrait.cpp
@@ -68,7 +68,7 @@ const tiny_rom_entry *nubus_wsportrait_device::device_rom_region() const
// nubus_wsportrait_device - constructor
//-------------------------------------------------
-nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, NUBUS_WSPORTRAIT, "Macintosh II Portrait Video Card", tag, owner, clock, "nb_wspt", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -77,7 +77,7 @@ nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig,
m_screen_tag = m_assembled_tag.c_str();
}
-nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -92,7 +92,7 @@ nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig,
void nubus_wsportrait_device::device_start()
{
- UINT32 slotspace;
+ uint32_t slotspace;
// set_nubus_device makes m_slot valid
set_nubus_device();
@@ -103,7 +103,7 @@ void nubus_wsportrait_device::device_start()
printf("[wsportrait %p] slotspace = %x\n", (void *)this, slotspace);
m_vram.resize(VRAM_SIZE);
- m_vram32 = (UINT32 *)&m_vram[0];
+ m_vram32 = (uint32_t *)&m_vram[0];
m_nubus->install_device(slotspace, slotspace+VRAM_SIZE-1, read32_delegate(FUNC(nubus_wsportrait_device::vram_r), this), write32_delegate(FUNC(nubus_wsportrait_device::vram_w), this));
m_nubus->install_device(slotspace+0x900000, slotspace+0x900000+VRAM_SIZE-1, read32_delegate(FUNC(nubus_wsportrait_device::vram_r), this), write32_delegate(FUNC(nubus_wsportrait_device::vram_w), this));
@@ -144,11 +144,11 @@ void nubus_wsportrait_device::device_timer(emu_timer &timer, device_timer_id tid
***************************************************************************/
-UINT32 nubus_wsportrait_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t nubus_wsportrait_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT32 *scanline;
+ uint32_t *scanline;
int x, y;
- UINT8 pixels, *vram;
+ uint8_t pixels, *vram;
// first time? kick off the VBL timer
vram = &m_vram[0x80];
diff --git a/src/devices/bus/nubus/nubus_wsportrait.h b/src/devices/bus/nubus/nubus_wsportrait.h
index 8a499dd632d..b6894211d82 100644
--- a/src/devices/bus/nubus/nubus_wsportrait.h
+++ b/src/devices/bus/nubus/nubus_wsportrait.h
@@ -21,14 +21,14 @@ class nubus_wsportrait_device :
{
public:
// construction/destruction
- nubus_wsportrait_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_wsportrait_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nubus_wsportrait_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nubus_wsportrait_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
protected:
// device-level overrides
virtual void device_start() override;
@@ -41,10 +41,10 @@ protected:
DECLARE_WRITE32_MEMBER(vram_w);
public:
- std::vector<UINT8> m_vram;
- UINT32 *m_vram32;
- UINT32 m_mode, m_vbl_disable, m_toggle;
- UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
+ std::vector<uint8_t> m_vram;
+ uint32_t *m_vram32;
+ uint32_t m_mode, m_vbl_disable, m_toggle;
+ uint32_t m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
std::string m_assembled_tag;
};
diff --git a/src/devices/bus/nubus/pds30_30hr.cpp b/src/devices/bus/nubus/pds30_30hr.cpp
index 042726dbd80..492ad3a87e7 100644
--- a/src/devices/bus/nubus/pds30_30hr.cpp
+++ b/src/devices/bus/nubus/pds30_30hr.cpp
@@ -68,7 +68,7 @@ const tiny_rom_entry *nubus_xceed30hr_device::device_rom_region() const
// nubus_xceed30hr_device - constructor
//-------------------------------------------------
-nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PDS030_XCEED30HR, "Micron/XCEED Technology Color 30HR", tag, owner, clock, "pd3_30hr", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -77,7 +77,7 @@ nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, co
m_screen_tag = m_assembled_tag.c_str();
}
-nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -92,7 +92,7 @@ nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, de
void nubus_xceed30hr_device::device_start()
{
- UINT32 slotspace;
+ uint32_t slotspace;
// set_nubus_device makes m_slot valid
set_nubus_device();
@@ -103,7 +103,7 @@ void nubus_xceed30hr_device::device_start()
// printf("[xceed30hr %p] slotspace = %x\n", this, slotspace);
m_vram.resize(VRAM_SIZE);
- m_vram32 = (UINT32 *)&m_vram[0];
+ m_vram32 = (uint32_t *)&m_vram[0];
m_nubus->install_device(slotspace, slotspace+VRAM_SIZE-1, read32_delegate(FUNC(nubus_xceed30hr_device::vram_r), this), write32_delegate(FUNC(nubus_xceed30hr_device::vram_w), this));
m_nubus->install_device(slotspace+0x800000, slotspace+0xefffff, read32_delegate(FUNC(nubus_xceed30hr_device::xceed30hr_r), this), write32_delegate(FUNC(nubus_xceed30hr_device::xceed30hr_w), this));
@@ -146,11 +146,11 @@ void nubus_xceed30hr_device::device_timer(emu_timer &timer, device_timer_id tid,
***************************************************************************/
-UINT32 nubus_xceed30hr_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t nubus_xceed30hr_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT32 *scanline;
+ uint32_t *scanline;
int x, y;
- UINT8 pixels, *vram;
+ uint8_t pixels, *vram;
vram = &m_vram[1024];
diff --git a/src/devices/bus/nubus/pds30_30hr.h b/src/devices/bus/nubus/pds30_30hr.h
index c243e05a382..c90c3a8e6f3 100644
--- a/src/devices/bus/nubus/pds30_30hr.h
+++ b/src/devices/bus/nubus/pds30_30hr.h
@@ -21,14 +21,14 @@ class nubus_xceed30hr_device :
{
public:
// construction/destruction
- nubus_xceed30hr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nubus_xceed30hr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
protected:
// device-level overrides
virtual void device_start() override;
@@ -41,10 +41,10 @@ protected:
DECLARE_WRITE32_MEMBER(vram_w);
public:
- std::vector<UINT8> m_vram;
- UINT32 *m_vram32;
- UINT32 m_mode, m_vbl_disable, m_toggle;
- UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
+ std::vector<uint8_t> m_vram;
+ uint32_t *m_vram32;
+ uint32_t m_mode, m_vbl_disable, m_toggle;
+ uint32_t m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
std::string m_assembled_tag;
};
diff --git a/src/devices/bus/nubus/pds30_cb264.cpp b/src/devices/bus/nubus/pds30_cb264.cpp
index 8926db4e28a..c6d5809cb64 100644
--- a/src/devices/bus/nubus/pds30_cb264.cpp
+++ b/src/devices/bus/nubus/pds30_cb264.cpp
@@ -61,7 +61,7 @@ const tiny_rom_entry *nubus_cb264se30_device::device_rom_region() const
// nubus_cb264se30_device - constructor
//-------------------------------------------------
-nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PDS030_CB264SE30, "RasterOps Colorboard 264/SE30", tag, owner, clock, "pd3_c264", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -70,7 +70,7 @@ nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, co
m_screen_tag = m_assembled_tag.c_str();
}
-nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -85,7 +85,7 @@ nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, de
void nubus_cb264se30_device::device_start()
{
- UINT32 slotspace;
+ uint32_t slotspace;
// set_nubus_device makes m_slot valid
set_nubus_device();
@@ -96,7 +96,7 @@ void nubus_cb264se30_device::device_start()
// printf("[cb264se30 %p] slotspace = %x\n", this, slotspace);
m_vram.resize(VRAM_SIZE);
- m_vram32 = (UINT32 *)&m_vram[0];
+ m_vram32 = (uint32_t *)&m_vram[0];
m_nubus->install_device(slotspace, slotspace+VRAM_SIZE-1, read32_delegate(FUNC(nubus_cb264se30_device::vram_r), this), write32_delegate(FUNC(nubus_cb264se30_device::vram_w), this));
m_nubus->install_device(slotspace+0xf00000, slotspace+0xfeffff, read32_delegate(FUNC(nubus_cb264se30_device::cb264se30_r), this), write32_delegate(FUNC(nubus_cb264se30_device::cb264se30_w), this));
@@ -139,11 +139,11 @@ void nubus_cb264se30_device::device_timer(emu_timer &timer, device_timer_id tid,
***************************************************************************/
-UINT32 nubus_cb264se30_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t nubus_cb264se30_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT32 *scanline;
+ uint32_t *scanline;
int x, y;
- UINT8 pixels, *vram;
+ uint8_t pixels, *vram;
vram = &m_vram[8*1024];
@@ -215,8 +215,8 @@ UINT32 nubus_cb264se30_device::screen_update(screen_device &screen, bitmap_rgb32
case 4: // 24 bpp
{
- UINT32 *vram32 = (UINT32 *)&m_vram[0];
- UINT32 *base;
+ uint32_t *vram32 = (uint32_t *)&m_vram[0];
+ uint32_t *base;
for (y = 0; y < 480; y++)
{
diff --git a/src/devices/bus/nubus/pds30_cb264.h b/src/devices/bus/nubus/pds30_cb264.h
index b327cb2aff5..0e4d7f6a488 100644
--- a/src/devices/bus/nubus/pds30_cb264.h
+++ b/src/devices/bus/nubus/pds30_cb264.h
@@ -21,14 +21,14 @@ class nubus_cb264se30_device :
{
public:
// construction/destruction
- nubus_cb264se30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nubus_cb264se30_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
protected:
// device-level overrides
virtual void device_start() override;
@@ -41,10 +41,10 @@ protected:
DECLARE_WRITE32_MEMBER(vram_w);
public:
- std::vector<UINT8> m_vram;
- UINT32 *m_vram32;
- UINT32 m_mode, m_vbl_disable, m_toggle;
- UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
+ std::vector<uint8_t> m_vram;
+ uint32_t *m_vram32;
+ uint32_t m_mode, m_vbl_disable, m_toggle;
+ uint32_t m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
std::string m_assembled_tag;
};
diff --git a/src/devices/bus/nubus/pds30_mc30.cpp b/src/devices/bus/nubus/pds30_mc30.cpp
index 56719c0ffb0..3aa038639ba 100644
--- a/src/devices/bus/nubus/pds30_mc30.cpp
+++ b/src/devices/bus/nubus/pds30_mc30.cpp
@@ -64,7 +64,7 @@ const tiny_rom_entry *nubus_xceedmc30_device::device_rom_region() const
// nubus_xceedmc30_device - constructor
//-------------------------------------------------
-nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PDS030_XCEEDMC30, "Micron/XCEED Technology MacroColor 30", tag, owner, clock, "pd3_mclr", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -73,7 +73,7 @@ nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, co
m_screen_tag = m_assembled_tag.c_str();
}
-nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -88,7 +88,7 @@ nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, de
void nubus_xceedmc30_device::device_start()
{
- UINT32 slotspace;
+ uint32_t slotspace;
// set_nubus_device makes m_slot valid
set_nubus_device();
@@ -99,7 +99,7 @@ void nubus_xceedmc30_device::device_start()
// printf("[xceedmc30 %p] slotspace = %x\n", this, slotspace);
m_vram.resize(VRAM_SIZE);
- m_vram32 = (UINT32 *)&m_vram[0];
+ m_vram32 = (uint32_t *)&m_vram[0];
m_nubus->install_device(slotspace, slotspace+VRAM_SIZE-1, read32_delegate(FUNC(nubus_xceedmc30_device::vram_r), this), write32_delegate(FUNC(nubus_xceedmc30_device::vram_w), this));
m_nubus->install_device(slotspace+0x800000, slotspace+0xefffff, read32_delegate(FUNC(nubus_xceedmc30_device::xceedmc30_r), this), write32_delegate(FUNC(nubus_xceedmc30_device::xceedmc30_w), this));
@@ -142,11 +142,11 @@ void nubus_xceedmc30_device::device_timer(emu_timer &timer, device_timer_id tid,
***************************************************************************/
-UINT32 nubus_xceedmc30_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t nubus_xceedmc30_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT32 *scanline;
+ uint32_t *scanline;
int x, y;
- UINT8 pixels, *vram;
+ uint8_t pixels, *vram;
vram = &m_vram[4*1024];
@@ -218,8 +218,8 @@ UINT32 nubus_xceedmc30_device::screen_update(screen_device &screen, bitmap_rgb32
case 4: // 24 bpp
{
- UINT32 *vram32 = (UINT32 *)vram;
- UINT32 *base;
+ uint32_t *vram32 = (uint32_t *)vram;
+ uint32_t *base;
for (y = 0; y < 480; y++)
{
diff --git a/src/devices/bus/nubus/pds30_mc30.h b/src/devices/bus/nubus/pds30_mc30.h
index 2a953ee5a6f..b2560f6e604 100644
--- a/src/devices/bus/nubus/pds30_mc30.h
+++ b/src/devices/bus/nubus/pds30_mc30.h
@@ -21,14 +21,14 @@ class nubus_xceedmc30_device :
{
public:
// construction/destruction
- nubus_xceedmc30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nubus_xceedmc30_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
protected:
// device-level overrides
virtual void device_start() override;
@@ -41,10 +41,10 @@ protected:
DECLARE_WRITE32_MEMBER(vram_w);
public:
- std::vector<UINT8> m_vram;
- UINT32 *m_vram32;
- UINT32 m_mode, m_vbl_disable, m_toggle;
- UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
+ std::vector<uint8_t> m_vram;
+ uint32_t *m_vram32;
+ uint32_t m_mode, m_vbl_disable, m_toggle;
+ uint32_t m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
std::string m_assembled_tag;
};
diff --git a/src/devices/bus/nubus/pds30_procolor816.cpp b/src/devices/bus/nubus/pds30_procolor816.cpp
index f56520fda8b..7aefbf0308a 100644
--- a/src/devices/bus/nubus/pds30_procolor816.cpp
+++ b/src/devices/bus/nubus/pds30_procolor816.cpp
@@ -67,7 +67,7 @@ const tiny_rom_entry *nubus_procolor816_device::device_rom_region() const
// nubus_procolor816_device - constructor
//-------------------------------------------------
-nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PDS030_PROCOLOR816, "Lapis ProColor Server 8*16", tag, owner, clock, "pd3_pc16", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -76,7 +76,7 @@ nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig
m_screen_tag = m_assembled_tag.c_str();
}
-nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_mode(0), m_vbl_disable(0), m_toggle(0), m_count(0), m_clutoffs(0), m_timer(nullptr)
@@ -91,7 +91,7 @@ nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig
void nubus_procolor816_device::device_start()
{
- UINT32 slotspace;
+ uint32_t slotspace;
// set_nubus_device makes m_slot valid
set_nubus_device();
@@ -102,7 +102,7 @@ void nubus_procolor816_device::device_start()
// printf("[procolor816 %p] slotspace = %x\n", this, slotspace);
m_vram.resize(VRAM_SIZE);
- m_vram32 = (UINT32 *)&m_vram[0];
+ m_vram32 = (uint32_t *)&m_vram[0];
m_nubus->install_device(slotspace, slotspace+VRAM_SIZE-1, read32_delegate(FUNC(nubus_procolor816_device::vram_r), this), write32_delegate(FUNC(nubus_procolor816_device::vram_w), this));
m_nubus->install_device(slotspace+0x900000, slotspace+VRAM_SIZE-1+0x900000, read32_delegate(FUNC(nubus_procolor816_device::vram_r), this), write32_delegate(FUNC(nubus_procolor816_device::vram_w), this));
@@ -146,11 +146,11 @@ void nubus_procolor816_device::device_timer(emu_timer &timer, device_timer_id ti
***************************************************************************/
-UINT32 nubus_procolor816_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t nubus_procolor816_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT32 *scanline;
+ uint32_t *scanline;
int x, y;
- UINT8 pixels, *vram;
+ uint8_t pixels, *vram;
vram = &m_vram[4];
@@ -222,8 +222,8 @@ UINT32 nubus_procolor816_device::screen_update(screen_device &screen, bitmap_rgb
case 4: // 15 bpp
{
- UINT16 *vram16 = (UINT16 *)&m_vram[0];
- UINT16 pixels;
+ uint16_t *vram16 = (uint16_t *)&m_vram[0];
+ uint16_t pixels;
for (y = 0; y < 480; y++)
{
diff --git a/src/devices/bus/nubus/pds30_procolor816.h b/src/devices/bus/nubus/pds30_procolor816.h
index 482593cb549..bffe8969f33 100644
--- a/src/devices/bus/nubus/pds30_procolor816.h
+++ b/src/devices/bus/nubus/pds30_procolor816.h
@@ -21,14 +21,14 @@ class nubus_procolor816_device :
{
public:
// construction/destruction
- nubus_procolor816_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_procolor816_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nubus_procolor816_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nubus_procolor816_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
protected:
// device-level overrides
virtual void device_start() override;
@@ -41,10 +41,10 @@ protected:
DECLARE_WRITE32_MEMBER(vram_w);
public:
- std::vector<UINT8> m_vram;
- UINT32 *m_vram32;
- UINT32 m_mode, m_vbl_disable, m_toggle;
- UINT32 m_palette[256], m_colors[3], m_count, m_clutoffs;
+ std::vector<uint8_t> m_vram;
+ uint32_t *m_vram32;
+ uint32_t m_mode, m_vbl_disable, m_toggle;
+ uint32_t m_palette[256], m_colors[3], m_count, m_clutoffs;
emu_timer *m_timer;
std::string m_assembled_tag;
};
diff --git a/src/devices/bus/nubus/pds30_sigmalview.cpp b/src/devices/bus/nubus/pds30_sigmalview.cpp
index 19ff5ef869f..e9588a40568 100644
--- a/src/devices/bus/nubus/pds30_sigmalview.cpp
+++ b/src/devices/bus/nubus/pds30_sigmalview.cpp
@@ -61,7 +61,7 @@ const tiny_rom_entry *nubus_lview_device::device_rom_region() const
// nubus_lview_device - constructor
//-------------------------------------------------
-nubus_lview_device::nubus_lview_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+nubus_lview_device::nubus_lview_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PDS030_LVIEW, "Sigma Designs L-View", tag, owner, clock, "pd3_lviw", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_vbl_disable(0), m_toggle(0), m_timer(nullptr), m_protstate(0)
@@ -70,7 +70,7 @@ nubus_lview_device::nubus_lview_device(const machine_config &mconfig, const char
m_screen_tag = m_assembled_tag.c_str();
}
-nubus_lview_device::nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+nubus_lview_device::nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this), m_vram32(nullptr), m_vbl_disable(0), m_toggle(0), m_timer(nullptr), m_protstate(0)
@@ -85,7 +85,7 @@ nubus_lview_device::nubus_lview_device(const machine_config &mconfig, device_typ
void nubus_lview_device::device_start()
{
- UINT32 slotspace;
+ uint32_t slotspace;
// set_nubus_device makes m_slot valid
set_nubus_device();
@@ -96,7 +96,7 @@ void nubus_lview_device::device_start()
// printf("[lview %p] slotspace = %x\n", this, slotspace);
m_vram.resize(VRAM_SIZE);
- m_vram32 = (UINT32 *)&m_vram[0];
+ m_vram32 = (uint32_t *)&m_vram[0];
m_nubus->install_device(slotspace, slotspace+VRAM_SIZE-1, read32_delegate(FUNC(nubus_lview_device::vram_r), this), write32_delegate(FUNC(nubus_lview_device::vram_w), this));
m_nubus->install_device(slotspace+0x900000, slotspace+VRAM_SIZE-1+0x900000, read32_delegate(FUNC(nubus_lview_device::vram_r), this), write32_delegate(FUNC(nubus_lview_device::vram_w), this));
@@ -138,11 +138,11 @@ void nubus_lview_device::device_timer(emu_timer &timer, device_timer_id tid, int
***************************************************************************/
-UINT32 nubus_lview_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t nubus_lview_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT32 *scanline;
+ uint32_t *scanline;
int x, y;
- UINT8 pixels, *vram;
+ uint8_t pixels, *vram;
vram = &m_vram[0x20];
@@ -169,7 +169,7 @@ UINT32 nubus_lview_device::screen_update(screen_device &screen, bitmap_rgb32 &bi
READ32_MEMBER( nubus_lview_device::lview_r )
{
- UINT32 rv = 0;
+ uint32_t rv = 0;
// printf("prot_r: @ %x, mask %08x [PC=%x state %d]\n", offset, mem_mask, machine().device("maincpu")->safe_pc(), m_protstate);
diff --git a/src/devices/bus/nubus/pds30_sigmalview.h b/src/devices/bus/nubus/pds30_sigmalview.h
index 3db62231f29..a7b078d2ab5 100644
--- a/src/devices/bus/nubus/pds30_sigmalview.h
+++ b/src/devices/bus/nubus/pds30_sigmalview.h
@@ -21,14 +21,14 @@ class nubus_lview_device :
{
public:
// construction/destruction
- nubus_lview_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ nubus_lview_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
protected:
// device-level overrides
virtual void device_start() override;
@@ -41,10 +41,10 @@ protected:
DECLARE_WRITE32_MEMBER(vram_w);
public:
- std::vector<UINT8> m_vram;
- UINT32 *m_vram32;
- UINT32 m_vbl_disable, m_toggle;
- UINT32 m_palette[256];
+ std::vector<uint8_t> m_vram;
+ uint32_t *m_vram32;
+ uint32_t m_vbl_disable, m_toggle;
+ uint32_t m_palette[256];
emu_timer *m_timer;
int m_protstate;
std::string m_assembled_tag;
diff --git a/src/devices/bus/odyssey2/chess.cpp b/src/devices/bus/odyssey2/chess.cpp
index 8885733923c..9ddd62b7f6a 100644
--- a/src/devices/bus/odyssey2/chess.cpp
+++ b/src/devices/bus/odyssey2/chess.cpp
@@ -22,7 +22,7 @@
const device_type O2_ROM_CHESS = &device_creator<o2_chess_device>;
-o2_chess_device::o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+o2_chess_device::o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: o2_rom_device(mconfig, O2_ROM_CHESS, "Odyssey 2 BASIC Carts", tag, owner, clock, "o2_chess", __FILE__),
m_cpu(*this, "subcpu")
{
diff --git a/src/devices/bus/odyssey2/chess.h b/src/devices/bus/odyssey2/chess.h
index 4cfefa10347..86c5822decf 100644
--- a/src/devices/bus/odyssey2/chess.h
+++ b/src/devices/bus/odyssey2/chess.h
@@ -17,7 +17,7 @@ class o2_chess_device : public o2_rom_device
public:
// construction/destruction
- o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
private:
required_device<nsc800_device> m_cpu;
diff --git a/src/devices/bus/odyssey2/rom.cpp b/src/devices/bus/odyssey2/rom.cpp
index dd2a3739bea..dac96ec563a 100644
--- a/src/devices/bus/odyssey2/rom.cpp
+++ b/src/devices/bus/odyssey2/rom.cpp
@@ -22,26 +22,26 @@ const device_type O2_ROM_12K = &device_creator<o2_rom12_device>;
const device_type O2_ROM_16K = &device_creator<o2_rom16_device>;
-o2_rom_device::o2_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+o2_rom_device::o2_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_o2_cart_interface(mconfig, *this),
m_bank_base(0)
{
}
-o2_rom_device::o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+o2_rom_device::o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, O2_ROM_STD, "Odyssey 2 Standard Carts", tag, owner, clock, "o2_rom", __FILE__),
device_o2_cart_interface( mconfig, *this ),
m_bank_base(0)
{
}
-o2_rom12_device::o2_rom12_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+o2_rom12_device::o2_rom12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: o2_rom_device(mconfig, O2_ROM_12K, "Odyssey 2 12K Carts", tag, owner, clock, "o2_rom12", __FILE__)
{
}
-o2_rom16_device::o2_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+o2_rom16_device::o2_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: o2_rom_device(mconfig, O2_ROM_16K, "Odyssey 2 16K Carts", tag, owner, clock, "o2_rom16", __FILE__)
{
}
diff --git a/src/devices/bus/odyssey2/rom.h b/src/devices/bus/odyssey2/rom.h
index 7f82a0c0e1a..d3931e96b88 100644
--- a/src/devices/bus/odyssey2/rom.h
+++ b/src/devices/bus/odyssey2/rom.h
@@ -13,8 +13,8 @@ class o2_rom_device : public device_t,
{
public:
// construction/destruction
- o2_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ o2_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -36,7 +36,7 @@ class o2_rom12_device : public o2_rom_device
{
public:
// construction/destruction
- o2_rom12_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ o2_rom12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom04) override;
@@ -49,7 +49,7 @@ class o2_rom16_device : public o2_rom_device
{
public:
// construction/destruction
- o2_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ o2_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom04) override;
diff --git a/src/devices/bus/odyssey2/slot.cpp b/src/devices/bus/odyssey2/slot.cpp
index 3ae5091568b..2593647a23c 100644
--- a/src/devices/bus/odyssey2/slot.cpp
+++ b/src/devices/bus/odyssey2/slot.cpp
@@ -45,7 +45,7 @@ device_o2_cart_interface::~device_o2_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_o2_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_o2_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -59,7 +59,7 @@ void device_o2_cart_interface::rom_alloc(UINT32 size, const char *tag)
// ram_alloc - alloc the space for the ram
//-------------------------------------------------
-void device_o2_cart_interface::ram_alloc(UINT32 size)
+void device_o2_cart_interface::ram_alloc(uint32_t size)
{
m_ram.resize(size);
}
@@ -72,7 +72,7 @@ void device_o2_cart_interface::ram_alloc(UINT32 size)
//-------------------------------------------------
// o2_cart_slot_device - constructor
//-------------------------------------------------
-o2_cart_slot_device::o2_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+o2_cart_slot_device::o2_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, O2_CART_SLOT, "Odyssey 2 Cartridge Slot", tag, owner, clock, "o2_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -162,7 +162,7 @@ image_init_result o2_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT32 size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
+ uint32_t size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
m_cart->rom_alloc(size, tag());
if (software_entry() == nullptr)
@@ -203,7 +203,7 @@ std::string o2_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- UINT32 size = m_file->size();
+ uint32_t size = m_file->size();
int type = O2_STD;
if (size == 12288)
diff --git a/src/devices/bus/odyssey2/slot.h b/src/devices/bus/odyssey2/slot.h
index 454239d8a5a..bb8bb7674a5 100644
--- a/src/devices/bus/odyssey2/slot.h
+++ b/src/devices/bus/odyssey2/slot.h
@@ -39,18 +39,18 @@ public:
virtual DECLARE_WRITE8_MEMBER(io_write) {}
virtual DECLARE_READ8_MEMBER(t0_read) { return 0; }
- void rom_alloc(UINT32 size, const char *tag);
- void ram_alloc(UINT32 size);
- UINT8* get_rom_base() { return m_rom; }
- UINT8* get_ram_base() { return &m_ram[0]; }
- UINT32 get_rom_size() { return m_rom_size; }
- UINT32 get_ram_size() { return m_ram.size(); }
+ void rom_alloc(uint32_t size, const char *tag);
+ void ram_alloc(uint32_t size);
+ uint8_t* get_rom_base() { return m_rom; }
+ uint8_t* get_ram_base() { return &m_ram[0]; }
+ uint32_t get_rom_size() { return m_rom_size; }
+ uint32_t get_ram_size() { return m_ram.size(); }
protected:
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT8> m_ram;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint8_t> m_ram;
};
@@ -62,7 +62,7 @@ class o2_cart_slot_device : public device_t,
{
public:
// construction/destruction
- o2_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ o2_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~o2_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/odyssey2/voice.cpp b/src/devices/bus/odyssey2/voice.cpp
index 0f1f702a541..b46d7010226 100644
--- a/src/devices/bus/odyssey2/voice.cpp
+++ b/src/devices/bus/odyssey2/voice.cpp
@@ -23,7 +23,7 @@
const device_type O2_ROM_VOICE = &device_creator<o2_voice_device>;
-o2_voice_device::o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+o2_voice_device::o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: o2_rom_device(mconfig, O2_ROM_VOICE, "Odyssey 2 The Voice Passthrough Cart", tag, owner, clock, "o2_voice", __FILE__),
m_speech(*this, "sp0256_speech"),
m_subslot(*this, "subslot"),
diff --git a/src/devices/bus/odyssey2/voice.h b/src/devices/bus/odyssey2/voice.h
index b841189f149..8c82aeeab31 100644
--- a/src/devices/bus/odyssey2/voice.h
+++ b/src/devices/bus/odyssey2/voice.h
@@ -14,7 +14,7 @@ class o2_voice_device : public o2_rom_device
{
public:
// construction/destruction
- o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/oricext/jasmin.cpp b/src/devices/bus/oricext/jasmin.cpp
index 8383fc5ddcd..e2e1bdb04a8 100644
--- a/src/devices/bus/oricext/jasmin.cpp
+++ b/src/devices/bus/oricext/jasmin.cpp
@@ -42,7 +42,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, jasmin_device)
AM_RANGE(0x3fc, 0x3ff) AM_WRITE(select_w)
ADDRESS_MAP_END
-jasmin_device::jasmin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+jasmin_device::jasmin_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
oricext_device(mconfig, JASMIN, "Jasmin floppy drive interface", tag, owner, clock, "jasmin", __FILE__),
fdc(*this, "fdc"), side_sel(false), fdc_reset(false), ram_access(false), rom_access(false), jasmin_rom(nullptr), cur_floppy(nullptr)
{
diff --git a/src/devices/bus/oricext/jasmin.h b/src/devices/bus/oricext/jasmin.h
index 9befe4a2900..8b4047be695 100644
--- a/src/devices/bus/oricext/jasmin.h
+++ b/src/devices/bus/oricext/jasmin.h
@@ -12,7 +12,7 @@ extern const device_type JASMIN;
class jasmin_device : public oricext_device
{
public:
- jasmin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ jasmin_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~jasmin_device();
DECLARE_FLOPPY_FORMATS(floppy_formats);
@@ -28,7 +28,7 @@ protected:
required_device<wd1770_t> fdc;
bool side_sel, fdc_reset, ram_access, rom_access, select[4];
- UINT8 *jasmin_rom;
+ uint8_t *jasmin_rom;
floppy_image_device *cur_floppy, *floppies[4];
virtual void device_start() override;
diff --git a/src/devices/bus/oricext/microdisc.cpp b/src/devices/bus/oricext/microdisc.cpp
index f4b1e6f1678..6268c1860f4 100644
--- a/src/devices/bus/oricext/microdisc.cpp
+++ b/src/devices/bus/oricext/microdisc.cpp
@@ -37,7 +37,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, microdisc_device)
AM_RANGE(0x318, 0x318) AM_READ(port_318_r)
ADDRESS_MAP_END
-microdisc_device::microdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+microdisc_device::microdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
oricext_device(mconfig, MICRODISC, "Microdisc floppy drive interface", tag, owner, clock, "microdisc", __FILE__),
fdc(*this, "fdc"), microdisc_rom(nullptr), port_314(0), intrq_state(false), drq_state(false), hld_state(false)
{
diff --git a/src/devices/bus/oricext/microdisc.h b/src/devices/bus/oricext/microdisc.h
index 663e7fbf029..c4cc450db4f 100644
--- a/src/devices/bus/oricext/microdisc.h
+++ b/src/devices/bus/oricext/microdisc.h
@@ -12,7 +12,7 @@ extern const device_type MICRODISC;
class microdisc_device : public oricext_device
{
public:
- microdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ microdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~microdisc_device();
DECLARE_FLOPPY_FORMATS(floppy_formats);
@@ -38,9 +38,9 @@ protected:
required_device<fd1793_t> fdc;
- UINT8 *microdisc_rom;
+ uint8_t *microdisc_rom;
floppy_image_device *floppies[4];
- UINT8 port_314;
+ uint8_t port_314;
bool intrq_state, drq_state, hld_state;
virtual void device_start() override;
diff --git a/src/devices/bus/oricext/oricext.cpp b/src/devices/bus/oricext/oricext.cpp
index 2c1894b385c..1499bf8c544 100644
--- a/src/devices/bus/oricext/oricext.cpp
+++ b/src/devices/bus/oricext/oricext.cpp
@@ -6,7 +6,7 @@
const device_type ORICEXT_CONNECTOR = &device_creator<oricext_connector>;
-oricext_connector::oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+oricext_connector::oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, ORICEXT_CONNECTOR, "ORIC extension connector", tag, owner, clock, "oricext_connector", __FILE__),
device_slot_interface(mconfig, *this),
irq_handler(*this),
@@ -40,7 +40,7 @@ void oricext_connector::device_config_complete()
dev->set_cputag(cputag);
}
-oricext_device::oricext_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+oricext_device::oricext_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_card_interface(mconfig, *this),
cputag(nullptr),
@@ -72,8 +72,8 @@ void oricext_device::device_start()
bank_c000_w = membank(":bank_c000_w");
bank_e000_w = membank(":bank_e000_w");
bank_f800_w = membank(":bank_f800_w");
- rom = (UINT8 *)machine().root_device().memregion(cputag)->base();
- ram = (UINT8 *)memshare(":ram")->ptr();
+ rom = (uint8_t *)machine().root_device().memregion(cputag)->base();
+ ram = (uint8_t *)memshare(":ram")->ptr();
memset(junk_read, 0xff, sizeof(junk_read));
memset(junk_write, 0x00, sizeof(junk_write));
diff --git a/src/devices/bus/oricext/oricext.h b/src/devices/bus/oricext/oricext.h
index 738850a40b5..bf423ad852c 100644
--- a/src/devices/bus/oricext/oricext.h
+++ b/src/devices/bus/oricext/oricext.h
@@ -25,7 +25,7 @@ class oricext_connector: public device_t,
public device_slot_interface
{
public:
- oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~oricext_connector();
void set_cputag(const char *tag);
@@ -43,7 +43,7 @@ class oricext_device : public device_t,
public device_slot_card_interface
{
public:
- oricext_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ oricext_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
void set_cputag(const char *tag);
DECLARE_WRITE_LINE_MEMBER(irq_w);
@@ -53,8 +53,8 @@ protected:
m6502_device *cpu;
oricext_connector *connector;
memory_bank *bank_c000_r, *bank_e000_r, *bank_f800_r, *bank_c000_w, *bank_e000_w, *bank_f800_w;
- UINT8 *rom, *ram;
- UINT8 junk_read[8192], junk_write[8192];
+ uint8_t *rom, *ram;
+ uint8_t junk_read[8192], junk_write[8192];
virtual void device_start() override;
};
diff --git a/src/devices/bus/pc1512/mouse.cpp b/src/devices/bus/pc1512/mouse.cpp
index d1f3aba2f51..24bd5f3e451 100644
--- a/src/devices/bus/pc1512/mouse.cpp
+++ b/src/devices/bus/pc1512/mouse.cpp
@@ -44,7 +44,7 @@ device_pc1512_mouse_port_interface::device_pc1512_mouse_port_interface(const mac
// pc1512_mouse_port_t - constructor
//-------------------------------------------------
-pc1512_mouse_port_t::pc1512_mouse_port_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pc1512_mouse_port_t::pc1512_mouse_port_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PC1512_MOUSE_PORT, "Amstrad PC1512 mouse port", tag, owner, clock, "pc1512_mouse_port", __FILE__),
device_slot_interface(mconfig, *this),
m_write_x(*this),
@@ -55,7 +55,7 @@ pc1512_mouse_port_t::pc1512_mouse_port_t(const machine_config &mconfig, const ch
{
}
-pc1512_mouse_t::pc1512_mouse_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pc1512_mouse_t::pc1512_mouse_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PC1512_MOUSE, "Amstrad PC1512 mouse", tag, owner, clock, "pc1512_mouse", __FILE__),
device_pc1512_mouse_port_interface(mconfig, *this)
{
diff --git a/src/devices/bus/pc1512/mouse.h b/src/devices/bus/pc1512/mouse.h
index 38eca0ac0bc..58e56459be5 100644
--- a/src/devices/bus/pc1512/mouse.h
+++ b/src/devices/bus/pc1512/mouse.h
@@ -79,7 +79,7 @@ class pc1512_mouse_port_t : public device_t,
{
public:
// construction/destruction
- pc1512_mouse_port_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc1512_mouse_port_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// static configuration helpers
template<class _Object> static devcb_base &set_x_wr_callback(device_t &device, _Object object) { return downcast<pc1512_mouse_port_t &>(device).m_write_x.set_callback(object); }
@@ -88,8 +88,8 @@ public:
template<class _Object> static devcb_base &set_m2_wr_callback(device_t &device, _Object object) { return downcast<pc1512_mouse_port_t &>(device).m_write_m2.set_callback(object); }
// peripheral interface
- void x_w(UINT8 data) { m_write_x(data); }
- void y_w(UINT8 data) { m_write_y(data); }
+ void x_w(uint8_t data) { m_write_x(data); }
+ void y_w(uint8_t data) { m_write_y(data); }
void m1_w(int state) { m_write_m1(state); }
void m2_w(int state) { m_write_m2(state); }
@@ -113,7 +113,7 @@ class pc1512_mouse_t : public device_t,
{
public:
// construction/destruction
- pc1512_mouse_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc1512_mouse_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/pc_joy/pc_joy.cpp b/src/devices/bus/pc_joy/pc_joy.cpp
index bf530eb6ab5..ecffaa88840 100644
--- a/src/devices/bus/pc_joy/pc_joy.cpp
+++ b/src/devices/bus/pc_joy/pc_joy.cpp
@@ -13,7 +13,7 @@
const device_type PC_JOY = &device_creator<pc_joy_device>;
-pc_joy_device::pc_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pc_joy_device::pc_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PC_JOY, "PC joystick port", tag, owner, clock, "pc_joy", __FILE__),
device_slot_interface(mconfig, *this),
m_dev(nullptr)
@@ -79,7 +79,7 @@ ioport_constructor pc_basic_joy_device::device_input_ports() const
const device_type PC_BASIC_JOY = &device_creator<pc_basic_joy_device>;
-pc_basic_joy_device::pc_basic_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pc_basic_joy_device::pc_basic_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PC_BASIC_JOY, "PC basic joystick", tag, owner, clock, "basic_joy", __FILE__),
device_pc_joy_interface(mconfig, *this),
m_btn(*this, "btn"),
diff --git a/src/devices/bus/pc_joy/pc_joy.h b/src/devices/bus/pc_joy/pc_joy.h
index c5e1d890c8e..dbc0647ffc0 100644
--- a/src/devices/bus/pc_joy/pc_joy.h
+++ b/src/devices/bus/pc_joy/pc_joy.h
@@ -25,11 +25,11 @@ public:
device_pc_joy_interface(const machine_config &mconfig, device_t &device);
virtual ~device_pc_joy_interface();
- virtual UINT8 x1(int delta) { return 0; }
- virtual UINT8 x2(int delta) { return 0; }
- virtual UINT8 y1(int delta) { return 0; }
- virtual UINT8 y2(int delta) { return 0; }
- virtual UINT8 btn() { return 0xf; }
+ virtual uint8_t x1(int delta) { return 0; }
+ virtual uint8_t x2(int delta) { return 0; }
+ virtual uint8_t y1(int delta) { return 0; }
+ virtual uint8_t y2(int delta) { return 0; }
+ virtual uint8_t btn() { return 0xf; }
virtual void port_write() { }
};
@@ -37,7 +37,7 @@ class pc_joy_device : public device_t,
public device_slot_interface
{
public:
- pc_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER(joy_port_r);
DECLARE_WRITE8_MEMBER(joy_port_w);
@@ -55,14 +55,14 @@ class pc_basic_joy_device : public device_t,
public device_pc_joy_interface
{
public:
- pc_basic_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_basic_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
- virtual UINT8 x1(int delta) override { return (m_x1->read() > delta); }
- virtual UINT8 x2(int delta) override { return (m_x2->read() > delta); }
- virtual UINT8 y1(int delta) override { return (m_y1->read() > delta); }
- virtual UINT8 y2(int delta) override { return (m_y2->read() > delta); }
- virtual UINT8 btn() override { return m_btn->read(); }
+ virtual uint8_t x1(int delta) override { return (m_x1->read() > delta); }
+ virtual uint8_t x2(int delta) override { return (m_x2->read() > delta); }
+ virtual uint8_t y1(int delta) override { return (m_y1->read() > delta); }
+ virtual uint8_t y2(int delta) override { return (m_y2->read() > delta); }
+ virtual uint8_t btn() override { return m_btn->read(); }
protected:
virtual void device_start() override {}
diff --git a/src/devices/bus/pc_joy/pc_joy_sw.cpp b/src/devices/bus/pc_joy/pc_joy_sw.cpp
index 4d826e9f62a..a21bba8bd93 100644
--- a/src/devices/bus/pc_joy/pc_joy_sw.cpp
+++ b/src/devices/bus/pc_joy/pc_joy_sw.cpp
@@ -6,7 +6,7 @@
const device_type PC_MSSW_PAD = &device_creator<pc_mssw_pad_device>;
-pc_mssw_pad_device::pc_mssw_pad_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) :
+pc_mssw_pad_device::pc_mssw_pad_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) :
device_t(mconfig, PC_MSSW_PAD, "Microsoft Sidewinder Pad", tag, owner, clock, "mssw_pad", __FILE__),
device_pc_joy_interface(mconfig, *this),
m_btn1(*this, "btn1"),
@@ -36,7 +36,7 @@ void pc_mssw_pad_device::device_reset()
void pc_mssw_pad_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr)
{
- UINT16 pad_state = 0;
+ uint16_t pad_state = 0;
// only multibit mode for now
if(m_count == -1)
{
@@ -90,7 +90,7 @@ void pc_mssw_pad_device::device_timer(emu_timer &timer, device_timer_id tid, int
break;
case 4:
{
- UINT8 parity = (pad_state >> 8) ^ pad_state;
+ uint8_t parity = (pad_state >> 8) ^ pad_state;
parity = (parity >> 4) ^ parity;
parity = (parity >> 2) ^ parity;
parity = (((parity >> 1) ^ parity) & 1);
diff --git a/src/devices/bus/pc_joy/pc_joy_sw.h b/src/devices/bus/pc_joy/pc_joy_sw.h
index 29500ed35ea..c36c564d8e5 100644
--- a/src/devices/bus/pc_joy/pc_joy_sw.h
+++ b/src/devices/bus/pc_joy/pc_joy_sw.h
@@ -9,10 +9,10 @@ class pc_mssw_pad_device : public device_t,
public device_pc_joy_interface
{
public:
- pc_mssw_pad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_mssw_pad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
- virtual UINT8 btn() override { return m_state; }
+ virtual uint8_t btn() override { return m_state; }
// timing is guessed, calibrated for at486
virtual void port_write() override { if(!m_active) { m_timer->adjust(attotime::from_usec(50), 0, attotime::from_usec(5)); m_active = true; } }
@@ -29,7 +29,7 @@ private:
required_ioport m_conf;
emu_timer *m_timer;
int m_count;
- UINT8 m_state;
+ uint8_t m_state;
bool m_active;
};
diff --git a/src/devices/bus/pc_kbd/ec1841.cpp b/src/devices/bus/pc_kbd/ec1841.cpp
index 3d7020d9ad2..b9a2db9ab39 100644
--- a/src/devices/bus/pc_kbd/ec1841.cpp
+++ b/src/devices/bus/pc_kbd/ec1841.cpp
@@ -280,7 +280,7 @@ ioport_constructor ec_1841_keyboard_device::device_input_ports() const
// ec_1841_keyboard_device - constructor
//-------------------------------------------------
-ec_1841_keyboard_device::ec_1841_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ec_1841_keyboard_device::ec_1841_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, PC_KBD_EC_1841, "EC-1841 Keyboard", tag, owner, clock, "kb_ec1841", __FILE__),
device_pc_kbd_interface(mconfig, *this),
m_maincpu(*this, I8048_TAG),
@@ -371,7 +371,7 @@ READ8_MEMBER( ec_1841_keyboard_device::p1_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
data |= clock_signal();
data |= data_signal() << 1;
@@ -442,7 +442,7 @@ READ8_MEMBER( ec_1841_keyboard_device::t1_r )
if (BIT(m_p2,0)) {
m_q = 1;
} else {
- UINT8 sense = 0xff;
+ uint8_t sense = 0xff;
sense &= m_kbd[m_bus & 15]->read();
m_q = BIT(sense, (m_bus >> 4) & 7);
}
diff --git a/src/devices/bus/pc_kbd/ec1841.h b/src/devices/bus/pc_kbd/ec1841.h
index 7c7b830a083..b6ef745696b 100644
--- a/src/devices/bus/pc_kbd/ec1841.h
+++ b/src/devices/bus/pc_kbd/ec1841.h
@@ -28,7 +28,7 @@ class ec_1841_keyboard_device : public device_t,
{
public:
// construction/destruction
- ec_1841_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ec_1841_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -54,9 +54,9 @@ private:
required_device<cpu_device> m_maincpu;
required_ioport_array<16> m_kbd;
- UINT8 m_bus;
- UINT8 m_p1;
- UINT8 m_p2;
+ uint8_t m_bus;
+ uint8_t m_p1;
+ uint8_t m_p2;
int m_q;
};
diff --git a/src/devices/bus/pc_kbd/iskr1030.cpp b/src/devices/bus/pc_kbd/iskr1030.cpp
index 0b752793785..1b8afeee9ec 100644
--- a/src/devices/bus/pc_kbd/iskr1030.cpp
+++ b/src/devices/bus/pc_kbd/iskr1030.cpp
@@ -259,7 +259,7 @@ ioport_constructor iskr_1030_keyboard_device::device_input_ports() const
// iskr_1030_keyboard_device - constructor
//-------------------------------------------------
-iskr_1030_keyboard_device::iskr_1030_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+iskr_1030_keyboard_device::iskr_1030_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, PC_KBD_ISKR_1030, "Iskra-1030 Keyboard", tag, owner, clock, "kb_iskr1030", __FILE__),
device_pc_kbd_interface(mconfig, *this),
m_maincpu(*this, I8048_TAG),
@@ -348,8 +348,8 @@ WRITE_LINE_MEMBER( iskr_1030_keyboard_device::data_write )
READ8_MEMBER( iskr_1030_keyboard_device::t1_r )
{
- UINT8 data = data_signal();
- UINT8 bias = m_p1 & 15;
+ uint8_t data = data_signal();
+ uint8_t bias = m_p1 & 15;
if (!BIT(m_p1, 7)) {
DBG_LOG(2,0,( "%s: t1_r (l) %d\n", tag(), data));
@@ -440,7 +440,7 @@ READ8_MEMBER( iskr_1030_keyboard_device::p1_r )
7
*/
- UINT8 data = 0;
+ uint8_t data = 0;
DBG_LOG(1,0,( "%s: p1_r %02x\n", tag(), data));
diff --git a/src/devices/bus/pc_kbd/iskr1030.h b/src/devices/bus/pc_kbd/iskr1030.h
index dd3573f0f75..4d7ce5e1826 100644
--- a/src/devices/bus/pc_kbd/iskr1030.h
+++ b/src/devices/bus/pc_kbd/iskr1030.h
@@ -29,7 +29,7 @@ class iskr_1030_keyboard_device : public device_t,
{
public:
// construction/destruction
- iskr_1030_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ iskr_1030_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -79,10 +79,10 @@ private:
required_ioport m_md22;
required_ioport m_md23;
- std::vector<UINT8> m_ram;
- UINT8 m_bus;
- UINT8 m_p1;
- UINT8 m_p2;
+ std::vector<uint8_t> m_ram;
+ uint8_t m_bus;
+ uint8_t m_p1;
+ uint8_t m_p2;
int m_q;
};
diff --git a/src/devices/bus/pc_kbd/keytro.cpp b/src/devices/bus/pc_kbd/keytro.cpp
index 331ed871d09..480e0a65b75 100644
--- a/src/devices/bus/pc_kbd/keytro.cpp
+++ b/src/devices/bus/pc_kbd/keytro.cpp
@@ -377,7 +377,7 @@ ROM_START( keytronic_pc3270 )
ROM_END
-pc_kbd_keytronic_pc3270_device::pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pc_kbd_keytronic_pc3270_device::pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PC_KBD_KEYTRONIC_PC3270, "Keytronic PC3270", tag, owner, clock, "keytronic_pc3270", __FILE__),
device_pc_kbd_interface(mconfig, *this),
m_cpu(*this, "kb_keytr"), m_p1(0), m_p1_data(0), m_p2(0), m_p3(0), m_last_write_addr(0)
@@ -606,7 +606,7 @@ WRITE8_MEMBER( pc_kbd_keytronic_pc3270_device::p2_write )
READ8_MEMBER( pc_kbd_keytronic_pc3270_device::p3_read )
{
- UINT8 data = m_p3;
+ uint8_t data = m_p3;
data &= ~0x14;
diff --git a/src/devices/bus/pc_kbd/keytro.h b/src/devices/bus/pc_kbd/keytro.h
index 98f8097fda7..938a09edf89 100644
--- a/src/devices/bus/pc_kbd/keytro.h
+++ b/src/devices/bus/pc_kbd/keytro.h
@@ -22,7 +22,7 @@ class pc_kbd_keytronic_pc3270_device : public device_t,
{
public:
// construction/destruction
- pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_kbd_keytronic_pc3270_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
required_device<cpu_device> m_cpu;
@@ -48,11 +48,11 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- UINT8 m_p1;
- UINT8 m_p1_data;
- UINT8 m_p2;
- UINT8 m_p3;
- UINT16 m_last_write_addr;
+ uint8_t m_p1;
+ uint8_t m_p1_data;
+ uint8_t m_p2;
+ uint8_t m_p3;
+ uint16_t m_last_write_addr;
};
@@ -60,7 +60,7 @@ class pc_kbd_keytronic_pc3270_at_device : public pc_kbd_keytronic_pc3270_device
{
public:
// construction/destruction
- pc_kbd_keytronic_pc3270_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ pc_kbd_keytronic_pc3270_at_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: pc_kbd_keytronic_pc3270_device(mconfig, tag, owner, clock)
{
}
diff --git a/src/devices/bus/pc_kbd/msnat.cpp b/src/devices/bus/pc_kbd/msnat.cpp
index c1bb29f6a7e..e7aaf50e968 100644
--- a/src/devices/bus/pc_kbd/msnat.cpp
+++ b/src/devices/bus/pc_kbd/msnat.cpp
@@ -228,7 +228,7 @@ ROM_START( microsoft_natural )
ROM_END
-pc_kbd_microsoft_natural_device::pc_kbd_microsoft_natural_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pc_kbd_microsoft_natural_device::pc_kbd_microsoft_natural_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, PC_KBD_MICROSOFT_NATURAL, "Microsoft Natural Keyboard", tag, owner, clock, "ms_natural", __FILE__)
, device_pc_kbd_interface(mconfig, *this)
, m_cpu(*this, "ms_natrl_cpu")
@@ -315,7 +315,7 @@ WRITE_LINE_MEMBER( pc_kbd_microsoft_natural_device::data_write )
READ8_MEMBER( pc_kbd_microsoft_natural_device::p0_read )
{
- UINT8 data = 0xFF;
+ uint8_t data = 0xFF;
if (LOG)
logerror("%s: P0 read. P1 = %02x, P2 = %02x\n", tag(), m_p1, m_p2 );
@@ -424,7 +424,7 @@ WRITE8_MEMBER( pc_kbd_microsoft_natural_device::p2_write )
READ8_MEMBER( pc_kbd_microsoft_natural_device::p3_read )
{
- UINT8 data = m_p3 & ~0x21;
+ uint8_t data = m_p3 & ~0x21;
// (Incoming) Clock signal is tied to the T1/P3.5 pin
data |= (clock_signal() ? 0x20 : 0x00);
diff --git a/src/devices/bus/pc_kbd/msnat.h b/src/devices/bus/pc_kbd/msnat.h
index bbcc9e26516..c3c8eaa5c99 100644
--- a/src/devices/bus/pc_kbd/msnat.h
+++ b/src/devices/bus/pc_kbd/msnat.h
@@ -20,7 +20,7 @@ class pc_kbd_microsoft_natural_device : public device_t,
{
public:
// construction/destruction
- pc_kbd_microsoft_natural_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_kbd_microsoft_natural_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
required_device<cpu_device> m_cpu;
@@ -61,10 +61,10 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- UINT8 m_p0;
- UINT8 m_p1;
- UINT8 m_p2;
- UINT8 m_p3;
+ uint8_t m_p0;
+ uint8_t m_p1;
+ uint8_t m_p2;
+ uint8_t m_p3;
};
diff --git a/src/devices/bus/pc_kbd/pc83.cpp b/src/devices/bus/pc_kbd/pc83.cpp
index 8b1d25366ae..044d12d46d5 100644
--- a/src/devices/bus/pc_kbd/pc83.cpp
+++ b/src/devices/bus/pc_kbd/pc83.cpp
@@ -248,7 +248,7 @@ ioport_constructor ibm_pc_83_keyboard_device::device_input_ports() const
// ibm_pc_83_keyboard_device - constructor
//-------------------------------------------------
-ibm_pc_83_keyboard_device::ibm_pc_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ibm_pc_83_keyboard_device::ibm_pc_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PC_KBD_IBM_PC_83, "IBM PC Keyboard", tag, owner, clock, "kb_pc83", __FILE__),
device_pc_kbd_interface(mconfig, *this),
m_maincpu(*this, I8048_TAG),
@@ -325,7 +325,7 @@ READ8_MEMBER( ibm_pc_83_keyboard_device::p1_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
data |= clock_signal();
data |= data_signal() << 1;
@@ -366,7 +366,7 @@ WRITE8_MEMBER( ibm_pc_83_keyboard_device::p2_w )
READ8_MEMBER( ibm_pc_83_keyboard_device::t1_r )
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
int keylatch = m_cnt >> 2;
diff --git a/src/devices/bus/pc_kbd/pc83.h b/src/devices/bus/pc_kbd/pc83.h
index 9aa3c82bd85..18c81dfc97e 100644
--- a/src/devices/bus/pc_kbd/pc83.h
+++ b/src/devices/bus/pc_kbd/pc83.h
@@ -29,7 +29,7 @@ class ibm_pc_83_keyboard_device : public device_t,
{
public:
// construction/destruction
- ibm_pc_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ibm_pc_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -54,7 +54,7 @@ private:
required_device<cpu_device> m_maincpu;
required_ioport_array<24> m_dr;
- UINT8 m_cnt;
+ uint8_t m_cnt;
};
diff --git a/src/devices/bus/pc_kbd/pc_kbdc.cpp b/src/devices/bus/pc_kbd/pc_kbdc.cpp
index 987c51eda63..d5768d633f4 100644
--- a/src/devices/bus/pc_kbd/pc_kbdc.cpp
+++ b/src/devices/bus/pc_kbd/pc_kbdc.cpp
@@ -30,7 +30,7 @@ const device_type PC_KBDC_SLOT = &device_creator<pc_kbdc_slot_device>;
//-------------------------------------------------
// pc_kbdc_slot_device - constructor
//-------------------------------------------------
-pc_kbdc_slot_device::pc_kbdc_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pc_kbdc_slot_device::pc_kbdc_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PC_KBDC_SLOT, "PC_KBDC_SLOT", tag, owner, clock, "pc_kbdc_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_kbdc_device(nullptr)
@@ -69,7 +69,7 @@ const device_type PC_KBDC = &device_creator<pc_kbdc_device>;
//-------------------------------------------------
// pc_kbdc_device - constructor
//-------------------------------------------------
-pc_kbdc_device::pc_kbdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pc_kbdc_device::pc_kbdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PC_KBDC, "PC_KBDC", tag, owner, clock, "pc_kbdc", __FILE__),
m_out_clock_cb(*this),
m_out_data_cb(*this),
diff --git a/src/devices/bus/pc_kbd/pc_kbdc.h b/src/devices/bus/pc_kbd/pc_kbdc.h
index 3f1788ac021..a90164171c2 100644
--- a/src/devices/bus/pc_kbd/pc_kbdc.h
+++ b/src/devices/bus/pc_kbd/pc_kbdc.h
@@ -42,7 +42,7 @@ class pc_kbdc_slot_device : public device_t,
{
public:
// construction/destruction
- pc_kbdc_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_kbdc_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -65,7 +65,7 @@ class pc_kbdc_device : public device_t
{
public:
// construction/destruction
- pc_kbdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc_kbdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_out_clock_callback(device_t &device, _Object object) { return downcast<pc_kbdc_device &>(device).m_out_clock_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_data_callback(device_t &device, _Object object) { return downcast<pc_kbdc_device &>(device).m_out_data_cb.set_callback(object); }
diff --git a/src/devices/bus/pc_kbd/pcat84.cpp b/src/devices/bus/pc_kbd/pcat84.cpp
index d8babfa1a36..ec1ececa88a 100644
--- a/src/devices/bus/pc_kbd/pcat84.cpp
+++ b/src/devices/bus/pc_kbd/pcat84.cpp
@@ -353,7 +353,7 @@ ioport_constructor ibm_3270pc_122_keyboard_device::device_input_ports() const
// ibm_pc_at_84_keyboard_device - constructor
//-------------------------------------------------
-ibm_pc_at_84_keyboard_device::ibm_pc_at_84_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ibm_pc_at_84_keyboard_device::ibm_pc_at_84_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_pc_kbd_interface(mconfig, *this),
m_maincpu(*this, I8048_TAG),
@@ -367,10 +367,10 @@ ibm_pc_at_84_keyboard_device::ibm_pc_at_84_keyboard_device(const machine_config
{
}
-ibm_pc_at_84_keyboard_device::ibm_pc_at_84_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ibm_pc_at_84_keyboard_device::ibm_pc_at_84_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
ibm_pc_at_84_keyboard_device(mconfig, PC_KBD_IBM_PC_AT_84, "IBM PC/AT Keyboard", tag, owner, clock, "kb_pcat84", __FILE__) { }
-ibm_3270pc_122_keyboard_device::ibm_3270pc_122_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ibm_3270pc_122_keyboard_device::ibm_3270pc_122_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
ibm_pc_at_84_keyboard_device(mconfig, PC_KBD_IBM_3270PC_122, "IBM 3270PC Keyboard", tag, owner, clock, "kb_3270pc", __FILE__) { }
@@ -451,7 +451,7 @@ READ8_MEMBER( ibm_pc_at_84_keyboard_device::p1_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
data |= m_kbdida->read() << 2;
@@ -510,7 +510,7 @@ READ8_MEMBER( ibm_pc_at_84_keyboard_device::p2_r )
*/
- UINT8 data = 0xc0;
+ uint8_t data = 0xc0;
data |= m_kbdidb->read();
@@ -574,7 +574,7 @@ READ8_MEMBER( ibm_pc_at_84_keyboard_device::t1_r )
int ibm_pc_at_84_keyboard_device::key_depressed()
{
- UINT8 data = m_dr[m_cnt]->read();
+ uint8_t data = m_dr[m_cnt]->read();
return m_t1 && BIT(data, m_sense);
}
diff --git a/src/devices/bus/pc_kbd/pcat84.h b/src/devices/bus/pc_kbd/pcat84.h
index 5c5f542c24c..d3219ea41da 100644
--- a/src/devices/bus/pc_kbd/pcat84.h
+++ b/src/devices/bus/pc_kbd/pcat84.h
@@ -29,8 +29,8 @@ class ibm_pc_at_84_keyboard_device : public device_t,
{
public:
// construction/destruction
- ibm_pc_at_84_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- ibm_pc_at_84_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ibm_pc_at_84_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ ibm_pc_at_84_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -69,7 +69,7 @@ private:
optional_ioport m_kbdida;
optional_ioport m_kbdidb;
- UINT8 m_db;
+ uint8_t m_db;
int m_cnt;
int m_sense;
int m_t1;
@@ -82,7 +82,7 @@ class ibm_3270pc_122_keyboard_device : public ibm_pc_at_84_keyboard_device
{
public:
// construction/destruction
- ibm_3270pc_122_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ibm_3270pc_122_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/pc_kbd/pcxt83.cpp b/src/devices/bus/pc_kbd/pcxt83.cpp
index 193f0e08931..22b1d7b3e52 100644
--- a/src/devices/bus/pc_kbd/pcxt83.cpp
+++ b/src/devices/bus/pc_kbd/pcxt83.cpp
@@ -247,7 +247,7 @@ ioport_constructor ibm_pc_xt_83_keyboard_device::device_input_ports() const
// ibm_pc_xt_83_keyboard_device - constructor
//-------------------------------------------------
-ibm_pc_xt_83_keyboard_device::ibm_pc_xt_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ibm_pc_xt_83_keyboard_device::ibm_pc_xt_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, PC_KBD_IBM_PC_XT_83, "IBM PC/XT Keyboard", tag, owner, clock, "kb_pcxt83", __FILE__),
device_pc_kbd_interface(mconfig, *this),
m_maincpu(*this, I8048_TAG),
@@ -343,7 +343,7 @@ WRITE8_MEMBER( ibm_pc_xt_83_keyboard_device::bus_w )
if (!BIT(m_bus, 7) && BIT(data, 7))
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (BIT(m_p1, 0)) data &= m_md[0]->read();
if (BIT(m_p1, 1)) data &= m_md[1]->read();
diff --git a/src/devices/bus/pc_kbd/pcxt83.h b/src/devices/bus/pc_kbd/pcxt83.h
index 47e23205e62..672e67f406c 100644
--- a/src/devices/bus/pc_kbd/pcxt83.h
+++ b/src/devices/bus/pc_kbd/pcxt83.h
@@ -29,7 +29,7 @@ class ibm_pc_xt_83_keyboard_device : public device_t,
{
public:
// construction/destruction
- ibm_pc_xt_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ibm_pc_xt_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -56,9 +56,9 @@ private:
required_device<cpu_device> m_maincpu;
required_ioport_array<12> m_md;
- UINT8 m_bus;
- UINT8 m_p1;
- UINT8 m_p2;
+ uint8_t m_bus;
+ uint8_t m_p1;
+ uint8_t m_p2;
int m_sense;
int m_q;
};
diff --git a/src/devices/bus/pce/pce_rom.cpp b/src/devices/bus/pce/pce_rom.cpp
index 5323f8a675b..553ac06fedf 100644
--- a/src/devices/bus/pce/pce_rom.cpp
+++ b/src/devices/bus/pce/pce_rom.cpp
@@ -23,29 +23,29 @@ const device_type PCE_ROM_POPULOUS = &device_creator<pce_populous_device>;
const device_type PCE_ROM_SF2 = &device_creator<pce_sf2_device>;
-pce_rom_device::pce_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+pce_rom_device::pce_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_pce_cart_interface( mconfig, *this )
{
}
-pce_rom_device::pce_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pce_rom_device::pce_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, PCE_ROM_STD, "PCE & TG16 Carts", tag, owner, clock, "pce_rom", __FILE__),
device_pce_cart_interface( mconfig, *this )
{
}
-pce_cdsys3_device::pce_cdsys3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pce_cdsys3_device::pce_cdsys3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: pce_rom_device(mconfig, PCE_ROM_CDSYS3, "PCE & TG16 CD-System Cart v3.00", tag, owner, clock, "pce_cdsys3", __FILE__)
{
}
-pce_populous_device::pce_populous_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pce_populous_device::pce_populous_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: pce_rom_device(mconfig, PCE_ROM_POPULOUS, "PCE Populous Cart", tag, owner, clock, "pce_populous", __FILE__)
{
}
-pce_sf2_device::pce_sf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pce_sf2_device::pce_sf2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: pce_rom_device(mconfig, PCE_ROM_SF2, "PCE Street Fighters 2 Cart", tag, owner, clock, "pce_sf2", __FILE__), m_bank_base(0)
{
}
diff --git a/src/devices/bus/pce/pce_rom.h b/src/devices/bus/pce/pce_rom.h
index 14d6dc29577..9dd69e7fd6b 100644
--- a/src/devices/bus/pce/pce_rom.h
+++ b/src/devices/bus/pce/pce_rom.h
@@ -13,8 +13,8 @@ class pce_rom_device : public device_t,
{
public:
// construction/destruction
- pce_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- pce_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pce_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ pce_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override {}
@@ -30,7 +30,7 @@ class pce_cdsys3_device : public pce_rom_device
{
public:
// construction/destruction
- pce_cdsys3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pce_cdsys3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -44,7 +44,7 @@ class pce_populous_device : public pce_rom_device
{
public:
// construction/destruction
- pce_populous_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pce_populous_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -58,7 +58,7 @@ class pce_sf2_device : public pce_rom_device
{
public:
// construction/destruction
- pce_sf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pce_sf2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -69,7 +69,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_cart) override;
private:
- UINT8 m_bank_base;
+ uint8_t m_bank_base;
};
diff --git a/src/devices/bus/pce/pce_slot.cpp b/src/devices/bus/pce/pce_slot.cpp
index db42af8281e..99b625244af 100644
--- a/src/devices/bus/pce/pce_slot.cpp
+++ b/src/devices/bus/pce/pce_slot.cpp
@@ -49,7 +49,7 @@ device_pce_cart_interface::~device_pce_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_pce_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_pce_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -63,7 +63,7 @@ void device_pce_cart_interface::rom_alloc(UINT32 size, const char *tag)
// ram_alloc - alloc the space for the ram
//-------------------------------------------------
-void device_pce_cart_interface::ram_alloc(UINT32 size)
+void device_pce_cart_interface::ram_alloc(uint32_t size)
{
m_ram.resize(size);
device().save_item(NAME(m_ram));
@@ -74,7 +74,7 @@ void device_pce_cart_interface::ram_alloc(UINT32 size)
// blocks, so to simplify ROM access to mirror
//-------------------------------------------------
-void device_pce_cart_interface::rom_map_setup(UINT32 size)
+void device_pce_cart_interface::rom_map_setup(uint32_t size)
{
if (size == 0x60000)
{
@@ -135,7 +135,7 @@ void device_pce_cart_interface::rom_map_setup(UINT32 size)
//-------------------------------------------------
// pce_cart_slot_device - constructor
//-------------------------------------------------
-pce_cart_slot_device::pce_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pce_cart_slot_device::pce_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PCE_CART_SLOT, "PCE & TG16 Cartridge Slot", tag, owner, clock, "pce_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -226,9 +226,9 @@ image_init_result pce_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT32 offset;
- UINT32 len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
- UINT8 *ROM;
+ uint32_t offset;
+ uint32_t len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
+ uint8_t *ROM;
// From fullpath, check for presence of a header and skip it
if (software_entry() == nullptr && (len % 0x4000) == 512)
@@ -250,7 +250,7 @@ image_init_result pce_cart_slot_device::call_load()
// check for encryption (US carts)
if (ROM[0x1fff] < 0xe0)
{
- UINT8 decrypted[256];
+ uint8_t decrypted[256];
/* Initialize decryption table */
for (int i = 0; i < 256; i++)
@@ -299,7 +299,7 @@ void pce_cart_slot_device::call_unload()
fullpath
-------------------------------------------------*/
-int pce_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
+int pce_cart_slot_device::get_cart_type(uint8_t *ROM, uint32_t len)
{
int type = PCE_STD;
@@ -332,8 +332,8 @@ std::string pce_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- UINT32 len = m_file->size();
- std::vector<UINT8> rom(len);
+ uint32_t len = m_file->size();
+ std::vector<uint8_t> rom(len);
int type;
m_file->read(&rom[0], len);
@@ -377,6 +377,6 @@ WRITE8_MEMBER(pce_cart_slot_device::write_cart)
Internal header logging
-------------------------------------------------*/
-void pce_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len)
+void pce_cart_slot_device::internal_header_logging(uint8_t *ROM, uint32_t len)
{
}
diff --git a/src/devices/bus/pce/pce_slot.h b/src/devices/bus/pce/pce_slot.h
index ccd7954b8a5..e76940aaa68 100644
--- a/src/devices/bus/pce/pce_slot.h
+++ b/src/devices/bus/pce/pce_slot.h
@@ -35,21 +35,21 @@ public:
virtual DECLARE_READ8_MEMBER(read_cart) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_cart) {};
- void rom_alloc(UINT32 size, const char *tag);
- void ram_alloc(UINT32 size);
- UINT8* get_rom_base() { return m_rom; }
- UINT8* get_ram_base() { return &m_ram[0]; }
- UINT32 get_rom_size() { return m_rom_size; }
- UINT32 get_ram_size() { return m_ram.size(); }
+ void rom_alloc(uint32_t size, const char *tag);
+ void ram_alloc(uint32_t size);
+ uint8_t* get_rom_base() { return m_rom; }
+ uint8_t* get_ram_base() { return &m_ram[0]; }
+ uint32_t get_rom_size() { return m_rom_size; }
+ uint32_t get_ram_size() { return m_ram.size(); }
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT8> m_ram;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint8_t> m_ram;
- void rom_map_setup(UINT32 size);
+ void rom_map_setup(uint32_t size);
- UINT8 rom_bank_map[8]; // 128K chunks of rom
+ uint8_t rom_bank_map[8]; // 128K chunks of rom
};
@@ -61,7 +61,7 @@ class pce_cart_slot_device : public device_t,
{
public:
// construction/destruction
- pce_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pce_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~pce_cart_slot_device();
// device-level overrides
@@ -74,9 +74,9 @@ public:
virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
int get_type() { return m_type; }
- int get_cart_type(UINT8 *ROM, UINT32 len);
+ int get_cart_type(uint8_t *ROM, uint32_t len);
- void internal_header_logging(UINT8 *ROM, UINT32 len);
+ void internal_header_logging(uint8_t *ROM, uint32_t len);
void set_intf(const char * interface) { m_interface = interface; }
diff --git a/src/devices/bus/pet/2joysnd.cpp b/src/devices/bus/pet/2joysnd.cpp
index 41e998ca429..34d00aa7886 100644
--- a/src/devices/bus/pet/2joysnd.cpp
+++ b/src/devices/bus/pet/2joysnd.cpp
@@ -110,7 +110,7 @@ machine_config_constructor pet_userport_joystick_and_sound_device::device_mconfi
// pet_user_port_dual_joystick_and_sound_device - constructor
//-------------------------------------------------
-pet_userport_joystick_and_sound_device::pet_userport_joystick_and_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pet_userport_joystick_and_sound_device::pet_userport_joystick_and_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PET_USERPORT_JOYSTICK_AND_SOUND_DEVICE, "Dual Joysticks and Sound", tag, owner, clock, "2joysnd", __FILE__),
device_pet_user_port_interface(mconfig, *this),
m_dac(*this, "dac"),
diff --git a/src/devices/bus/pet/2joysnd.h b/src/devices/bus/pet/2joysnd.h
index 040e867ef99..64ba22438c0 100644
--- a/src/devices/bus/pet/2joysnd.h
+++ b/src/devices/bus/pet/2joysnd.h
@@ -28,7 +28,7 @@ class pet_userport_joystick_and_sound_device : public device_t,
{
public:
// construction/destruction
- pet_userport_joystick_and_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pet_userport_joystick_and_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/pet/64k.cpp b/src/devices/bus/pet/64k.cpp
index dfdc278a77d..7b27e8c3c13 100644
--- a/src/devices/bus/pet/64k.cpp
+++ b/src/devices/bus/pet/64k.cpp
@@ -26,9 +26,9 @@ const device_type PET_64K = &device_creator<pet_64k_expansion_device>;
// read_ram -
//-------------------------------------------------
-inline UINT8 pet_64k_expansion_device::read_ram(offs_t offset)
+inline uint8_t pet_64k_expansion_device::read_ram(offs_t offset)
{
- UINT8 data;
+ uint8_t data;
if (offset < 0xc000)
{
@@ -47,7 +47,7 @@ inline UINT8 pet_64k_expansion_device::read_ram(offs_t offset)
// write_ram -
//-------------------------------------------------
-inline void pet_64k_expansion_device::write_ram(offs_t offset, UINT8 data)
+inline void pet_64k_expansion_device::write_ram(offs_t offset, uint8_t data)
{
if (offset < 0xc000)
{
@@ -75,7 +75,7 @@ inline void pet_64k_expansion_device::write_ram(offs_t offset, UINT8 data)
// pet_64k_expansion_device - constructor
//-------------------------------------------------
-pet_64k_expansion_device::pet_64k_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pet_64k_expansion_device::pet_64k_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PET_64K, "PET 64KB RAM", tag, owner, clock, "pet_64k", __FILE__),
device_pet_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram"),
@@ -122,7 +122,7 @@ int pet_64k_expansion_device::pet_norom_r(address_space &space, offs_t offset, i
// pet_bd_r - buffered data read
//-------------------------------------------------
-UINT8 pet_64k_expansion_device::pet_bd_r(address_space &space, offs_t offset, UINT8 data, int &sel)
+uint8_t pet_64k_expansion_device::pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel)
{
if (BIT(m_ctrl, 7))
{
@@ -163,7 +163,7 @@ UINT8 pet_64k_expansion_device::pet_bd_r(address_space &space, offs_t offset, UI
// pet_bd_w - buffered data write
//-------------------------------------------------
-void pet_64k_expansion_device::pet_bd_w(address_space &space, offs_t offset, UINT8 data, int &sel)
+void pet_64k_expansion_device::pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel)
{
if (BIT(m_ctrl, 7))
{
diff --git a/src/devices/bus/pet/64k.h b/src/devices/bus/pet/64k.h
index ed698f539d1..fbaca888a58 100644
--- a/src/devices/bus/pet/64k.h
+++ b/src/devices/bus/pet/64k.h
@@ -27,7 +27,7 @@ class pet_64k_expansion_device : public device_t,
{
public:
// construction/destruction
- pet_64k_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pet_64k_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,16 +36,16 @@ protected:
// device_pet_expansion_card_interface overrides
virtual int pet_norom_r(address_space &space, offs_t offset, int sel) override;
- virtual UINT8 pet_bd_r(address_space &space, offs_t offset, UINT8 data, int &sel) override;
- virtual void pet_bd_w(address_space &space, offs_t offset, UINT8 data, int &sel) override;
+ virtual uint8_t pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel) override;
+ virtual void pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel) override;
private:
- inline UINT8 read_ram(offs_t offset);
- inline void write_ram(offs_t offset, UINT8 data);
+ inline uint8_t read_ram(offs_t offset);
+ inline void write_ram(offs_t offset, uint8_t data);
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
- UINT8 m_ctrl;
+ uint8_t m_ctrl;
};
diff --git a/src/devices/bus/pet/c2n.cpp b/src/devices/bus/pet/c2n.cpp
index 585e651f3d7..1e86ed6738b 100644
--- a/src/devices/bus/pet/c2n.cpp
+++ b/src/devices/bus/pet/c2n.cpp
@@ -51,7 +51,7 @@ machine_config_constructor c2n_device::device_mconfig_additions() const
// c2n_device - constructor
//-------------------------------------------------
-c2n_device::c2n_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+c2n_device::c2n_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_pet_datassette_port_interface(mconfig, *this),
m_cassette(*this, "cassette"),
@@ -60,7 +60,7 @@ c2n_device::c2n_device(const machine_config &mconfig, device_type type, const ch
{
}
-c2n_device::c2n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c2n_device::c2n_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, C2N, "C2N Datassette", tag, owner, clock, "c2n", __FILE__),
device_pet_datassette_port_interface(mconfig, *this),
m_cassette(*this, "cassette"),
@@ -73,7 +73,7 @@ c2n_device::c2n_device(const machine_config &mconfig, const char *tag, device_t
// c1530_device - constructor
//-------------------------------------------------
-c1530_device::c1530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1530_device::c1530_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c2n_device(mconfig, C1530, "C1530 Datassette", tag, owner, clock, "c1530", __FILE__) { }
@@ -81,7 +81,7 @@ c1530_device::c1530_device(const machine_config &mconfig, const char *tag, devic
// c1531_device - constructor
//-------------------------------------------------
-c1531_device::c1531_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1531_device::c1531_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: c2n_device(mconfig, C1531, "C1531 Datassette", tag, owner, clock, "c1531", __FILE__) { }
diff --git a/src/devices/bus/pet/c2n.h b/src/devices/bus/pet/c2n.h
index 5aeac83ce0b..e373d1ea4e8 100644
--- a/src/devices/bus/pet/c2n.h
+++ b/src/devices/bus/pet/c2n.h
@@ -29,8 +29,8 @@ class c2n_device : public device_t,
{
public:
// construction/destruction
- c2n_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- c2n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c2n_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ c2n_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -62,7 +62,7 @@ class c1530_device : public c2n_device
{
public:
// construction/destruction
- c1530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1530_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
@@ -72,7 +72,7 @@ class c1531_device : public c2n_device
{
public:
// construction/destruction
- c1531_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1531_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
diff --git a/src/devices/bus/pet/cass.cpp b/src/devices/bus/pet/cass.cpp
index cb715a18434..5147908f1d1 100644
--- a/src/devices/bus/pet/cass.cpp
+++ b/src/devices/bus/pet/cass.cpp
@@ -51,7 +51,7 @@ device_pet_datassette_port_interface::~device_pet_datassette_port_interface()
// pet_datassette_port_device - constructor
//-------------------------------------------------
-pet_datassette_port_device::pet_datassette_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pet_datassette_port_device::pet_datassette_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PET_DATASSETTE_PORT, "Datassette Port", tag, owner, clock, "pet_datassette_port", __FILE__),
device_slot_interface(mconfig, *this),
m_read_handler(*this), m_cart(nullptr)
diff --git a/src/devices/bus/pet/cass.h b/src/devices/bus/pet/cass.h
index a3dbda7797d..ab3d4432903 100644
--- a/src/devices/bus/pet/cass.h
+++ b/src/devices/bus/pet/cass.h
@@ -57,7 +57,7 @@ class pet_datassette_port_device : public device_t,
{
public:
// construction/destruction
- pet_datassette_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pet_datassette_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~pet_datassette_port_device();
// static configuration helpers
diff --git a/src/devices/bus/pet/cb2snd.cpp b/src/devices/bus/pet/cb2snd.cpp
index b2ef21f79b1..0b277a869ec 100644
--- a/src/devices/bus/pet/cb2snd.cpp
+++ b/src/devices/bus/pet/cb2snd.cpp
@@ -42,7 +42,7 @@ machine_config_constructor pet_userport_cb2_sound_device::device_mconfig_additio
// pet_userport_cb2_sound_device - constructor
//-------------------------------------------------
-pet_userport_cb2_sound_device::pet_userport_cb2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pet_userport_cb2_sound_device::pet_userport_cb2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PET_USERPORT_CB2_SOUND_DEVICE, "PET Userport 'CB2 Sound' Device", tag, owner, clock, "petucb2", __FILE__),
device_pet_user_port_interface(mconfig, *this),
m_dac(*this, "dac")
diff --git a/src/devices/bus/pet/cb2snd.h b/src/devices/bus/pet/cb2snd.h
index e8caed04480..26c16ec6be4 100644
--- a/src/devices/bus/pet/cb2snd.h
+++ b/src/devices/bus/pet/cb2snd.h
@@ -24,7 +24,7 @@ class pet_userport_cb2_sound_device : public device_t,
{
public:
// construction/destruction
- pet_userport_cb2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pet_userport_cb2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/pet/diag.cpp b/src/devices/bus/pet/diag.cpp
index 7cd73c6fff0..3c7be726494 100644
--- a/src/devices/bus/pet/diag.cpp
+++ b/src/devices/bus/pet/diag.cpp
@@ -26,7 +26,7 @@ const device_type PET_USERPORT_DIAGNOSTIC_CONNECTOR = &device_creator<pet_userpo
// pet_userport_diagnostic_connector_t - constructor
//-------------------------------------------------
-pet_userport_diagnostic_connector_t::pet_userport_diagnostic_connector_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pet_userport_diagnostic_connector_t::pet_userport_diagnostic_connector_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PET_USERPORT_DIAGNOSTIC_CONNECTOR, "PET Userport Diagnostic Connector", tag, owner, clock, "pet_user_diag", __FILE__),
device_pet_user_port_interface(mconfig, *this)
{
diff --git a/src/devices/bus/pet/diag.h b/src/devices/bus/pet/diag.h
index 58ce46f82ba..150292b4256 100644
--- a/src/devices/bus/pet/diag.h
+++ b/src/devices/bus/pet/diag.h
@@ -27,7 +27,7 @@ class pet_userport_diagnostic_connector_t : public device_t,
{
public:
// construction/destruction
- pet_userport_diagnostic_connector_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pet_userport_diagnostic_connector_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device_pet_user_port_interface overrides
virtual DECLARE_WRITE_LINE_MEMBER( input_2 ) override { output_b(state); }
diff --git a/src/devices/bus/pet/diag264_lb_tape.cpp b/src/devices/bus/pet/diag264_lb_tape.cpp
index 0c3bfb87d74..a1123bdfaca 100644
--- a/src/devices/bus/pet/diag264_lb_tape.cpp
+++ b/src/devices/bus/pet/diag264_lb_tape.cpp
@@ -26,7 +26,7 @@ const device_type DIAG264_CASSETTE_LOOPBACK = &device_creator<diag264_cassette_l
// diag264_cassette_loopback_device - constructor
//-------------------------------------------------
-diag264_cassette_loopback_device::diag264_cassette_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+diag264_cassette_loopback_device::diag264_cassette_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, DIAG264_CASSETTE_LOOPBACK, "Diag264 Cassette Loopback", tag, owner, clock, "diag264_loopback_cassette", __FILE__),
device_pet_datassette_port_interface(mconfig, *this),
m_read(1),
diff --git a/src/devices/bus/pet/diag264_lb_tape.h b/src/devices/bus/pet/diag264_lb_tape.h
index c4bc2ad4e02..88f648451a3 100644
--- a/src/devices/bus/pet/diag264_lb_tape.h
+++ b/src/devices/bus/pet/diag264_lb_tape.h
@@ -27,7 +27,7 @@ class diag264_cassette_loopback_device : public device_t,
{
public:
// construction/destruction
- diag264_cassette_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ diag264_cassette_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/pet/exp.cpp b/src/devices/bus/pet/exp.cpp
index 8a830a8af3a..b04b2d14f1f 100644
--- a/src/devices/bus/pet/exp.cpp
+++ b/src/devices/bus/pet/exp.cpp
@@ -34,7 +34,7 @@ const device_type PET_EXPANSION_SLOT = &device_creator<pet_expansion_slot_device
// pet_expansion_slot_device - constructor
//-------------------------------------------------
-pet_expansion_slot_device::pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pet_expansion_slot_device::pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PET_EXPANSION_SLOT, "PET memory expansion port", tag, owner, clock, "pet_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this), m_card(nullptr),
m_read_dma(*this),
@@ -113,7 +113,7 @@ int pet_expansion_slot_device::norom_r(address_space &space, offs_t offset, int
// read - buffered data read
//-------------------------------------------------
-UINT8 pet_expansion_slot_device::read(address_space &space, offs_t offset, UINT8 data, int &sel)
+uint8_t pet_expansion_slot_device::read(address_space &space, offs_t offset, uint8_t data, int &sel)
{
if (m_card != nullptr)
{
@@ -128,7 +128,7 @@ UINT8 pet_expansion_slot_device::read(address_space &space, offs_t offset, UINT8
// write - buffered data write
//-------------------------------------------------
-void pet_expansion_slot_device::write(address_space &space, offs_t offset, UINT8 data, int &sel)
+void pet_expansion_slot_device::write(address_space &space, offs_t offset, uint8_t data, int &sel)
{
if (m_card != nullptr)
{
@@ -161,7 +161,7 @@ WRITE_LINE_MEMBER( pet_expansion_slot_device::irq_w )
// dma_bd_r - DMA read
//-------------------------------------------------
-UINT8 pet_expansion_slot_device::dma_bd_r(offs_t offset)
+uint8_t pet_expansion_slot_device::dma_bd_r(offs_t offset)
{
return m_read_dma(offset);
}
@@ -171,7 +171,7 @@ UINT8 pet_expansion_slot_device::dma_bd_r(offs_t offset)
// dma_bd_w - DMA write
//-------------------------------------------------
-void pet_expansion_slot_device::dma_bd_w(offs_t offset, UINT8 data)
+void pet_expansion_slot_device::dma_bd_w(offs_t offset, uint8_t data)
{
m_write_dma(offset, data);
}
diff --git a/src/devices/bus/pet/exp.h b/src/devices/bus/pet/exp.h
index d2f189cf0cd..5c461df589b 100644
--- a/src/devices/bus/pet/exp.h
+++ b/src/devices/bus/pet/exp.h
@@ -52,7 +52,7 @@ class pet_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~pet_expansion_slot_device();
template<class _read, class _write> void set_callbacks(_read rd, _write wr) {
@@ -62,14 +62,14 @@ public:
// computer interface
int norom_r(address_space &space, offs_t offset, int sel);
- UINT8 read(address_space &space, offs_t offset, UINT8 data, int &sel);
- void write(address_space &space, offs_t offset, UINT8 data, int &sel);
+ uint8_t read(address_space &space, offs_t offset, uint8_t data, int &sel);
+ void write(address_space &space, offs_t offset, uint8_t data, int &sel);
DECLARE_READ_LINE_MEMBER( diag_r );
DECLARE_WRITE_LINE_MEMBER( irq_w );
// cartridge interface
- UINT8 dma_bd_r(offs_t offset);
- void dma_bd_w(offs_t offset, UINT8 data);
+ uint8_t dma_bd_r(offs_t offset);
+ void dma_bd_w(offs_t offset, uint8_t data);
int phi2();
enum
@@ -119,8 +119,8 @@ public:
protected:
// runtime
virtual int pet_norom_r(address_space &space, offs_t offset, int sel) { return 1; }
- virtual UINT8 pet_bd_r(address_space &space, offs_t offset, UINT8 data, int &sel) { return data; };
- virtual void pet_bd_w(address_space &space, offs_t offset, UINT8 data, int &sel) { };
+ virtual uint8_t pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel) { return data; };
+ virtual void pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel) { };
virtual int pet_diag_r() { return 1; }
virtual void pet_irq_w(int state) { }
diff --git a/src/devices/bus/pet/hsg.cpp b/src/devices/bus/pet/hsg.cpp
index 3fa297e7a0d..765bd18b93a 100644
--- a/src/devices/bus/pet/hsg.cpp
+++ b/src/devices/bus/pet/hsg.cpp
@@ -149,7 +149,7 @@ machine_config_constructor cbm8000_hsg_b_t::device_mconfig_additions() const
// cbm8000_hsg_t - constructor
//-------------------------------------------------
-cbm8000_hsg_t::cbm8000_hsg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+cbm8000_hsg_t::cbm8000_hsg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_pet_expansion_card_interface(mconfig, *this),
m_gdc(*this, EF9365_TAG),
@@ -158,12 +158,12 @@ cbm8000_hsg_t::cbm8000_hsg_t(const machine_config &mconfig, device_type type, co
{
}
-cbm8000_hsg_a_t::cbm8000_hsg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm8000_hsg_a_t::cbm8000_hsg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
cbm8000_hsg_t(mconfig, CBM8000_HSG_A, "CBM 8000 High Speed Graphics (A)", tag, owner, clock, "cbm8000_hsg_a", __FILE__)
{
}
-cbm8000_hsg_b_t::cbm8000_hsg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cbm8000_hsg_b_t::cbm8000_hsg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
cbm8000_hsg_t(mconfig, CBM8000_HSG_B, "CBM 8000 High Speed Graphics (B)", tag, owner, clock, "cbm8000_hsg_b", __FILE__)
{
}
@@ -202,7 +202,7 @@ int cbm8000_hsg_t::pet_norom_r(address_space &space, offs_t offset, int sel)
// pet_bd_r - buffered data read
//-------------------------------------------------
-UINT8 cbm8000_hsg_t::pet_bd_r(address_space &space, offs_t offset, UINT8 data, int &sel)
+uint8_t cbm8000_hsg_t::pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel)
{
switch (sel)
{
@@ -251,7 +251,7 @@ UINT8 cbm8000_hsg_t::pet_bd_r(address_space &space, offs_t offset, UINT8 data, i
// pet_bd_w - buffered data write
//-------------------------------------------------
-void cbm8000_hsg_t::pet_bd_w(address_space &space, offs_t offset, UINT8 data, int &sel)
+void cbm8000_hsg_t::pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel)
{
if (offset == 0xaf00)
{
diff --git a/src/devices/bus/pet/hsg.h b/src/devices/bus/pet/hsg.h
index b706124a5f1..ffb0b6cc385 100644
--- a/src/devices/bus/pet/hsg.h
+++ b/src/devices/bus/pet/hsg.h
@@ -28,15 +28,15 @@ class cbm8000_hsg_t : public device_t,
{
public:
// construction/destruction
- cbm8000_hsg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ cbm8000_hsg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
// device_pet_expansion_card_interface overrides
virtual int pet_norom_r(address_space &space, offs_t offset, int sel) override;
- virtual UINT8 pet_bd_r(address_space &space, offs_t offset, UINT8 data, int &sel) override;
- virtual void pet_bd_w(address_space &space, offs_t offset, UINT8 data, int &sel) override;
+ virtual uint8_t pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel) override;
+ virtual void pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel) override;
protected:
// device-level overrides
@@ -56,7 +56,7 @@ class cbm8000_hsg_a_t : public cbm8000_hsg_t
{
public:
// construction/destruction
- cbm8000_hsg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm8000_hsg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -69,7 +69,7 @@ class cbm8000_hsg_b_t : public cbm8000_hsg_t
{
public:
// construction/destruction
- cbm8000_hsg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cbm8000_hsg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/pet/petuja.cpp b/src/devices/bus/pet/petuja.cpp
index fa1c2deea88..4e225712d2d 100644
--- a/src/devices/bus/pet/petuja.cpp
+++ b/src/devices/bus/pet/petuja.cpp
@@ -59,7 +59,7 @@ ioport_constructor pet_userport_joystick_adapter_device::device_input_ports() co
// pet_userport_joystick_adapter_device - constructor
//-------------------------------------------------
-pet_userport_joystick_adapter_device::pet_userport_joystick_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pet_userport_joystick_adapter_device::pet_userport_joystick_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PET_USERPORT_JOYSTICK_ADAPTER, "PET Userport Joystick Adapter", tag, owner, clock, "petuja", __FILE__),
device_pet_user_port_interface(mconfig, *this),
m_up1(1),
diff --git a/src/devices/bus/pet/petuja.h b/src/devices/bus/pet/petuja.h
index 720594e9561..0cb29c0c390 100644
--- a/src/devices/bus/pet/petuja.h
+++ b/src/devices/bus/pet/petuja.h
@@ -28,7 +28,7 @@ class pet_userport_joystick_adapter_device : public device_t,
{
public:
// construction/destruction
- pet_userport_joystick_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pet_userport_joystick_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/pet/superpet.cpp b/src/devices/bus/pet/superpet.cpp
index 174ade45079..7cefd6a1df3 100644
--- a/src/devices/bus/pet/superpet.cpp
+++ b/src/devices/bus/pet/superpet.cpp
@@ -174,7 +174,7 @@ inline bool superpet_device::is_ram_writable()
// superpet_device - constructor
//-------------------------------------------------
-superpet_device::superpet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+superpet_device::superpet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SUPERPET, "SuperPET", tag, owner, clock, "pet_superpet", __FILE__),
device_pet_expansion_card_interface(mconfig, *this),
m_maincpu(*this, M6809_TAG),
@@ -243,7 +243,7 @@ int superpet_device::pet_norom_r(address_space &space, offs_t offset, int sel)
// pet_bd_r - buffered data read
//-------------------------------------------------
-UINT8 superpet_device::pet_bd_r(address_space &space, offs_t offset, UINT8 data, int &sel)
+uint8_t superpet_device::pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel)
{
int norom = pet_norom_r(space, offset, sel);
@@ -304,7 +304,7 @@ UINT8 superpet_device::pet_bd_r(address_space &space, offs_t offset, UINT8 data,
// pet_bd_w - buffered data write
//-------------------------------------------------
-void superpet_device::pet_bd_w(address_space &space, offs_t offset, UINT8 data, int &sel)
+void superpet_device::pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel)
{
switch (sel)
{
diff --git a/src/devices/bus/pet/superpet.h b/src/devices/bus/pet/superpet.h
index 4ec50f0d906..74caac39d73 100644
--- a/src/devices/bus/pet/superpet.h
+++ b/src/devices/bus/pet/superpet.h
@@ -28,7 +28,7 @@ class superpet_device : public device_t,
{
public:
// construction/destruction
- superpet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ superpet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -46,8 +46,8 @@ protected:
// device_pet_expansion_card_interface overrides
virtual int pet_norom_r(address_space &space, offs_t offset, int sel) override;
- virtual UINT8 pet_bd_r(address_space &space, offs_t offset, UINT8 data, int &sel) override;
- virtual void pet_bd_w(address_space &space, offs_t offset, UINT8 data, int &sel) override;
+ virtual uint8_t pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel) override;
+ virtual void pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel) override;
virtual int pet_diag_r() override;
virtual void pet_irq_w(int state) override;
@@ -56,17 +56,17 @@ private:
required_device<mos6551_device> m_acia;
required_device<mos6702_device> m_dongle;
required_memory_region m_rom;
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
required_ioport m_io_sw1;
required_ioport m_io_sw2;
inline void update_cpu();
inline bool is_ram_writable();
- UINT8 m_system;
- UINT8 m_bank;
- UINT8 m_sw1;
- UINT8 m_sw2;
+ uint8_t m_system;
+ uint8_t m_bank;
+ uint8_t m_sw1;
+ uint8_t m_sw2;
int m_sel9_rom;
int m_pet_irq;
int m_acia_irq;
diff --git a/src/devices/bus/pet/user.cpp b/src/devices/bus/pet/user.cpp
index c79f9eec83a..dc1bc4e84b1 100644
--- a/src/devices/bus/pet/user.cpp
+++ b/src/devices/bus/pet/user.cpp
@@ -12,7 +12,7 @@
const device_type PET_USER_PORT = &device_creator<pet_user_port_device>;
-pet_user_port_device::pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pet_user_port_device::pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PET_USER_PORT, "PET user port", tag, owner, clock, "pet_user_port", __FILE__),
device_slot_interface(mconfig, *this),
m_2_handler(*this),
diff --git a/src/devices/bus/pet/user.h b/src/devices/bus/pet/user.h
index 6b402691b17..f85a3e876ad 100644
--- a/src/devices/bus/pet/user.h
+++ b/src/devices/bus/pet/user.h
@@ -101,7 +101,7 @@ class pet_user_port_device : public device_t,
friend class device_pet_user_port_interface;
public:
- pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_2_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_2_handler.set_callback(object); }
template<class _Object> static devcb_base &set_3_handler(device_t &device, _Object object) { return downcast<pet_user_port_device &>(device).m_3_handler.set_callback(object); }
diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp
index d456580f67a..84792e28c79 100644
--- a/src/devices/bus/plus4/c1551.cpp
+++ b/src/devices/bus/plus4/c1551.cpp
@@ -73,7 +73,7 @@ READ8_MEMBER( c1551_t::port_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// write protect sense
data |= !m_floppy->wpt_r() << 4;
@@ -161,7 +161,7 @@ WRITE8_MEMBER( c1551_t::tcbm_data_w )
READ8_MEMBER( c1551_t::tpi0_r )
{
- UINT8 data = m_tpi0->read(space, offset);
+ uint8_t data = m_tpi0->read(space, offset);
m_ga->ted_w(0);
m_ga->ted_w(1);
@@ -194,7 +194,7 @@ READ8_MEMBER( c1551_t::tpi0_pc_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// JP1
data |= m_jp1->read() << 5;
@@ -279,7 +279,7 @@ READ8_MEMBER( c1551_t::tpi1_pc_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
// TCBM acknowledge
data |= m_ack << 7;
@@ -413,7 +413,7 @@ ioport_constructor c1551_t::device_input_ports() const
// c1551_t - constructor
//-------------------------------------------------
-c1551_t::c1551_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+c1551_t::c1551_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, C1551, "C1551", tag, owner, clock, "c1551", __FILE__),
device_plus4_expansion_card_interface(mconfig, *this),
m_maincpu(*this, M6510T_TAG),
@@ -504,8 +504,8 @@ bool c1551_t::tpi1_selected(offs_t offset)
{
#ifdef PLA_DUMPED
int mux = 0, ras = 0, phi0 = 0, f7 = 0;
- UINT16 input = A5 << 15 | A6 << 14 | A7 << 13 | A8 << 12 | A9 << 11 | mux << 10 | A10 << 9 | m_dev << 8 | ras << 7 | phi0 << 6 | A15 << 5 | A14 << 4 | A13 << 3 | A12 << 2 | A11 << 1 | f7;
- UINT8 data = m_pla->read(input);
+ uint16_t input = A5 << 15 | A6 << 14 | A7 << 13 | A8 << 12 | A9 << 11 | mux << 10 | A10 << 9 | m_dev << 8 | ras << 7 | phi0 << 6 | A15 << 5 | A14 << 4 | A13 << 3 | A12 << 2 | A11 << 1 | f7;
+ uint8_t data = m_pla->read(input);
return BIT(data, 0) ? true : false;
#endif
@@ -524,7 +524,7 @@ bool c1551_t::tpi1_selected(offs_t offset)
// plus4_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 c1551_t::plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
+uint8_t c1551_t::plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
{
data = m_exp->cd_r(space, offset, data, ba, cs0, c1l, c2l, cs1, c1h, c2h);
@@ -541,7 +541,7 @@ UINT8 c1551_t::plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int b
// plus4_cd_w - cartridge data write
//-------------------------------------------------
-void c1551_t::plus4_cd_w(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
+void c1551_t::plus4_cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
{
if (tpi1_selected(offset))
{
diff --git a/src/devices/bus/plus4/c1551.h b/src/devices/bus/plus4/c1551.h
index 39fdd69b0df..86631adc691 100644
--- a/src/devices/bus/plus4/c1551.h
+++ b/src/devices/bus/plus4/c1551.h
@@ -31,7 +31,7 @@ class c1551_t : public device_t,
{
public:
// construction/destruction
- c1551_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c1551_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -61,8 +61,8 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
// device_plus4_expansion_card_interface overrides
- virtual UINT8 plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
- virtual void plus4_cd_w(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
+ virtual uint8_t plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
+ virtual void plus4_cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
private:
enum
@@ -83,7 +83,7 @@ private:
required_ioport m_jp1;
// TCBM bus
- UINT8 m_tcbm_data; // data
+ uint8_t m_tcbm_data; // data
int m_status; // status
int m_dav; // data valid
int m_ack; // acknowledge
diff --git a/src/devices/bus/plus4/diag264_lb_user.cpp b/src/devices/bus/plus4/diag264_lb_user.cpp
index 10d93e462e6..fc47373a2e1 100644
--- a/src/devices/bus/plus4/diag264_lb_user.cpp
+++ b/src/devices/bus/plus4/diag264_lb_user.cpp
@@ -26,7 +26,7 @@ const device_type DIAG264_USER_PORT_LOOPBACK = &device_creator<diag264_user_port
// diag264_user_port_loopback_device - constructor
//-------------------------------------------------
-diag264_user_port_loopback_device::diag264_user_port_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+diag264_user_port_loopback_device::diag264_user_port_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, DIAG264_USER_PORT_LOOPBACK, "Diag264 User Port Loopback", tag, owner, clock, "diag264_user_port_loopback", __FILE__),
device_pet_user_port_interface(mconfig, *this)
{
diff --git a/src/devices/bus/plus4/diag264_lb_user.h b/src/devices/bus/plus4/diag264_lb_user.h
index 6c4ecae22ad..b575d36f1a0 100644
--- a/src/devices/bus/plus4/diag264_lb_user.h
+++ b/src/devices/bus/plus4/diag264_lb_user.h
@@ -27,7 +27,7 @@ class diag264_user_port_loopback_device : public device_t,
{
public:
// construction/destruction
- diag264_user_port_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ diag264_user_port_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/plus4/exp.cpp b/src/devices/bus/plus4/exp.cpp
index e62a9a6cc58..ddfdb876d64 100644
--- a/src/devices/bus/plus4/exp.cpp
+++ b/src/devices/bus/plus4/exp.cpp
@@ -67,7 +67,7 @@ device_plus4_expansion_card_interface::~device_plus4_expansion_card_interface()
// plus4_expansion_slot_device - constructor
//-------------------------------------------------
-plus4_expansion_slot_device::plus4_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+plus4_expansion_slot_device::plus4_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PLUS4_EXPANSION_SLOT, "Expansion Port", tag, owner, clock, "plus4_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this),
@@ -155,7 +155,7 @@ std::string plus4_expansion_slot_device::get_default_card_software()
// cd_r - cartridge data read
//-------------------------------------------------
-UINT8 plus4_expansion_slot_device::cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
+uint8_t plus4_expansion_slot_device::cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
{
if (m_card != nullptr)
{
@@ -170,7 +170,7 @@ UINT8 plus4_expansion_slot_device::cd_r(address_space &space, offs_t offset, UIN
// cd_w - cartridge data write
//-------------------------------------------------
-void plus4_expansion_slot_device::cd_w(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
+void plus4_expansion_slot_device::cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
{
if (m_card != nullptr)
{
diff --git a/src/devices/bus/plus4/exp.h b/src/devices/bus/plus4/exp.h
index 2d18efaa207..ffd93be6974 100644
--- a/src/devices/bus/plus4/exp.h
+++ b/src/devices/bus/plus4/exp.h
@@ -95,7 +95,7 @@ class plus4_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- plus4_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ plus4_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<plus4_expansion_slot_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_cd_rd_callback(device_t &device, _Object object) { return downcast<plus4_expansion_slot_device &>(device).m_read_dma_cd.set_callback(object); }
@@ -103,8 +103,8 @@ public:
template<class _Object> static devcb_base &set_aec_wr_callback(device_t &device, _Object object) { return downcast<plus4_expansion_slot_device &>(device).m_write_aec.set_callback(object); }
// computer interface
- UINT8 cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h);
- void cd_w(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h);
+ uint8_t cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h);
+ void cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h);
// cartridge interface
DECLARE_READ8_MEMBER( dma_cd_r ) { return m_read_dma_cd(offset); }
@@ -157,14 +157,14 @@ public:
virtual ~device_plus4_expansion_card_interface();
// runtime
- virtual UINT8 plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) { return data; };
- virtual void plus4_cd_w(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) { };
+ virtual uint8_t plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) { return data; };
+ virtual void plus4_cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) { };
protected:
- optional_shared_ptr<UINT8> m_c1l;
- optional_shared_ptr<UINT8> m_c1h;
- optional_shared_ptr<UINT8> m_c2l;
- optional_shared_ptr<UINT8> m_c2h;
+ optional_shared_ptr<uint8_t> m_c1l;
+ optional_shared_ptr<uint8_t> m_c1h;
+ optional_shared_ptr<uint8_t> m_c2l;
+ optional_shared_ptr<uint8_t> m_c2h;
size_t m_c1l_mask;
size_t m_c1h_mask;
diff --git a/src/devices/bus/plus4/sid.cpp b/src/devices/bus/plus4/sid.cpp
index d5b72e2a0ea..61ae71a66fe 100644
--- a/src/devices/bus/plus4/sid.cpp
+++ b/src/devices/bus/plus4/sid.cpp
@@ -90,7 +90,7 @@ machine_config_constructor plus4_sid_cartridge_device::device_mconfig_additions(
// plus4_sid_cartridge_device - constructor
//-------------------------------------------------
-plus4_sid_cartridge_device::plus4_sid_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+plus4_sid_cartridge_device::plus4_sid_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PLUS4_SID, "Plus/4 SID cartridge", tag, owner, clock, "plus4_sid", __FILE__),
device_plus4_expansion_card_interface(mconfig, *this),
m_sid(*this, MOS8580_TAG),
@@ -122,7 +122,7 @@ void plus4_sid_cartridge_device::device_reset()
// plus4_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 plus4_sid_cartridge_device::plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
+uint8_t plus4_sid_cartridge_device::plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
{
if ((offset >= 0xfe80 && offset < 0xfea0) || (offset >= 0xfd40 && offset < 0xfd60))
{
@@ -141,7 +141,7 @@ UINT8 plus4_sid_cartridge_device::plus4_cd_r(address_space &space, offs_t offset
// plus4_cd_w - cartridge data write
//-------------------------------------------------
-void plus4_sid_cartridge_device::plus4_cd_w(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
+void plus4_sid_cartridge_device::plus4_cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
{
if ((offset >= 0xfe80 && offset < 0xfea0) || (offset >= 0xfd40 && offset < 0xfd60))
{
diff --git a/src/devices/bus/plus4/sid.h b/src/devices/bus/plus4/sid.h
index 2c9f59c98f2..c465b2be458 100644
--- a/src/devices/bus/plus4/sid.h
+++ b/src/devices/bus/plus4/sid.h
@@ -29,7 +29,7 @@ class plus4_sid_cartridge_device : public device_t,
{
public:
// construction/destruction
- plus4_sid_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ plus4_sid_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -41,8 +41,8 @@ protected:
virtual void device_reset() override;
// device_plus4_expansion_card_interface overrides
- virtual UINT8 plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
- virtual void plus4_cd_w(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
+ virtual uint8_t plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
+ virtual void plus4_cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
virtual void plus4_breset_w(int state);
private:
diff --git a/src/devices/bus/plus4/std.cpp b/src/devices/bus/plus4/std.cpp
index 8627f99cc30..3fdab218138 100644
--- a/src/devices/bus/plus4/std.cpp
+++ b/src/devices/bus/plus4/std.cpp
@@ -26,7 +26,7 @@ const device_type PLUS4_STD = &device_creator<plus4_standard_cartridge_device>;
// plus4_standard_cartridge_device - constructor
//-------------------------------------------------
-plus4_standard_cartridge_device::plus4_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+plus4_standard_cartridge_device::plus4_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PLUS4_STD, "Plus/4 standard cartridge", tag, owner, clock, "plus4_standard", __FILE__),
device_plus4_expansion_card_interface(mconfig, *this)
{
@@ -46,7 +46,7 @@ void plus4_standard_cartridge_device::device_start()
// plus4_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 plus4_standard_cartridge_device::plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
+uint8_t plus4_standard_cartridge_device::plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
{
if (!c1l && m_c1l.bytes())
{
diff --git a/src/devices/bus/plus4/std.h b/src/devices/bus/plus4/std.h
index 29fe1d16b13..f4cde993c40 100644
--- a/src/devices/bus/plus4/std.h
+++ b/src/devices/bus/plus4/std.h
@@ -27,14 +27,14 @@ class plus4_standard_cartridge_device : public device_t,
{
public:
// construction/destruction
- plus4_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ plus4_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_plus4_expansion_card_interface overrides
- virtual UINT8 plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
+ virtual uint8_t plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
};
diff --git a/src/devices/bus/pofo/ccm.cpp b/src/devices/bus/pofo/ccm.cpp
index a28f29c7637..2b2a3a13a94 100644
--- a/src/devices/bus/pofo/ccm.cpp
+++ b/src/devices/bus/pofo/ccm.cpp
@@ -44,7 +44,7 @@ device_portfolio_memory_card_slot_interface::device_portfolio_memory_card_slot_i
// portfolio_memory_card_slot_t - constructor
//-------------------------------------------------
-portfolio_memory_card_slot_t::portfolio_memory_card_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+portfolio_memory_card_slot_t::portfolio_memory_card_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PORTFOLIO_MEMORY_CARD_SLOT, "Atari Portfolio memory card port", tag, owner, clock, "portfolio_ccm_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this),
diff --git a/src/devices/bus/pofo/ccm.h b/src/devices/bus/pofo/ccm.h
index bba109912c4..b950225b82d 100644
--- a/src/devices/bus/pofo/ccm.h
+++ b/src/devices/bus/pofo/ccm.h
@@ -91,12 +91,12 @@ public:
virtual bool cdet() { return 1; }
- virtual UINT8 nrdi_r(address_space &space, offs_t offset) { return 0xff; };
- virtual void nwri_w(address_space &space, offs_t offset, UINT8 data) { };
+ virtual uint8_t nrdi_r(address_space &space, offs_t offset) { return 0xff; };
+ virtual void nwri_w(address_space &space, offs_t offset, uint8_t data) { };
protected:
- optional_shared_ptr<UINT8> m_rom;
- optional_shared_ptr<UINT8> m_nvram;
+ optional_shared_ptr<uint8_t> m_rom;
+ optional_shared_ptr<uint8_t> m_nvram;
portfolio_memory_card_slot_t *m_slot;
};
@@ -110,7 +110,7 @@ class portfolio_memory_card_slot_t : public device_t,
{
public:
// construction/destruction
- portfolio_memory_card_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ portfolio_memory_card_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~portfolio_memory_card_slot_t() { }
// computer interface
diff --git a/src/devices/bus/pofo/exp.cpp b/src/devices/bus/pofo/exp.cpp
index ce7adb0d1fb..68613967ff3 100644
--- a/src/devices/bus/pofo/exp.cpp
+++ b/src/devices/bus/pofo/exp.cpp
@@ -47,7 +47,7 @@ WRITE_LINE_MEMBER( device_portfolio_expansion_slot_interface::wake_w ) { m_slot-
// portfolio_expansion_slot_t - constructor
//-------------------------------------------------
-portfolio_expansion_slot_t::portfolio_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+portfolio_expansion_slot_t::portfolio_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PORTFOLIO_EXPANSION_SLOT, "Atari Portfolio expansion port", tag, owner, clock, "portfolio_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_write_iint(*this),
diff --git a/src/devices/bus/pofo/exp.h b/src/devices/bus/pofo/exp.h
index 81777cf9852..8bfabe9bf93 100644
--- a/src/devices/bus/pofo/exp.h
+++ b/src/devices/bus/pofo/exp.h
@@ -97,11 +97,11 @@ public:
virtual bool pdet() { return 0; }
virtual bool cdet() { return 1; }
- virtual UINT8 iack_r() { return 0xff; }
- virtual UINT8 eack_r() { return 0xff; }
+ virtual uint8_t iack_r() { return 0xff; }
+ virtual uint8_t eack_r() { return 0xff; }
- virtual UINT8 nrdi_r(address_space &space, offs_t offset, UINT8 data, bool iom, bool bcom, bool ncc1) { return data; };
- virtual void nwri_w(address_space &space, offs_t offset, UINT8 data, bool iom, bool bcom, bool ncc1) { };
+ virtual uint8_t nrdi_r(address_space &space, offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) { return data; };
+ virtual void nwri_w(address_space &space, offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) { };
DECLARE_WRITE_LINE_MEMBER( iint_w );
DECLARE_WRITE_LINE_MEMBER( eint_w );
@@ -120,7 +120,7 @@ class portfolio_expansion_slot_t : public device_t,
{
public:
// construction/destruction
- portfolio_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ portfolio_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~portfolio_expansion_slot_t() { }
template<class _Object> static devcb_base &set_iint_wr_callback(device_t &device, _Object object) { return downcast<portfolio_expansion_slot_t &>(device).m_write_iint.set_callback(object); }
@@ -133,11 +133,11 @@ public:
bool pdet_r() { return (m_card != nullptr) ? m_card->pdet() : 0; }
bool cdet_r() { return (m_card != nullptr) ? m_card->cdet() : 1; }
- UINT8 iack_r() { return (m_card != nullptr) ? m_card->iack_r() : 0xff; };
- UINT8 eack_r() { return (m_card != nullptr) ? m_card->eack_r() : 0xff; };
+ uint8_t iack_r() { return (m_card != nullptr) ? m_card->iack_r() : 0xff; };
+ uint8_t eack_r() { return (m_card != nullptr) ? m_card->eack_r() : 0xff; };
- UINT8 nrdi_r(address_space &space, offs_t offset, UINT8 data, bool iom, bool bcom, bool ncc1) { return (m_card != nullptr) ? m_card->nrdi_r(space, offset, data, iom, bcom, ncc1) : data; }
- void nwri_w(address_space &space, offs_t offset, UINT8 data, bool iom, bool bcom, bool ncc1) { if (m_card != nullptr) m_card->nwri_w(space, offset, data, iom, bcom, ncc1); }
+ uint8_t nrdi_r(address_space &space, offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) { return (m_card != nullptr) ? m_card->nrdi_r(space, offset, data, iom, bcom, ncc1) : data; }
+ void nwri_w(address_space &space, offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) { if (m_card != nullptr) m_card->nwri_w(space, offset, data, iom, bcom, ncc1); }
// peripheral interface
WRITE_LINE_MEMBER( iint_w ) { m_write_iint(state); }
diff --git a/src/devices/bus/pofo/hpc101.cpp b/src/devices/bus/pofo/hpc101.cpp
index b3286d2b0ef..78f97aa3d53 100644
--- a/src/devices/bus/pofo/hpc101.cpp
+++ b/src/devices/bus/pofo/hpc101.cpp
@@ -75,7 +75,7 @@ machine_config_constructor hpc101_t::device_mconfig_additions() const
// hpc101_t - constructor
//-------------------------------------------------
-hpc101_t::hpc101_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+hpc101_t::hpc101_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, HPC101, "Atari Portfolio HPC-101", tag, owner, clock, "hpc101", __FILE__),
device_portfolio_expansion_slot_interface(mconfig, *this),
m_ppi(*this, M82C55A_TAG)
@@ -106,7 +106,7 @@ void hpc101_t::device_reset()
// nrdi_r - read
//-------------------------------------------------
-UINT8 hpc101_t::nrdi_r(address_space &space, offs_t offset, UINT8 data, bool iom, bool bcom, bool ncc1)
+uint8_t hpc101_t::nrdi_r(address_space &space, offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1)
{
if (!bcom)
{
@@ -129,7 +129,7 @@ UINT8 hpc101_t::nrdi_r(address_space &space, offs_t offset, UINT8 data, bool iom
// nwri_w - write
//-------------------------------------------------
-void hpc101_t::nwri_w(address_space &space, offs_t offset, UINT8 data, bool iom, bool bcom, bool ncc1)
+void hpc101_t::nwri_w(address_space &space, offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1)
{
if (!bcom)
{
diff --git a/src/devices/bus/pofo/hpc101.h b/src/devices/bus/pofo/hpc101.h
index 7fbdd58a1a9..03a449d8112 100644
--- a/src/devices/bus/pofo/hpc101.h
+++ b/src/devices/bus/pofo/hpc101.h
@@ -29,7 +29,7 @@ class hpc101_t : public device_t,
{
public:
// construction/destruction
- hpc101_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hpc101_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -42,8 +42,8 @@ protected:
// device_portfolio_expansion_slot_interface overrides
bool pdet() override { return 1; }
- virtual UINT8 nrdi_r(address_space &space, offs_t offset, UINT8 data, bool iom, bool bcom, bool ncc1) override;
- virtual void nwri_w(address_space &space, offs_t offset, UINT8 data, bool iom, bool bcom, bool ncc1) override;
+ virtual uint8_t nrdi_r(address_space &space, offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) override;
+ virtual void nwri_w(address_space &space, offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) override;
private:
required_device<i8255_device> m_ppi;
diff --git a/src/devices/bus/pofo/hpc102.cpp b/src/devices/bus/pofo/hpc102.cpp
index 4ad13bd2308..5d9a13ce531 100644
--- a/src/devices/bus/pofo/hpc102.cpp
+++ b/src/devices/bus/pofo/hpc102.cpp
@@ -67,7 +67,7 @@ machine_config_constructor hpc102_t::device_mconfig_additions() const
// hpc102_t - constructor
//-------------------------------------------------
-hpc102_t::hpc102_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+hpc102_t::hpc102_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, HPC102, "Atari Portfolio HPC-102", tag, owner, clock, "hpc102", __FILE__),
device_portfolio_expansion_slot_interface(mconfig, *this),
m_uart(*this, M82C50A_TAG)
@@ -98,7 +98,7 @@ void hpc102_t::device_reset()
// eack_r - external interrupt acknowledge
//-------------------------------------------------
-UINT8 hpc102_t::eack_r()
+uint8_t hpc102_t::eack_r()
{
return m_vector;
}
@@ -108,7 +108,7 @@ UINT8 hpc102_t::eack_r()
// nrdi_r - read
//-------------------------------------------------
-UINT8 hpc102_t::nrdi_r(address_space &space, offs_t offset, UINT8 data, bool iom, bool bcom, bool ncc1)
+uint8_t hpc102_t::nrdi_r(address_space &space, offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1)
{
if (!bcom)
{
@@ -131,7 +131,7 @@ UINT8 hpc102_t::nrdi_r(address_space &space, offs_t offset, UINT8 data, bool iom
// nwri_w - write
//-------------------------------------------------
-void hpc102_t::nwri_w(address_space &space, offs_t offset, UINT8 data, bool iom, bool bcom, bool ncc1)
+void hpc102_t::nwri_w(address_space &space, offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1)
{
if (!bcom)
{
diff --git a/src/devices/bus/pofo/hpc102.h b/src/devices/bus/pofo/hpc102.h
index fc251b2e87b..baef3f4ec7d 100644
--- a/src/devices/bus/pofo/hpc102.h
+++ b/src/devices/bus/pofo/hpc102.h
@@ -29,7 +29,7 @@ class hpc102_t : public device_t,
{
public:
// construction/destruction
- hpc102_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hpc102_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -42,15 +42,15 @@ protected:
// device_portfolio_expansion_slot_interface overrides
bool pdet() override { return 1; }
- virtual UINT8 eack_r() override;
+ virtual uint8_t eack_r() override;
- virtual UINT8 nrdi_r(address_space &space, offs_t offset, UINT8 data, bool iom, bool bcom, bool ncc1) override;
- virtual void nwri_w(address_space &space, offs_t offset, UINT8 data, bool iom, bool bcom, bool ncc1) override;
+ virtual uint8_t nrdi_r(address_space &space, offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) override;
+ virtual void nwri_w(address_space &space, offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) override;
private:
required_device<ins8250_device> m_uart;
- UINT8 m_vector;
+ uint8_t m_vector;
};
diff --git a/src/devices/bus/pofo/hpc104.cpp b/src/devices/bus/pofo/hpc104.cpp
index 9a2cfa6b8cc..03c982f792e 100644
--- a/src/devices/bus/pofo/hpc104.cpp
+++ b/src/devices/bus/pofo/hpc104.cpp
@@ -105,7 +105,7 @@ ioport_constructor hpc104_2_t::device_input_ports() const
// hpc104_t - constructor
//-------------------------------------------------
-hpc104_t::hpc104_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+hpc104_t::hpc104_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_portfolio_expansion_slot_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -116,7 +116,7 @@ hpc104_t::hpc104_t(const machine_config &mconfig, device_type type, const char *
{
}
-hpc104_t::hpc104_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+hpc104_t::hpc104_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, HPC104, "Atari Portfolio HPC-104", tag, owner, clock, "hpc104", __FILE__),
device_portfolio_expansion_slot_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -132,7 +132,7 @@ hpc104_t::hpc104_t(const machine_config &mconfig, const char *tag, device_t *own
// hpc104_2_t - constructor
//-------------------------------------------------
-hpc104_2_t::hpc104_2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+hpc104_2_t::hpc104_2_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
hpc104_t(mconfig, HPC104_2, "Atari Portfolio HPC-104 (Unit 2)", tag, owner, clock, "hpc104_2", __FILE__) { }
@@ -161,7 +161,7 @@ void hpc104_t::device_reset()
// nrdi_r - read
//-------------------------------------------------
-UINT8 hpc104_t::nrdi_r(address_space &space, offs_t offset, UINT8 data, bool iom, bool bcom, bool ncc1)
+uint8_t hpc104_t::nrdi_r(address_space &space, offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1)
{
data = m_exp->nrdi_r(space, offset, data, iom, bcom, m_ncc1_out || ncc1);
@@ -198,7 +198,7 @@ UINT8 hpc104_t::nrdi_r(address_space &space, offs_t offset, UINT8 data, bool iom
// nwri_w - write
//-------------------------------------------------
-void hpc104_t::nwri_w(address_space &space, offs_t offset, UINT8 data, bool iom, bool bcom, bool ncc1)
+void hpc104_t::nwri_w(address_space &space, offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1)
{
m_exp->nwri_w(space, offset, data, iom, bcom, m_ncc1_out || ncc1);
diff --git a/src/devices/bus/pofo/hpc104.h b/src/devices/bus/pofo/hpc104.h
index 9d930c21347..9dda5f9778b 100644
--- a/src/devices/bus/pofo/hpc104.h
+++ b/src/devices/bus/pofo/hpc104.h
@@ -30,8 +30,8 @@ class hpc104_t : public device_t,
{
public:
// construction/destruction
- hpc104_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- hpc104_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hpc104_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ hpc104_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -50,13 +50,13 @@ protected:
// device_portfolio_expansion_slot_interface overrides
virtual bool nmd1() override { return m_ccm->cdet_r(); }
- virtual UINT8 nrdi_r(address_space &space, offs_t offset, UINT8 data, bool iom, bool bcom, bool ncc1) override;
- virtual void nwri_w(address_space &space, offs_t offset, UINT8 data, bool iom, bool bcom, bool ncc1) override;
+ virtual uint8_t nrdi_r(address_space &space, offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) override;
+ virtual void nwri_w(address_space &space, offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) override;
private:
required_device<portfolio_memory_card_slot_t> m_ccm;
required_device<portfolio_expansion_slot_t> m_exp;
- optional_shared_ptr<UINT8> m_nvram;
+ optional_shared_ptr<uint8_t> m_nvram;
required_ioport m_io_sw1;
bool m_sw1;
@@ -70,7 +70,7 @@ class hpc104_2_t : public hpc104_t
{
public:
// construction/destruction
- hpc104_2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hpc104_2_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/pofo/ram.cpp b/src/devices/bus/pofo/ram.cpp
index e1fdce1b7ad..b4f9cce087e 100644
--- a/src/devices/bus/pofo/ram.cpp
+++ b/src/devices/bus/pofo/ram.cpp
@@ -25,7 +25,7 @@ const device_type PORTFOLIO_RAM_CARD = &device_creator<portfolio_ram_card_t>;
// portfolio_ram_card_t - constructor
//-------------------------------------------------
-portfolio_ram_card_t::portfolio_ram_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+portfolio_ram_card_t::portfolio_ram_card_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PORTFOLIO_RAM_CARD, "Atari Portfolio RAM card", tag, owner, clock, "portfolio_ram_card", __FILE__),
device_portfolio_memory_card_slot_interface(mconfig, *this),
device_nvram_interface(mconfig, *this)
@@ -47,7 +47,7 @@ void portfolio_ram_card_t::device_start()
// nrdi_r - read
//-------------------------------------------------
-UINT8 portfolio_ram_card_t::nrdi_r(address_space &space, offs_t offset)
+uint8_t portfolio_ram_card_t::nrdi_r(address_space &space, offs_t offset)
{
return m_nvram[offset];
}
@@ -57,7 +57,7 @@ UINT8 portfolio_ram_card_t::nrdi_r(address_space &space, offs_t offset)
// nwri_w - write
//-------------------------------------------------
-void portfolio_ram_card_t::nwri_w(address_space &space, offs_t offset, UINT8 data)
+void portfolio_ram_card_t::nwri_w(address_space &space, offs_t offset, uint8_t data)
{
m_nvram[offset] = data;
}
diff --git a/src/devices/bus/pofo/ram.h b/src/devices/bus/pofo/ram.h
index 2bf6bed60f0..2b0cf2722ba 100644
--- a/src/devices/bus/pofo/ram.h
+++ b/src/devices/bus/pofo/ram.h
@@ -29,7 +29,7 @@ class portfolio_ram_card_t : public device_t,
{
public:
// construction/destruction
- portfolio_ram_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ portfolio_ram_card_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -43,8 +43,8 @@ protected:
// device_portfolio_memory_card_slot_interface overrides
virtual bool cdet() override { return 0; }
- virtual UINT8 nrdi_r(address_space &space, offs_t offset) override;
- virtual void nwri_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t nrdi_r(address_space &space, offs_t offset) override;
+ virtual void nwri_w(address_space &space, offs_t offset, uint8_t data) override;
};
diff --git a/src/devices/bus/pofo/rom.cpp b/src/devices/bus/pofo/rom.cpp
index fbc4c5961b5..3b182f4eb32 100644
--- a/src/devices/bus/pofo/rom.cpp
+++ b/src/devices/bus/pofo/rom.cpp
@@ -25,7 +25,7 @@ const device_type PORTFOLIO_ROM_CARD = &device_creator<portfolio_rom_card_t>;
// portfolio_rom_card_t - constructor
//-------------------------------------------------
-portfolio_rom_card_t::portfolio_rom_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+portfolio_rom_card_t::portfolio_rom_card_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PORTFOLIO_ROM_CARD, "Atari Portfolio ROM card", tag, owner, clock, "portfolio_rom_card", __FILE__),
device_portfolio_memory_card_slot_interface(mconfig, *this)
{
@@ -45,7 +45,7 @@ void portfolio_rom_card_t::device_start()
// nrdi_r - read
//-------------------------------------------------
-UINT8 portfolio_rom_card_t::nrdi_r(address_space &space, offs_t offset)
+uint8_t portfolio_rom_card_t::nrdi_r(address_space &space, offs_t offset)
{
return m_rom[offset];
}
diff --git a/src/devices/bus/pofo/rom.h b/src/devices/bus/pofo/rom.h
index 6ee7a1ffd04..65f1c3e28d7 100644
--- a/src/devices/bus/pofo/rom.h
+++ b/src/devices/bus/pofo/rom.h
@@ -27,7 +27,7 @@ class portfolio_rom_card_t : public device_t,
{
public:
// construction/destruction
- portfolio_rom_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ portfolio_rom_card_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -36,7 +36,7 @@ protected:
// device_portfolio_memory_card_slot_interface overrides
virtual bool cdet() override { return 0; }
- virtual UINT8 nrdi_r(address_space &space, offs_t offset) override;
+ virtual uint8_t nrdi_r(address_space &space, offs_t offset) override;
};
diff --git a/src/devices/bus/psx/analogue.cpp b/src/devices/bus/psx/analogue.cpp
index 69d980e5843..aa4cb65e88f 100644
--- a/src/devices/bus/psx/analogue.cpp
+++ b/src/devices/bus/psx/analogue.cpp
@@ -5,7 +5,7 @@
const device_type PSX_ANALOG_JOYSTICK = &device_creator<psx_analog_joystick_device>;
const device_type PSX_DUALSHOCK = &device_creator<psx_dualshock_device>;
-psx_analog_controller_device::psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+psx_analog_controller_device::psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_psx_controller_interface(mconfig, *this),
m_type(),
@@ -23,13 +23,13 @@ psx_analog_controller_device::psx_analog_controller_device(const machine_config
{
}
-psx_dualshock_device::psx_dualshock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+psx_dualshock_device::psx_dualshock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
psx_analog_controller_device(mconfig, PSX_DUALSHOCK, "Playstation Dualshock Pad", tag, owner, clock, "psx_dualshock_pad", __FILE__)
{
m_type = DUALSHOCK;
}
-psx_analog_joystick_device::psx_analog_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+psx_analog_joystick_device::psx_analog_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
psx_analog_controller_device(mconfig, PSX_ANALOG_JOYSTICK, "Playstation Analog Joystick", tag, owner, clock, "psx_analog_joystick", __FILE__)
{
m_type = JOYSTICK;
@@ -44,9 +44,9 @@ void psx_analog_controller_device::device_reset()
m_cmd = 0;
}
-UINT8 psx_analog_controller_device::pad_data(int count, bool analog)
+uint8_t psx_analog_controller_device::pad_data(int count, bool analog)
{
- UINT8 data = 0;
+ uint8_t data = 0;
switch(count)
{
case 2:
@@ -73,7 +73,7 @@ UINT8 psx_analog_controller_device::pad_data(int count, bool analog)
return data;
}
-bool psx_analog_controller_device::get_pad(int count, UINT8 *odata, UINT8 idata)
+bool psx_analog_controller_device::get_pad(int count, uint8_t *odata, uint8_t idata)
{
if(m_confmode)
{
@@ -116,7 +116,7 @@ bool psx_analog_controller_device::get_pad(int count, UINT8 *odata, UINT8 idata)
break;
case 0x45: // get mode ?
{
- const UINT8 val[] = { 1, 2, 0, 2, 1, 0 };
+ const uint8_t val[] = { 1, 2, 0, 2, 1, 0 };
if(count == 4)
*odata = m_analogmode;
else
@@ -125,7 +125,7 @@ bool psx_analog_controller_device::get_pad(int count, UINT8 *odata, UINT8 idata)
}
case 0x46: // query act (vibrate) ?
{
- const UINT8 val[2][6] = {{ 0, 0, 1, 2, 0, 10 },
+ const uint8_t val[2][6] = {{ 0, 0, 1, 2, 0, 10 },
{ 0, 0, 1, 1, 1, 14 }};
*odata = val[m_temp][count-2];
if(count == 3)
@@ -134,7 +134,7 @@ bool psx_analog_controller_device::get_pad(int count, UINT8 *odata, UINT8 idata)
}
case 0x47: // query comb (combination?) ?
{
- const UINT8 val[] = { 0, 0, 2, 0, 1, 0 };
+ const uint8_t val[] = { 0, 0, 2, 0, 1, 0 };
*odata = val[count-2];
break;
}
diff --git a/src/devices/bus/psx/analogue.h b/src/devices/bus/psx/analogue.h
index 9fab90f3625..4a52a0cb80e 100644
--- a/src/devices/bus/psx/analogue.h
+++ b/src/devices/bus/psx/analogue.h
@@ -12,7 +12,7 @@ class psx_analog_controller_device : public device_t,
public device_psx_controller_interface
{
public:
- psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual ioport_constructor device_input_ports() const override;
DECLARE_INPUT_CHANGED_MEMBER(change_mode);
@@ -24,15 +24,15 @@ protected:
DUALSHOCK
} m_type;
private:
- virtual bool get_pad(int count, UINT8 *odata, UINT8 idata) override;
- UINT8 pad_data(int count, bool analog);
+ virtual bool get_pad(int count, uint8_t *odata, uint8_t idata) override;
+ uint8_t pad_data(int count, bool analog);
bool m_confmode;
bool m_analogmode;
bool m_analoglock;
- UINT8 m_temp;
- UINT8 m_cmd;
+ uint8_t m_temp;
+ uint8_t m_cmd;
required_ioport m_pad0;
required_ioport m_pad1;
@@ -45,13 +45,13 @@ private:
class psx_dualshock_device : public psx_analog_controller_device
{
public:
- psx_dualshock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psx_dualshock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class psx_analog_joystick_device : public psx_analog_controller_device
{
public:
- psx_analog_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psx_analog_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
#endif /* PSXANALOG_H_ */
diff --git a/src/devices/bus/psx/ctlrport.cpp b/src/devices/bus/psx/ctlrport.cpp
index 5f84e482b4d..dfbfca0ef48 100644
--- a/src/devices/bus/psx/ctlrport.cpp
+++ b/src/devices/bus/psx/ctlrport.cpp
@@ -8,7 +8,7 @@
const device_type PSX_CONTROLLER_PORT = &device_creator<psx_controller_port_device>;
-psx_controller_port_device::psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+psx_controller_port_device::psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PSX_CONTROLLER_PORT, "Playstation Controller Port", tag, owner, clock, "psx_controller_port", __FILE__),
device_slot_interface(mconfig, *this),
m_tx(false),
@@ -41,7 +41,7 @@ void psx_controller_port_device::disable_card(bool state)
const device_type PSXCONTROLLERPORTS = &device_creator<psxcontrollerports_device>;
-psxcontrollerports_device::psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+psxcontrollerports_device::psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, PSXCONTROLLERPORTS, "PSXCONTROLLERPORTS", tag, owner, clock, "psxcontrollerports", __FILE__), m_port0(nullptr), m_port1(nullptr),
m_dsr_handler(*this),
m_rxd_handler(*this)
@@ -173,7 +173,7 @@ void device_psx_controller_interface::sel_w(bool state) {
const device_type PSX_STANDARD_CONTROLLER = &device_creator<psx_standard_controller_device>;
-psx_standard_controller_device::psx_standard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+psx_standard_controller_device::psx_standard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PSX_STANDARD_CONTROLLER, "Playstation Standard Controller", tag, owner, clock, "psx_standard_controller", __FILE__),
device_psx_controller_interface(mconfig, *this),
m_pad0(*this,"PSXPAD0"),
@@ -181,7 +181,7 @@ psx_standard_controller_device::psx_standard_controller_device(const machine_con
{
}
-bool psx_standard_controller_device::get_pad(int count, UINT8 *odata, UINT8 idata)
+bool psx_standard_controller_device::get_pad(int count, uint8_t *odata, uint8_t idata)
{
switch(count)
{
diff --git a/src/devices/bus/psx/ctlrport.h b/src/devices/bus/psx/ctlrport.h
index 09f1b947eab..24a72de1439 100644
--- a/src/devices/bus/psx/ctlrport.h
+++ b/src/devices/bus/psx/ctlrport.h
@@ -43,12 +43,12 @@ protected:
};
private:
- virtual bool get_pad(int count, UINT8 *odata, UINT8 idata) = 0;
+ virtual bool get_pad(int count, uint8_t *odata, uint8_t idata) = 0;
virtual void do_pad();
void ack_timer(void *ptr, int param);
- UINT8 m_odata;
- UINT8 m_idata;
+ uint8_t m_odata;
+ uint8_t m_idata;
int m_bit;
int m_count;
bool m_memcard;
@@ -66,14 +66,14 @@ class psx_standard_controller_device : public device_t,
public device_psx_controller_interface
{
public:
- psx_standard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psx_standard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
protected:
virtual void device_start() override { }
private:
- virtual bool get_pad(int count, UINT8 *odata, UINT8 idata) override;
+ virtual bool get_pad(int count, uint8_t *odata, uint8_t idata) override;
required_ioport m_pad0;
required_ioport m_pad1;
@@ -88,7 +88,7 @@ private:
class psxcontrollerports_device : public device_t
{
public:
- psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void ack();
template<class _Object> static devcb_base &set_dsr_handler(device_t &device, _Object object) { return downcast<psxcontrollerports_device &>(device).m_dsr_handler.set_callback(object); }
@@ -113,7 +113,7 @@ class psx_controller_port_device : public device_t,
public device_slot_interface
{
public:
- psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
typedef delegate<void ()> void_cb;
diff --git a/src/devices/bus/psx/memcard.cpp b/src/devices/bus/psx/memcard.cpp
index 0b0a33a8856..50d36d19a9b 100644
--- a/src/devices/bus/psx/memcard.cpp
+++ b/src/devices/bus/psx/memcard.cpp
@@ -41,7 +41,7 @@ enum transfer_states
state_end
};
-psxcard_device::psxcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+psxcard_device::psxcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, PSXCARD, "Sony PSX Memory Card", tag, owner, clock, "psxcard", __FILE__),
device_image_interface(mconfig, *this),
pkt_ptr(0),
@@ -113,7 +113,7 @@ void psxcard_device::device_config_complete()
//
//
-bool psxcard_device::transfer(UINT8 to, UINT8 *from)
+bool psxcard_device::transfer(uint8_t to, uint8_t *from)
{
bool ret=true;
@@ -315,7 +315,7 @@ image_init_result psxcard_device::call_load()
image_init_result psxcard_device::call_create(int format_type, util::option_resolution *format_options)
{
- UINT8 block[block_size];
+ uint8_t block[block_size];
int i, ret;
if(m_disabled)
diff --git a/src/devices/bus/psx/memcard.h b/src/devices/bus/psx/memcard.h
index eaea4ae5928..2a6f3d3e528 100644
--- a/src/devices/bus/psx/memcard.h
+++ b/src/devices/bus/psx/memcard.h
@@ -16,7 +16,7 @@ class psxcard_device : public device_t,
public device_image_interface
{
public:
- psxcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psxcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual iodevice_t image_type() const override { return IO_MEMCARD; }
@@ -38,8 +38,8 @@ private:
int state;
bool m_disabled;
- UINT8 m_odata;
- UINT8 m_idata;
+ uint8_t m_odata;
+ uint8_t m_idata;
int m_bit;
int m_count;
bool m_pad;
@@ -56,7 +56,7 @@ private:
void write_card(const unsigned short addr, unsigned char *buf);
unsigned char checksum_data(const unsigned char *buf, const unsigned int sz);
void do_card();
- bool transfer(UINT8 to, UINT8 *from);
+ bool transfer(uint8_t to, uint8_t *from);
void ack_timer(void *ptr, int param);
public:
diff --git a/src/devices/bus/psx/multitap.cpp b/src/devices/bus/psx/multitap.cpp
index 51cfd5948ab..e71e6175dd7 100644
--- a/src/devices/bus/psx/multitap.cpp
+++ b/src/devices/bus/psx/multitap.cpp
@@ -6,7 +6,7 @@
const device_type PSX_MULTITAP = &device_creator<psx_multitap_device>;
-psx_multitap_device::psx_multitap_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) :
+psx_multitap_device::psx_multitap_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) :
device_t(mconfig, PSX_MULTITAP, "Playstation Multitap", tag, owner, clock, "psx_multitap", __FILE__),
device_psx_controller_interface(mconfig, *this),
m_activeport(0),
@@ -235,7 +235,7 @@ void psx_multitap_device::do_pad()
m_count++;
}
-bool psx_multitap_device::get_pad(int count, UINT8 *odata, UINT8 idata)
+bool psx_multitap_device::get_pad(int count, uint8_t *odata, uint8_t idata)
{
if(!count)
*odata = 0x80;
diff --git a/src/devices/bus/psx/multitap.h b/src/devices/bus/psx/multitap.h
index 160b0de6b5d..c826edef8c3 100644
--- a/src/devices/bus/psx/multitap.h
+++ b/src/devices/bus/psx/multitap.h
@@ -11,7 +11,7 @@ class psx_multitap_device : public device_t,
public device_psx_controller_interface
{
public:
- psx_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ psx_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
protected:
@@ -22,7 +22,7 @@ protected:
virtual void interface_pre_reset() override;
private:
- virtual bool get_pad(int count, UINT8 *odata, UINT8 idata) override;
+ virtual bool get_pad(int count, uint8_t *odata, uint8_t idata) override;
virtual void do_pad() override;
void ack();
void set_tx_line(bool tx, int port);
@@ -31,7 +31,7 @@ private:
int m_activeport;
bool m_cack[4];
bool m_singlemode, m_nextmode, m_tapmc;
- UINT8 m_data[3][8]; // port a is passed though
+ uint8_t m_data[3][8]; // port a is passed though
required_device<psx_controller_port_device> m_porta;
required_device<psx_controller_port_device> m_portb;
required_device<psx_controller_port_device> m_portc;
diff --git a/src/devices/bus/ql/cst_q_plus4.cpp b/src/devices/bus/ql/cst_q_plus4.cpp
index 27273687d65..d7a58306ef4 100644
--- a/src/devices/bus/ql/cst_q_plus4.cpp
+++ b/src/devices/bus/ql/cst_q_plus4.cpp
@@ -86,7 +86,7 @@ machine_config_constructor cst_q_plus4_t::device_mconfig_additions() const
// cst_q_plus4_t - constructor
//-------------------------------------------------
-cst_q_plus4_t::cst_q_plus4_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cst_q_plus4_t::cst_q_plus4_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CST_Q_PLUS4, "CST Q+4", tag, owner, clock, "ql_qplus4", __FILE__),
device_ql_expansion_card_interface(mconfig, *this),
m_exp1(*this, "exp1"),
@@ -115,7 +115,7 @@ void cst_q_plus4_t::device_start()
// read -
//-------------------------------------------------
-UINT8 cst_q_plus4_t::read(address_space &space, offs_t offset, UINT8 data)
+uint8_t cst_q_plus4_t::read(address_space &space, offs_t offset, uint8_t data)
{
if (offset >= 0xc000 && offset < 0xc200)
{
@@ -135,7 +135,7 @@ UINT8 cst_q_plus4_t::read(address_space &space, offs_t offset, UINT8 data)
// write -
//-------------------------------------------------
-void cst_q_plus4_t::write(address_space &space, offs_t offset, UINT8 data)
+void cst_q_plus4_t::write(address_space &space, offs_t offset, uint8_t data)
{
m_exp1->write(space, offset, data);
m_exp2->write(space, offset, data);
diff --git a/src/devices/bus/ql/cst_q_plus4.h b/src/devices/bus/ql/cst_q_plus4.h
index 691e1b24281..8ac923d3856 100644
--- a/src/devices/bus/ql/cst_q_plus4.h
+++ b/src/devices/bus/ql/cst_q_plus4.h
@@ -27,7 +27,7 @@ class cst_q_plus4_t : public device_t,
{
public:
// construction/destruction
- cst_q_plus4_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cst_q_plus4_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -43,8 +43,8 @@ protected:
virtual void device_start() override;
// device_ql_expansion_card_interface overrides
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override;
- virtual void write(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void write(address_space &space, offs_t offset, uint8_t data) override;
private:
void update_extintl() { m_slot->extintl_w(m_exp1_extinl || m_exp2_extinl || m_exp3_extinl || m_exp4_extinl); }
diff --git a/src/devices/bus/ql/cst_qdisc.cpp b/src/devices/bus/ql/cst_qdisc.cpp
index 8ba128b3d9b..1667c3e4a8f 100644
--- a/src/devices/bus/ql/cst_qdisc.cpp
+++ b/src/devices/bus/ql/cst_qdisc.cpp
@@ -50,7 +50,7 @@ const tiny_rom_entry *cst_ql_disc_interface_t::device_rom_region() const
// cst_ql_disc_interface_t - constructor
//-------------------------------------------------
-cst_ql_disc_interface_t::cst_ql_disc_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cst_ql_disc_interface_t::cst_ql_disc_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CST_QL_DISC_INTERFACE, "CST QL Disc Interface", tag, owner, clock, "ql_qdisc", __FILE__),
device_ql_expansion_card_interface(mconfig, *this)
{
@@ -70,7 +70,7 @@ void cst_ql_disc_interface_t::device_start()
// read -
//-------------------------------------------------
-UINT8 cst_ql_disc_interface_t::read(address_space &space, offs_t offset, UINT8 data)
+uint8_t cst_ql_disc_interface_t::read(address_space &space, offs_t offset, uint8_t data)
{
return data;
}
@@ -80,6 +80,6 @@ UINT8 cst_ql_disc_interface_t::read(address_space &space, offs_t offset, UINT8 d
// write -
//-------------------------------------------------
-void cst_ql_disc_interface_t::write(address_space &space, offs_t offset, UINT8 data)
+void cst_ql_disc_interface_t::write(address_space &space, offs_t offset, uint8_t data)
{
}
diff --git a/src/devices/bus/ql/cst_qdisc.h b/src/devices/bus/ql/cst_qdisc.h
index c272f345b6b..fc156e4a6b9 100644
--- a/src/devices/bus/ql/cst_qdisc.h
+++ b/src/devices/bus/ql/cst_qdisc.h
@@ -26,7 +26,7 @@ class cst_ql_disc_interface_t : public device_t,
{
public:
// construction/destruction
- cst_ql_disc_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cst_ql_disc_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -36,8 +36,8 @@ protected:
virtual void device_start() override;
// device_ql_expansion_card_interface overrides
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override;
- virtual void write(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void write(address_space &space, offs_t offset, uint8_t data) override;
};
diff --git a/src/devices/bus/ql/cumana_fdi.cpp b/src/devices/bus/ql/cumana_fdi.cpp
index ed868f985e2..bcc7e4b077e 100644
--- a/src/devices/bus/ql/cumana_fdi.cpp
+++ b/src/devices/bus/ql/cumana_fdi.cpp
@@ -50,7 +50,7 @@ const tiny_rom_entry *cumana_floppy_disk_interface_t::device_rom_region() const
// cumana_floppy_disk_interface_t - constructor
//-------------------------------------------------
-cumana_floppy_disk_interface_t::cumana_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+cumana_floppy_disk_interface_t::cumana_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, CUMANA_FLOPPY_DISK_INTERFACE, "Cumana Floppy Disk Interface", tag, owner, clock, "ql_cumanafdi", __FILE__),
device_ql_expansion_card_interface(mconfig, *this)
{
@@ -70,7 +70,7 @@ void cumana_floppy_disk_interface_t::device_start()
// read -
//-------------------------------------------------
-UINT8 cumana_floppy_disk_interface_t::read(address_space &space, offs_t offset, UINT8 data)
+uint8_t cumana_floppy_disk_interface_t::read(address_space &space, offs_t offset, uint8_t data)
{
return data;
}
@@ -80,6 +80,6 @@ UINT8 cumana_floppy_disk_interface_t::read(address_space &space, offs_t offset,
// write -
//-------------------------------------------------
-void cumana_floppy_disk_interface_t::write(address_space &space, offs_t offset, UINT8 data)
+void cumana_floppy_disk_interface_t::write(address_space &space, offs_t offset, uint8_t data)
{
}
diff --git a/src/devices/bus/ql/cumana_fdi.h b/src/devices/bus/ql/cumana_fdi.h
index 4425560d604..2531735cb2c 100644
--- a/src/devices/bus/ql/cumana_fdi.h
+++ b/src/devices/bus/ql/cumana_fdi.h
@@ -26,7 +26,7 @@ class cumana_floppy_disk_interface_t : public device_t,
{
public:
// construction/destruction
- cumana_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ cumana_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -36,8 +36,8 @@ protected:
virtual void device_start() override;
// device_ql_expansion_card_interface overrides
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override;
- virtual void write(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void write(address_space &space, offs_t offset, uint8_t data) override;
};
diff --git a/src/devices/bus/ql/exp.cpp b/src/devices/bus/ql/exp.cpp
index 92a5580334d..8b40250ca07 100644
--- a/src/devices/bus/ql/exp.cpp
+++ b/src/devices/bus/ql/exp.cpp
@@ -43,7 +43,7 @@ device_ql_expansion_card_interface::device_ql_expansion_card_interface(const mac
// ql_expansion_slot_t - constructor
//-------------------------------------------------
-ql_expansion_slot_t::ql_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ql_expansion_slot_t::ql_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, QL_EXPANSION_SLOT, "QL expansion port", tag, owner, clock, "ql_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_write_ipl0l(*this),
diff --git a/src/devices/bus/ql/exp.h b/src/devices/bus/ql/exp.h
index e4b259b475c..c65b84f0eff 100644
--- a/src/devices/bus/ql/exp.h
+++ b/src/devices/bus/ql/exp.h
@@ -91,8 +91,8 @@ public:
device_ql_expansion_card_interface(const machine_config &mconfig, device_t &device);
virtual void romoeh_w(int state) { m_romoeh = state; }
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) { return data; }
- virtual void write(address_space &space, offs_t offset, UINT8 data) { }
+ virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) { return data; }
+ virtual void write(address_space &space, offs_t offset, uint8_t data) { }
protected:
ql_expansion_slot_t *m_slot;
@@ -108,7 +108,7 @@ class ql_expansion_slot_t : public device_t,
{
public:
// construction/destruction
- ql_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ql_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_ipl0l_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_ipl0l.set_callback(object); }
template<class _Object> static devcb_base &set_ipl1l_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_ipl1l.set_callback(object); }
@@ -116,8 +116,8 @@ public:
template<class _Object> static devcb_base &set_extintl_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_extintl.set_callback(object); }
// computer interface
- UINT8 read(address_space &space, offs_t offset, UINT8 data) { if (m_card) data = m_card->read(space, offset, data); return data; }
- void write(address_space &space, offs_t offset, UINT8 data) { if (m_card) m_card->write(space, offset, data); }
+ uint8_t read(address_space &space, offs_t offset, uint8_t data) { if (m_card) data = m_card->read(space, offset, data); return data; }
+ void write(address_space &space, offs_t offset, uint8_t data) { if (m_card) m_card->write(space, offset, data); }
DECLARE_WRITE_LINE_MEMBER( romoeh_w ) { if (m_card) m_card->romoeh_w(state); }
// card interface
diff --git a/src/devices/bus/ql/kempston_di.cpp b/src/devices/bus/ql/kempston_di.cpp
index de6c30ac2e8..70cfda102e9 100644
--- a/src/devices/bus/ql/kempston_di.cpp
+++ b/src/devices/bus/ql/kempston_di.cpp
@@ -48,7 +48,7 @@ const tiny_rom_entry *kempston_disk_interface_t::device_rom_region() const
// kempston_disk_interface_t - constructor
//-------------------------------------------------
-kempston_disk_interface_t::kempston_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+kempston_disk_interface_t::kempston_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, KEMPSTON_DISK_INTERFACE, "Kempston Disk Interface", tag, owner, clock, "ql_kdi", __FILE__),
device_ql_expansion_card_interface(mconfig, *this)
{
@@ -68,7 +68,7 @@ void kempston_disk_interface_t::device_start()
// read -
//-------------------------------------------------
-UINT8 kempston_disk_interface_t::read(address_space &space, offs_t offset, UINT8 data)
+uint8_t kempston_disk_interface_t::read(address_space &space, offs_t offset, uint8_t data)
{
return data;
}
@@ -78,6 +78,6 @@ UINT8 kempston_disk_interface_t::read(address_space &space, offs_t offset, UINT8
// write -
//-------------------------------------------------
-void kempston_disk_interface_t::write(address_space &space, offs_t offset, UINT8 data)
+void kempston_disk_interface_t::write(address_space &space, offs_t offset, uint8_t data)
{
}
diff --git a/src/devices/bus/ql/kempston_di.h b/src/devices/bus/ql/kempston_di.h
index 19e68ce864d..8a16bfdee0a 100644
--- a/src/devices/bus/ql/kempston_di.h
+++ b/src/devices/bus/ql/kempston_di.h
@@ -26,7 +26,7 @@ class kempston_disk_interface_t : public device_t,
{
public:
// construction/destruction
- kempston_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ kempston_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -36,8 +36,8 @@ protected:
virtual void device_start() override;
// device_ql_expansion_card_interface overrides
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override;
- virtual void write(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void write(address_space &space, offs_t offset, uint8_t data) override;
};
diff --git a/src/devices/bus/ql/miracle_gold_card.cpp b/src/devices/bus/ql/miracle_gold_card.cpp
index 31a566b3944..87f711829d7 100644
--- a/src/devices/bus/ql/miracle_gold_card.cpp
+++ b/src/devices/bus/ql/miracle_gold_card.cpp
@@ -50,7 +50,7 @@ const tiny_rom_entry *miracle_gold_card_t::device_rom_region() const
// miracle_gold_card_t - constructor
//-------------------------------------------------
-miracle_gold_card_t::miracle_gold_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+miracle_gold_card_t::miracle_gold_card_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, MIRACLE_GOLD_CARD, "Miracle Gold Card", tag, owner, clock, "ql_gold", __FILE__),
device_ql_expansion_card_interface(mconfig, *this)
{
@@ -70,7 +70,7 @@ void miracle_gold_card_t::device_start()
// read -
//-------------------------------------------------
-UINT8 miracle_gold_card_t::read(address_space &space, offs_t offset, UINT8 data)
+uint8_t miracle_gold_card_t::read(address_space &space, offs_t offset, uint8_t data)
{
return data;
}
@@ -80,6 +80,6 @@ UINT8 miracle_gold_card_t::read(address_space &space, offs_t offset, UINT8 data)
// write -
//-------------------------------------------------
-void miracle_gold_card_t::write(address_space &space, offs_t offset, UINT8 data)
+void miracle_gold_card_t::write(address_space &space, offs_t offset, uint8_t data)
{
}
diff --git a/src/devices/bus/ql/miracle_gold_card.h b/src/devices/bus/ql/miracle_gold_card.h
index a92abc790e2..0d8404ca07b 100644
--- a/src/devices/bus/ql/miracle_gold_card.h
+++ b/src/devices/bus/ql/miracle_gold_card.h
@@ -26,7 +26,7 @@ class miracle_gold_card_t : public device_t,
{
public:
// construction/destruction
- miracle_gold_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ miracle_gold_card_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -36,8 +36,8 @@ protected:
virtual void device_start() override;
// device_ql_expansion_card_interface overrides
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override;
- virtual void write(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void write(address_space &space, offs_t offset, uint8_t data) override;
};
diff --git a/src/devices/bus/ql/miracle_hd.cpp b/src/devices/bus/ql/miracle_hd.cpp
index 3de4d0360d0..82fe7a0835b 100644
--- a/src/devices/bus/ql/miracle_hd.cpp
+++ b/src/devices/bus/ql/miracle_hd.cpp
@@ -48,7 +48,7 @@ const tiny_rom_entry *miracle_hard_disk_t::device_rom_region() const
// miracle_hard_disk_t - constructor
//-------------------------------------------------
-miracle_hard_disk_t::miracle_hard_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+miracle_hard_disk_t::miracle_hard_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, MIRACLE_HARD_DISK, "Miracle Hard Disk", tag, owner, clock, "ql_mhd", __FILE__),
device_ql_rom_cartridge_card_interface(mconfig, *this)
{
@@ -68,7 +68,7 @@ void miracle_hard_disk_t::device_start()
// read -
//-------------------------------------------------
-UINT8 miracle_hard_disk_t::read(address_space &space, offs_t offset, UINT8 data)
+uint8_t miracle_hard_disk_t::read(address_space &space, offs_t offset, uint8_t data)
{
return data;
}
@@ -78,6 +78,6 @@ UINT8 miracle_hard_disk_t::read(address_space &space, offs_t offset, UINT8 data)
// write -
//-------------------------------------------------
-void miracle_hard_disk_t::write(address_space &space, offs_t offset, UINT8 data)
+void miracle_hard_disk_t::write(address_space &space, offs_t offset, uint8_t data)
{
}
diff --git a/src/devices/bus/ql/miracle_hd.h b/src/devices/bus/ql/miracle_hd.h
index 9881f6769f3..10bbe9051a4 100644
--- a/src/devices/bus/ql/miracle_hd.h
+++ b/src/devices/bus/ql/miracle_hd.h
@@ -26,7 +26,7 @@ class miracle_hard_disk_t : public device_t,
{
public:
// construction/destruction
- miracle_hard_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ miracle_hard_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -36,8 +36,8 @@ protected:
virtual void device_start() override;
// device_ql_rom_cartridge_card_interface overrides
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override;
- virtual void write(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void write(address_space &space, offs_t offset, uint8_t data) override;
};
diff --git a/src/devices/bus/ql/mp_fdi.cpp b/src/devices/bus/ql/mp_fdi.cpp
index 72543005cb3..7676f607d6f 100644
--- a/src/devices/bus/ql/mp_fdi.cpp
+++ b/src/devices/bus/ql/mp_fdi.cpp
@@ -48,7 +48,7 @@ const tiny_rom_entry *micro_peripherals_floppy_disk_interface_t::device_rom_regi
// micro_peripherals_floppy_disk_interface_t - constructor
//-------------------------------------------------
-micro_peripherals_floppy_disk_interface_t::micro_peripherals_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+micro_peripherals_floppy_disk_interface_t::micro_peripherals_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, MICRO_PERIPHERALS_FLOPPY_DISK_INTERFACE, "Micro Peripherals Floppy Disk Interface", tag, owner, clock, "ql_mpfdi", __FILE__),
device_ql_expansion_card_interface(mconfig, *this)
{
@@ -68,7 +68,7 @@ void micro_peripherals_floppy_disk_interface_t::device_start()
// read -
//-------------------------------------------------
-UINT8 micro_peripherals_floppy_disk_interface_t::read(address_space &space, offs_t offset, UINT8 data)
+uint8_t micro_peripherals_floppy_disk_interface_t::read(address_space &space, offs_t offset, uint8_t data)
{
return data;
}
@@ -78,6 +78,6 @@ UINT8 micro_peripherals_floppy_disk_interface_t::read(address_space &space, offs
// write -
//-------------------------------------------------
-void micro_peripherals_floppy_disk_interface_t::write(address_space &space, offs_t offset, UINT8 data)
+void micro_peripherals_floppy_disk_interface_t::write(address_space &space, offs_t offset, uint8_t data)
{
}
diff --git a/src/devices/bus/ql/mp_fdi.h b/src/devices/bus/ql/mp_fdi.h
index 14dc4087d6d..8ea642ea26d 100644
--- a/src/devices/bus/ql/mp_fdi.h
+++ b/src/devices/bus/ql/mp_fdi.h
@@ -26,7 +26,7 @@ class micro_peripherals_floppy_disk_interface_t : public device_t,
{
public:
// construction/destruction
- micro_peripherals_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ micro_peripherals_floppy_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -36,8 +36,8 @@ protected:
virtual void device_start() override;
// device_ql_expansion_card_interface overrides
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override;
- virtual void write(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void write(address_space &space, offs_t offset, uint8_t data) override;
};
diff --git a/src/devices/bus/ql/opd_basic_master.cpp b/src/devices/bus/ql/opd_basic_master.cpp
index 58bc110f433..bf9cc893dce 100644
--- a/src/devices/bus/ql/opd_basic_master.cpp
+++ b/src/devices/bus/ql/opd_basic_master.cpp
@@ -46,7 +46,7 @@ const tiny_rom_entry *opd_basic_master_t::device_rom_region() const
// opd_basic_master_t - constructor
//-------------------------------------------------
-opd_basic_master_t::opd_basic_master_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+opd_basic_master_t::opd_basic_master_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, OPD_BASIC_MASTER, "OPD Basic Master", tag, owner, clock, "ql_opdbm", __FILE__),
device_ql_expansion_card_interface(mconfig, *this)
{
@@ -66,7 +66,7 @@ void opd_basic_master_t::device_start()
// read -
//-------------------------------------------------
-UINT8 opd_basic_master_t::read(address_space &space, offs_t offset, UINT8 data)
+uint8_t opd_basic_master_t::read(address_space &space, offs_t offset, uint8_t data)
{
return data;
}
@@ -76,6 +76,6 @@ UINT8 opd_basic_master_t::read(address_space &space, offs_t offset, UINT8 data)
// write -
//-------------------------------------------------
-void opd_basic_master_t::write(address_space &space, offs_t offset, UINT8 data)
+void opd_basic_master_t::write(address_space &space, offs_t offset, uint8_t data)
{
}
diff --git a/src/devices/bus/ql/opd_basic_master.h b/src/devices/bus/ql/opd_basic_master.h
index ec0a92869ca..3611cfa11f1 100644
--- a/src/devices/bus/ql/opd_basic_master.h
+++ b/src/devices/bus/ql/opd_basic_master.h
@@ -26,7 +26,7 @@ class opd_basic_master_t : public device_t,
{
public:
// construction/destruction
- opd_basic_master_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ opd_basic_master_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -36,8 +36,8 @@ protected:
virtual void device_start() override;
// device_ql_expansion_card_interface overrides
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override;
- virtual void write(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void write(address_space &space, offs_t offset, uint8_t data) override;
};
diff --git a/src/devices/bus/ql/pcml_qdisk.cpp b/src/devices/bus/ql/pcml_qdisk.cpp
index 0dd88363660..1f505e9ddc3 100644
--- a/src/devices/bus/ql/pcml_qdisk.cpp
+++ b/src/devices/bus/ql/pcml_qdisk.cpp
@@ -48,7 +48,7 @@ const tiny_rom_entry *pcml_q_disk_interface_t::device_rom_region() const
// pcml_q_disk_interface_t - constructor
//-------------------------------------------------
-pcml_q_disk_interface_t::pcml_q_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pcml_q_disk_interface_t::pcml_q_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PCML_Q_DISK_INTERFACE, "PCML Q+ Disk Interface", tag, owner, clock, "ql_pcmlqdi", __FILE__),
device_ql_expansion_card_interface(mconfig, *this)
{
@@ -68,7 +68,7 @@ void pcml_q_disk_interface_t::device_start()
// read -
//-------------------------------------------------
-UINT8 pcml_q_disk_interface_t::read(address_space &space, offs_t offset, UINT8 data)
+uint8_t pcml_q_disk_interface_t::read(address_space &space, offs_t offset, uint8_t data)
{
return data;
}
@@ -78,6 +78,6 @@ UINT8 pcml_q_disk_interface_t::read(address_space &space, offs_t offset, UINT8 d
// write -
//-------------------------------------------------
-void pcml_q_disk_interface_t::write(address_space &space, offs_t offset, UINT8 data)
+void pcml_q_disk_interface_t::write(address_space &space, offs_t offset, uint8_t data)
{
}
diff --git a/src/devices/bus/ql/pcml_qdisk.h b/src/devices/bus/ql/pcml_qdisk.h
index 6348a7d5fd6..120787eebd2 100644
--- a/src/devices/bus/ql/pcml_qdisk.h
+++ b/src/devices/bus/ql/pcml_qdisk.h
@@ -26,7 +26,7 @@ class pcml_q_disk_interface_t : public device_t,
{
public:
// construction/destruction
- pcml_q_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pcml_q_disk_interface_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -36,8 +36,8 @@ protected:
virtual void device_start() override;
// device_ql_expansion_card_interface overrides
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override;
- virtual void write(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void write(address_space &space, offs_t offset, uint8_t data) override;
};
diff --git a/src/devices/bus/ql/qubide.cpp b/src/devices/bus/ql/qubide.cpp
index 418eea3ea81..740a1188acf 100644
--- a/src/devices/bus/ql/qubide.cpp
+++ b/src/devices/bus/ql/qubide.cpp
@@ -168,7 +168,7 @@ ioport_constructor qubide_t::device_input_ports() const
// qubide_t - constructor
//-------------------------------------------------
-qubide_t::qubide_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+qubide_t::qubide_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, QUBIDE, "QubIDE", tag, owner, clock, "ql_qubide", __FILE__),
device_ql_expansion_card_interface(mconfig, *this),
m_ata(*this, "ata"),
@@ -210,7 +210,7 @@ void qubide_t::device_reset()
// read -
//-------------------------------------------------
-UINT8 qubide_t::read(address_space &space, offs_t offset, UINT8 data)
+uint8_t qubide_t::read(address_space &space, offs_t offset, uint8_t data)
{
if ((offset & 0xfc000) == m_base)
{
@@ -255,7 +255,7 @@ UINT8 qubide_t::read(address_space &space, offs_t offset, UINT8 data)
// write -
//-------------------------------------------------
-void qubide_t::write(address_space &space, offs_t offset, UINT8 data)
+void qubide_t::write(address_space &space, offs_t offset, uint8_t data)
{
if ((offset & 0xfc000) == m_base)
{
diff --git a/src/devices/bus/ql/qubide.h b/src/devices/bus/ql/qubide.h
index 4ccb043847c..9ebbdaa95e5 100644
--- a/src/devices/bus/ql/qubide.h
+++ b/src/devices/bus/ql/qubide.h
@@ -27,7 +27,7 @@ class qubide_t : public device_t,
{
public:
// construction/destruction
- qubide_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ qubide_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -40,8 +40,8 @@ protected:
virtual void device_reset() override;
// device_ql_expansion_card_interface overrides
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override;
- virtual void write(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void write(address_space &space, offs_t offset, uint8_t data) override;
private:
required_device<ata_interface_device> m_ata;
@@ -49,7 +49,7 @@ private:
required_ioport m_j1_j5;
offs_t m_base;
- UINT16 m_ata_data;
+ uint16_t m_ata_data;
};
diff --git a/src/devices/bus/ql/rom.cpp b/src/devices/bus/ql/rom.cpp
index a0b773a0f58..4ad95a0febe 100644
--- a/src/devices/bus/ql/rom.cpp
+++ b/src/devices/bus/ql/rom.cpp
@@ -53,7 +53,7 @@ device_ql_rom_cartridge_card_interface::~device_ql_rom_cartridge_card_interface(
// ql_rom_cartridge_slot_t - constructor
//-------------------------------------------------
-ql_rom_cartridge_slot_t::ql_rom_cartridge_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ql_rom_cartridge_slot_t::ql_rom_cartridge_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, QL_ROM_CARTRIDGE_SLOT, "QL ROM cartridge slot", tag, owner, clock, "ql_rom_cartridge_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this), m_card(nullptr)
diff --git a/src/devices/bus/ql/rom.h b/src/devices/bus/ql/rom.h
index 5649804df66..ac128b72180 100644
--- a/src/devices/bus/ql/rom.h
+++ b/src/devices/bus/ql/rom.h
@@ -62,13 +62,13 @@ public:
virtual ~device_ql_rom_cartridge_card_interface();
virtual void romoeh_w(int state) { m_romoeh = state; }
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) { return data; }
- virtual void write(address_space &space, offs_t offset, UINT8 data) { }
+ virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) { return data; }
+ virtual void write(address_space &space, offs_t offset, uint8_t data) { }
protected:
ql_rom_cartridge_slot_t *m_slot;
- optional_shared_ptr<UINT8> m_rom;
+ optional_shared_ptr<uint8_t> m_rom;
int m_romoeh;
};
@@ -82,11 +82,11 @@ class ql_rom_cartridge_slot_t : public device_t,
{
public:
// construction/destruction
- ql_rom_cartridge_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ql_rom_cartridge_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// computer interface
- UINT8 read(address_space &space, offs_t offset, UINT8 data) { if (m_card) data = m_card->read(space, offset, data); return data; }
- void write(address_space &space, offs_t offset, UINT8 data) { if (m_card) m_card->write(space, offset, data); }
+ uint8_t read(address_space &space, offs_t offset, uint8_t data) { if (m_card) data = m_card->read(space, offset, data); return data; }
+ void write(address_space &space, offs_t offset, uint8_t data) { if (m_card) m_card->write(space, offset, data); }
DECLARE_WRITE_LINE_MEMBER( romoeh_w ) { if (m_card) m_card->romoeh_w(state); }
protected:
diff --git a/src/devices/bus/ql/sandy_superdisk.cpp b/src/devices/bus/ql/sandy_superdisk.cpp
index 48d269fa68e..6cdd08e1c70 100644
--- a/src/devices/bus/ql/sandy_superdisk.cpp
+++ b/src/devices/bus/ql/sandy_superdisk.cpp
@@ -111,7 +111,7 @@ machine_config_constructor sandy_super_disk_t::device_mconfig_additions() const
// sandy_super_disk_t - constructor
//-------------------------------------------------
-sandy_super_disk_t::sandy_super_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sandy_super_disk_t::sandy_super_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SANDY_SUPER_DISK, "Sandy Super Disk", tag, owner, clock, "ql_sdisk", __FILE__),
device_ql_expansion_card_interface(mconfig, *this),
m_fdc(*this, WD1772_TAG),
@@ -156,7 +156,7 @@ void sandy_super_disk_t::device_reset()
// read -
//-------------------------------------------------
-UINT8 sandy_super_disk_t::read(address_space &space, offs_t offset, UINT8 data)
+uint8_t sandy_super_disk_t::read(address_space &space, offs_t offset, uint8_t data)
{
if ((offset & 0xf0000) == 0xc0000)
{
@@ -202,7 +202,7 @@ UINT8 sandy_super_disk_t::read(address_space &space, offs_t offset, UINT8 data)
// write -
//-------------------------------------------------
-void sandy_super_disk_t::write(address_space &space, offs_t offset, UINT8 data)
+void sandy_super_disk_t::write(address_space &space, offs_t offset, uint8_t data)
{
if ((offset & 0xf0000) == 0xc0000)
{
diff --git a/src/devices/bus/ql/sandy_superdisk.h b/src/devices/bus/ql/sandy_superdisk.h
index 56efeafab6a..fe44b921bf6 100644
--- a/src/devices/bus/ql/sandy_superdisk.h
+++ b/src/devices/bus/ql/sandy_superdisk.h
@@ -29,7 +29,7 @@ class sandy_super_disk_t : public device_t,
{
public:
// construction/destruction
- sandy_super_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sandy_super_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -45,8 +45,8 @@ protected:
virtual void device_reset() override;
// device_ql_expansion_card_interface overrides
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override;
- virtual void write(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void write(address_space &space, offs_t offset, uint8_t data) override;
private:
void check_interrupt();
diff --git a/src/devices/bus/ql/sandy_superqboard.cpp b/src/devices/bus/ql/sandy_superqboard.cpp
index 03b9a09c92c..3b9c7440dde 100644
--- a/src/devices/bus/ql/sandy_superqboard.cpp
+++ b/src/devices/bus/ql/sandy_superqboard.cpp
@@ -212,7 +212,7 @@ ioport_constructor sandy_superqmouse_512k_t::device_input_ports() const
// sandy_superqboard_t - constructor
//-------------------------------------------------
-sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SANDY_SUPERQBOARD, "Sandy SuperQBoard 256K", tag, owner, clock, "ql_sqboard256", __FILE__),
device_ql_expansion_card_interface(mconfig, *this),
m_fdc(*this, WD1772_TAG),
@@ -230,7 +230,7 @@ sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, const ch
{
}
-sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size) :
+sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source, int ram_size) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_ql_expansion_card_interface(mconfig, *this),
m_fdc(*this, WD1772_TAG),
@@ -248,13 +248,13 @@ sandy_superqboard_t::sandy_superqboard_t(const machine_config &mconfig, device_t
{
}
-sandy_superqboard_512k_t::sandy_superqboard_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sandy_superqboard_512k_t::sandy_superqboard_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sandy_superqboard_t(mconfig, SANDY_SUPERQBOARD_512K, "Sandy SuperQBoard 512K", tag, owner, clock, "ql_sqboard512", __FILE__, 512*1024) { }
-sandy_superqmouse_t::sandy_superqmouse_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sandy_superqmouse_t::sandy_superqmouse_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sandy_superqboard_t(mconfig, SANDY_SUPERQMOUSE, "Sandy SuperQMouse", tag, owner, clock, "ql_sqmouse", __FILE__, 256*1024) { }
-sandy_superqmouse_512k_t::sandy_superqmouse_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sandy_superqmouse_512k_t::sandy_superqmouse_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sandy_superqboard_t(mconfig, SANDY_SUPERQMOUSE_512K, "Sandy SuperQMouse 512K", tag, owner, clock, "ql_sqmouse512", __FILE__, 512*1024) { }
@@ -299,7 +299,7 @@ void sandy_superqboard_t::device_reset()
// read -
//-------------------------------------------------
-UINT8 sandy_superqboard_t::read(address_space &space, offs_t offset, UINT8 data)
+uint8_t sandy_superqboard_t::read(address_space &space, offs_t offset, uint8_t data)
{
if ((offset & 0xf0000) == 0xc0000)
{
@@ -359,7 +359,7 @@ UINT8 sandy_superqboard_t::read(address_space &space, offs_t offset, UINT8 data)
// write -
//-------------------------------------------------
-void sandy_superqboard_t::write(address_space &space, offs_t offset, UINT8 data)
+void sandy_superqboard_t::write(address_space &space, offs_t offset, uint8_t data)
{
if ((offset & 0xf0000) == 0xc0000)
{
diff --git a/src/devices/bus/ql/sandy_superqboard.h b/src/devices/bus/ql/sandy_superqboard.h
index 5aefdc250ed..a1982c38ede 100644
--- a/src/devices/bus/ql/sandy_superqboard.h
+++ b/src/devices/bus/ql/sandy_superqboard.h
@@ -29,8 +29,8 @@ class sandy_superqboard_t : public device_t,
{
public:
// construction/destruction
- sandy_superqboard_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- sandy_superqboard_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size);
+ sandy_superqboard_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ sandy_superqboard_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source, int ram_size);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -49,8 +49,8 @@ protected:
virtual void device_reset() override;
// device_ql_expansion_card_interface overrides
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override;
- virtual void write(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void write(address_space &space, offs_t offset, uint8_t data) override;
private:
enum
@@ -73,14 +73,14 @@ private:
required_device<centronics_device> m_centronics;
required_device<output_latch_device> m_latch;
required_memory_region m_rom;
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
optional_ioport m_buttons;
int m_ram_size;
int m_fd6;
int m_fd7;
- UINT8 m_status;
+ uint8_t m_status;
};
@@ -90,7 +90,7 @@ class sandy_superqboard_512k_t : public sandy_superqboard_t
{
public:
// construction/destruction
- sandy_superqboard_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sandy_superqboard_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
@@ -100,7 +100,7 @@ class sandy_superqmouse_t : public sandy_superqboard_t
{
public:
// construction/destruction
- sandy_superqmouse_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sandy_superqmouse_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -113,7 +113,7 @@ class sandy_superqmouse_512k_t : public sandy_superqboard_t
{
public:
// construction/destruction
- sandy_superqmouse_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sandy_superqmouse_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/ql/std.cpp b/src/devices/bus/ql/std.cpp
index 11132954104..07f064d7b91 100644
--- a/src/devices/bus/ql/std.cpp
+++ b/src/devices/bus/ql/std.cpp
@@ -26,7 +26,7 @@ const device_type QL_STANDARD_ROM_CARTRIDGE = &device_creator<ql_standard_rom_ca
// ql_standard_rom_cartridge_t - constructor
//-------------------------------------------------
-ql_standard_rom_cartridge_t::ql_standard_rom_cartridge_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ql_standard_rom_cartridge_t::ql_standard_rom_cartridge_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, QL_STANDARD_ROM_CARTRIDGE, "QL standard ROM cartridge", tag, owner, clock, "ql_standard", __FILE__),
device_ql_rom_cartridge_card_interface(mconfig, *this)
{
@@ -46,7 +46,7 @@ void ql_standard_rom_cartridge_t::device_start()
// read - cartridge data read
//-------------------------------------------------
-UINT8 ql_standard_rom_cartridge_t::read(address_space &space, offs_t offset, UINT8 data)
+uint8_t ql_standard_rom_cartridge_t::read(address_space &space, offs_t offset, uint8_t data)
{
if (m_romoeh && m_rom.bytes())
{
diff --git a/src/devices/bus/ql/std.h b/src/devices/bus/ql/std.h
index cbf7731c59a..40190ea4a35 100644
--- a/src/devices/bus/ql/std.h
+++ b/src/devices/bus/ql/std.h
@@ -26,14 +26,14 @@ class ql_standard_rom_cartridge_t : public device_t,
{
public:
// construction/destruction
- ql_standard_rom_cartridge_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ql_standard_rom_cartridge_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_ql_rom_cartridge_card_interface overrides
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override;
};
diff --git a/src/devices/bus/ql/trumpcard.cpp b/src/devices/bus/ql/trumpcard.cpp
index c4c334efed0..a97ecdeb112 100644
--- a/src/devices/bus/ql/trumpcard.cpp
+++ b/src/devices/bus/ql/trumpcard.cpp
@@ -111,7 +111,7 @@ machine_config_constructor ql_trump_card_t::device_mconfig_additions() const
// ql_trump_card_t - constructor
//-------------------------------------------------
-ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, QL_TRUMP_CARD, "QL Trump Card", tag, owner, clock, "ql_trump", __FILE__),
device_ql_expansion_card_interface(mconfig, *this),
m_fdc(*this, WD1772_TAG),
@@ -123,7 +123,7 @@ ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, const char *tag,
{
}
-ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size) :
+ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source, int ram_size) :
device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_ql_expansion_card_interface(mconfig, *this),
m_fdc(*this, WD1772_TAG),
@@ -135,13 +135,13 @@ ql_trump_card_t::ql_trump_card_t(const machine_config &mconfig, device_type type
{
}
-ql_trump_card_256k_t::ql_trump_card_256k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ql_trump_card_256k_t::ql_trump_card_256k_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ql_trump_card_t(mconfig, QL_TRUMP_CARD_256K, "QL Trump Card 256K", tag, owner, clock, "ql_trump256", __FILE__, 256*1024) { }
-ql_trump_card_512k_t::ql_trump_card_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ql_trump_card_512k_t::ql_trump_card_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ql_trump_card_t(mconfig, QL_TRUMP_CARD_512K, "QL Trump Card 512K", tag, owner, clock, "ql_trump512", __FILE__, 512*1024) { }
-ql_trump_card_768k_t::ql_trump_card_768k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ql_trump_card_768k_t::ql_trump_card_768k_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ql_trump_card_t(mconfig, QL_TRUMP_CARD_768K, "QL Trump Card 768K", tag, owner, clock, "ql_trump768", __FILE__, 768*1024) { }
@@ -176,7 +176,7 @@ void ql_trump_card_t::device_reset()
// read -
//-------------------------------------------------
-UINT8 ql_trump_card_t::read(address_space &space, offs_t offset, UINT8 data)
+uint8_t ql_trump_card_t::read(address_space &space, offs_t offset, uint8_t data)
{
if (offset >= 0xc000 && offset < 0x10000)
{
@@ -229,7 +229,7 @@ UINT8 ql_trump_card_t::read(address_space &space, offs_t offset, UINT8 data)
// write -
//-------------------------------------------------
-void ql_trump_card_t::write(address_space &space, offs_t offset, UINT8 data)
+void ql_trump_card_t::write(address_space &space, offs_t offset, uint8_t data)
{
if (offset >= 0x1c000 && offset <= 0x1c003)
{
diff --git a/src/devices/bus/ql/trumpcard.h b/src/devices/bus/ql/trumpcard.h
index 21ec7109712..631b584c9f1 100644
--- a/src/devices/bus/ql/trumpcard.h
+++ b/src/devices/bus/ql/trumpcard.h
@@ -28,8 +28,8 @@ class ql_trump_card_t : public device_t,
{
public:
// construction/destruction
- ql_trump_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- ql_trump_card_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size);
+ ql_trump_card_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ ql_trump_card_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source, int ram_size);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -43,15 +43,15 @@ protected:
virtual void device_reset() override;
// device_ql_expansion_card_interface overrides
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override;
- virtual void write(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void write(address_space &space, offs_t offset, uint8_t data) override;
private:
required_device<wd1772_t> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_memory_region m_rom;
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
int m_ram_size;
bool m_rom_en;
@@ -64,7 +64,7 @@ class ql_trump_card_256k_t : public ql_trump_card_t
{
public:
// construction/destruction
- ql_trump_card_256k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ql_trump_card_256k_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
@@ -74,7 +74,7 @@ class ql_trump_card_512k_t : public ql_trump_card_t
{
public:
// construction/destruction
- ql_trump_card_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ql_trump_card_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
@@ -84,7 +84,7 @@ class ql_trump_card_768k_t : public ql_trump_card_t
{
public:
// construction/destruction
- ql_trump_card_768k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ql_trump_card_768k_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
diff --git a/src/devices/bus/rs232/keyboard.cpp b/src/devices/bus/rs232/keyboard.cpp
index c6462022ea3..51ce4e9eb79 100644
--- a/src/devices/bus/rs232/keyboard.cpp
+++ b/src/devices/bus/rs232/keyboard.cpp
@@ -14,12 +14,12 @@ INPUT_PORTS_START(serial_keyboard)
INPUT_PORTS_END
} // anonymous namespace
-serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: serial_keyboard_device(mconfig, SERIAL_KEYBOARD, "Serial Keyboard", tag, owner, clock, "serial_keyboard", __FILE__)
{
}
-serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+serial_keyboard_device::serial_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: generic_keyboard_device(mconfig, type, name, tag, owner, clock, shortname, source)
, device_buffered_serial_interface(mconfig, *this)
, device_rs232_port_interface(mconfig, *this)
@@ -90,12 +90,12 @@ void serial_keyboard_device::tra_callback()
output_rxd(transmit_register_get_data_bit());
}
-void serial_keyboard_device::send_key(UINT8 code)
+void serial_keyboard_device::send_key(uint8_t code)
{
transmit_byte(code);
}
-void serial_keyboard_device::received_byte(UINT8 byte)
+void serial_keyboard_device::received_byte(uint8_t byte)
{
}
diff --git a/src/devices/bus/rs232/keyboard.h b/src/devices/bus/rs232/keyboard.h
index fd9ad0f80f8..7592dcd2ed5 100644
--- a/src/devices/bus/rs232/keyboard.h
+++ b/src/devices/bus/rs232/keyboard.h
@@ -14,8 +14,8 @@ class serial_keyboard_device
, public device_rs232_port_interface
{
public:
- serial_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- serial_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ serial_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ serial_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual ioport_constructor device_input_ports() const override;
@@ -28,10 +28,10 @@ protected:
virtual void device_reset() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual void tra_callback() override;
- virtual void send_key(UINT8 code) override;
+ virtual void send_key(uint8_t code) override;
private:
- virtual void received_byte(UINT8 byte) override;
+ virtual void received_byte(uint8_t byte) override;
required_ioport m_rs232_txbaud;
required_ioport m_rs232_startbits;
diff --git a/src/devices/bus/rs232/loopback.cpp b/src/devices/bus/rs232/loopback.cpp
index 20c75e4099d..83668f8c362 100644
--- a/src/devices/bus/rs232/loopback.cpp
+++ b/src/devices/bus/rs232/loopback.cpp
@@ -5,7 +5,7 @@
const device_type RS232_LOOPBACK = &device_creator<rs232_loopback_device>;
-rs232_loopback_device::rs232_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+rs232_loopback_device::rs232_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, RS232_LOOPBACK, "RS232 Loopback", tag, owner, clock, "rs232_loopback", __FILE__),
device_rs232_port_interface(mconfig, *this)
{
diff --git a/src/devices/bus/rs232/loopback.h b/src/devices/bus/rs232/loopback.h
index 5d262c93264..25de18df2a9 100644
--- a/src/devices/bus/rs232/loopback.h
+++ b/src/devices/bus/rs232/loopback.h
@@ -10,7 +10,7 @@ class rs232_loopback_device : public device_t,
public device_rs232_port_interface
{
public:
- rs232_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rs232_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual WRITE_LINE_MEMBER( input_txd ) override;
virtual WRITE_LINE_MEMBER( input_rts ) override;
diff --git a/src/devices/bus/rs232/null_modem.cpp b/src/devices/bus/rs232/null_modem.cpp
index 8c182989ff6..846292d7690 100644
--- a/src/devices/bus/rs232/null_modem.cpp
+++ b/src/devices/bus/rs232/null_modem.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf,Carl
#include "null_modem.h"
-null_modem_device::null_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+null_modem_device::null_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, NULL_MODEM, "Null Modem", tag, owner, clock, "null_modem", __FILE__),
device_serial_interface(mconfig, *this),
device_rs232_port_interface(mconfig, *this),
diff --git a/src/devices/bus/rs232/null_modem.h b/src/devices/bus/rs232/null_modem.h
index 028614788d6..3568b313cbc 100644
--- a/src/devices/bus/rs232/null_modem.h
+++ b/src/devices/bus/rs232/null_modem.h
@@ -11,7 +11,7 @@ class null_modem_device : public device_t,
public device_rs232_port_interface
{
public:
- null_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ null_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); }
@@ -44,9 +44,9 @@ private:
required_ioport m_rs232_stopbits;
required_ioport m_flow;
- UINT8 m_input_buffer[1000];
- UINT32 m_input_count;
- UINT32 m_input_index;
+ uint8_t m_input_buffer[1000];
+ uint32_t m_input_count;
+ uint32_t m_input_index;
emu_timer *m_timer_poll;
int m_rts;
};
diff --git a/src/devices/bus/rs232/printer.cpp b/src/devices/bus/rs232/printer.cpp
index e8734ad6de6..b75d028b81b 100644
--- a/src/devices/bus/rs232/printer.cpp
+++ b/src/devices/bus/rs232/printer.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "printer.h"
-serial_printer_device::serial_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+serial_printer_device::serial_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SERIAL_PRINTER, "Serial Printer", tag, owner, clock, "serial_printer", __FILE__),
device_serial_interface(mconfig, *this),
device_rs232_port_interface(mconfig, *this),
diff --git a/src/devices/bus/rs232/printer.h b/src/devices/bus/rs232/printer.h
index 4ce526fac4b..9380bf58fed 100644
--- a/src/devices/bus/rs232/printer.h
+++ b/src/devices/bus/rs232/printer.h
@@ -13,7 +13,7 @@ class serial_printer_device : public device_t,
public device_rs232_port_interface
{
public:
- serial_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ serial_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); }
diff --git a/src/devices/bus/rs232/pty.cpp b/src/devices/bus/rs232/pty.cpp
index 3a525236128..297870d4e30 100644
--- a/src/devices/bus/rs232/pty.cpp
+++ b/src/devices/bus/rs232/pty.cpp
@@ -6,7 +6,7 @@
static const int TIMER_POLL = 1;
-pseudo_terminal_device::pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+pseudo_terminal_device::pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PSEUDO_TERMINAL, "Pseudo terminal", tag, owner, clock, "pseudo_terminal", __FILE__),
device_serial_interface(mconfig, *this),
device_rs232_port_interface(mconfig, *this),
diff --git a/src/devices/bus/rs232/pty.h b/src/devices/bus/rs232/pty.h
index 19f0a30ef9f..ada2bdd0698 100644
--- a/src/devices/bus/rs232/pty.h
+++ b/src/devices/bus/rs232/pty.h
@@ -12,7 +12,7 @@ class pseudo_terminal_device : public device_t,
public device_pty_interface
{
public:
- pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override {
device_serial_interface::rx_w(state);
@@ -39,9 +39,9 @@ private:
required_ioport m_rs232_parity;
required_ioport m_rs232_stopbits;
- UINT8 m_input_buffer[ 1024 ];
- UINT32 m_input_count;
- UINT32 m_input_index;
+ uint8_t m_input_buffer[ 1024 ];
+ uint32_t m_input_count;
+ uint32_t m_input_index;
emu_timer *m_timer_poll;
void queue(void);
diff --git a/src/devices/bus/rs232/rs232.cpp b/src/devices/bus/rs232/rs232.cpp
index 82712343439..458f97ca865 100644
--- a/src/devices/bus/rs232/rs232.cpp
+++ b/src/devices/bus/rs232/rs232.cpp
@@ -4,7 +4,7 @@
const device_type RS232_PORT = &device_creator<rs232_port_device>;
-rs232_port_device::rs232_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+rs232_port_device::rs232_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, RS232_PORT, "RS232 Port", tag, owner, clock, "rs232", __FILE__),
device_slot_interface(mconfig, *this),
m_rxd(0),
@@ -21,7 +21,7 @@ rs232_port_device::rs232_port_device(const machine_config &mconfig, const char *
{
}
-rs232_port_device::rs232_port_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+rs232_port_device::rs232_port_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this),
m_rxd(0),
diff --git a/src/devices/bus/rs232/rs232.h b/src/devices/bus/rs232/rs232.h
index 8959d276dc7..a77e022f7dc 100644
--- a/src/devices/bus/rs232/rs232.h
+++ b/src/devices/bus/rs232/rs232.h
@@ -117,8 +117,8 @@ class rs232_port_device : public device_t,
friend class device_rs232_port_interface;
public:
- rs232_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- rs232_port_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ rs232_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ rs232_port_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual ~rs232_port_device();
// static configuration helpers
@@ -181,7 +181,7 @@ public:
protected:
rs232_port_device *m_port;
- static int convert_baud(UINT8 baud)
+ static int convert_baud(uint8_t baud)
{
static const int values[] =
{
@@ -204,7 +204,7 @@ protected:
return values[baud];
}
- static int convert_startbits(UINT8 startbits)
+ static int convert_startbits(uint8_t startbits)
{
static const int values[] =
{
@@ -215,7 +215,7 @@ protected:
return values[startbits];
}
- static int convert_databits(UINT8 databits)
+ static int convert_databits(uint8_t databits)
{
static const int values[] =
{
@@ -228,7 +228,7 @@ protected:
return values[databits];
}
- static device_serial_interface::parity_t convert_parity(UINT8 parity)
+ static device_serial_interface::parity_t convert_parity(uint8_t parity)
{
static const device_serial_interface::parity_t values[] =
{
@@ -242,7 +242,7 @@ protected:
return values[parity];
}
- static device_serial_interface::stop_bits_t convert_stopbits(UINT8 stopbits)
+ static device_serial_interface::stop_bits_t convert_stopbits(uint8_t stopbits)
{
static const device_serial_interface::stop_bits_t values[] =
{
@@ -256,7 +256,7 @@ protected:
}
};
-template <UINT32 FIFO_LENGTH>
+template <uint32_t FIFO_LENGTH>
class buffered_rs232_device : public device_t, public device_buffered_serial_interface<FIFO_LENGTH>, public device_rs232_port_interface
{
public:
@@ -266,7 +266,7 @@ public:
}
protected:
- buffered_rs232_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ buffered_rs232_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
, device_buffered_serial_interface<FIFO_LENGTH>(mconfig, *this)
, device_rs232_port_interface(mconfig, *this)
diff --git a/src/devices/bus/rs232/ser_mouse.cpp b/src/devices/bus/rs232/ser_mouse.cpp
index ecf9414f1c9..e4c322ed204 100644
--- a/src/devices/bus/rs232/ser_mouse.cpp
+++ b/src/devices/bus/rs232/ser_mouse.cpp
@@ -11,7 +11,7 @@
#include "ser_mouse.h"
-serial_mouse_device::serial_mouse_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+serial_mouse_device::serial_mouse_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_rs232_port_interface(mconfig, *this),
device_serial_interface(mconfig, *this),
@@ -30,14 +30,14 @@ serial_mouse_device::serial_mouse_device(const machine_config &mconfig, device_t
const device_type MSFT_SERIAL_MOUSE = &device_creator<microsoft_mouse_device>;
-microsoft_mouse_device::microsoft_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+microsoft_mouse_device::microsoft_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: serial_mouse_device(mconfig, MSFT_SERIAL_MOUSE, "Microsoft Serial Mouse", tag, owner, clock, "microsoft_mouse", __FILE__)
{
}
const device_type MSYSTEM_SERIAL_MOUSE = &device_creator<mouse_systems_mouse_device>;
-mouse_systems_mouse_device::mouse_systems_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mouse_systems_mouse_device::mouse_systems_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: serial_mouse_device(mconfig, MSYSTEM_SERIAL_MOUSE, "Mouse Systems Serial Mouse", tag, owner, clock, "mouse_systems_mouse", __FILE__)
{
}
@@ -132,7 +132,7 @@ void microsoft_mouse_device::mouse_trans(int dx, int dy, int nb, int mbc)
/* split deltas into packets of -128..+127 max */
do
{
- UINT8 m0, m1, m2;
+ uint8_t m0, m1, m2;
int ddx = (dx < -128) ? -128 : (dx > 127) ? 127 : dx;
int ddy = (dy < -128) ? -128 : (dy > 127) ? 127 : dy;
m0 = 0x40 | ((nb << 4) & 0x30) | ((ddx >> 6) & 0x03) | ((ddy >> 4) & 0x0c);
diff --git a/src/devices/bus/rs232/ser_mouse.h b/src/devices/bus/rs232/ser_mouse.h
index 6a8986aa081..0e001916d83 100644
--- a/src/devices/bus/rs232/ser_mouse.h
+++ b/src/devices/bus/rs232/ser_mouse.h
@@ -17,7 +17,7 @@ class serial_mouse_device :
public device_serial_interface
{
public:
- serial_mouse_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ serial_mouse_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual ioport_constructor device_input_ports() const override;
@@ -27,8 +27,8 @@ protected:
virtual void mouse_trans(int dx, int dy, int nb, int mbc) = 0;
virtual void set_frame() = 0;
void set_mouse_enable(bool state);
- void queue_data(UINT8 data) {m_queue[m_head] = data; ++m_head %= 256;}
- UINT8 unqueue_data() {UINT8 ret = m_queue[m_tail]; ++m_tail %= 256; return ret;}
+ void queue_data(uint8_t data) {m_queue[m_head] = data; ++m_head %= 256;}
+ uint8_t unqueue_data() {uint8_t ret = m_queue[m_tail]; ++m_tail %= 256; return ret;}
virtual void tra_complete() override;
virtual void tra_callback() override;
void reset_mouse();
@@ -39,8 +39,8 @@ protected:
int m_rts;
private:
- UINT8 m_queue[256];
- UINT8 m_head, m_tail, m_mb;
+ uint8_t m_queue[256];
+ uint8_t m_head, m_tail, m_mb;
emu_timer *m_timer;
bool m_enabled;
@@ -55,7 +55,7 @@ private:
class microsoft_mouse_device : public serial_mouse_device
{
public:
- microsoft_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ microsoft_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual WRITE_LINE_MEMBER(input_rts) override;
@@ -69,7 +69,7 @@ extern const device_type MSFT_SERIAL_MOUSE;
class mouse_systems_mouse_device : public serial_mouse_device
{
public:
- mouse_systems_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mouse_systems_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual void set_frame() override { set_data_frame(1, 8, PARITY_NONE, STOP_BITS_2); }
diff --git a/src/devices/bus/rs232/sun_kbd.cpp b/src/devices/bus/rs232/sun_kbd.cpp
index c0fa833897c..169732db04b 100644
--- a/src/devices/bus/rs232/sun_kbd.cpp
+++ b/src/devices/bus/rs232/sun_kbd.cpp
@@ -16,7 +16,7 @@ sun_keyboard_adaptor_device::sun_keyboard_adaptor_device(
machine_config const &mconfig,
char const *tag,
device_t *owner,
- UINT32 clock)
+ uint32_t clock)
: device_t(mconfig, SUN_KBD_ADAPTOR, "Sun Keyboard Adaptor", tag, owner, clock, "sunkbd_adaptor", __FILE__)
, device_rs232_port_interface(mconfig, *this)
, m_keyboard_port(*this, "keyboard")
diff --git a/src/devices/bus/rs232/sun_kbd.h b/src/devices/bus/rs232/sun_kbd.h
index 3033b33ce2f..8154eaca57d 100644
--- a/src/devices/bus/rs232/sun_kbd.h
+++ b/src/devices/bus/rs232/sun_kbd.h
@@ -15,7 +15,7 @@ extern device_type const SUN_KBD_ADAPTOR;
class sun_keyboard_adaptor_device : public device_t, public device_rs232_port_interface
{
public:
- sun_keyboard_adaptor_device(machine_config const &mconfig, char const *tag, device_t *owner, UINT32 clock);
+ sun_keyboard_adaptor_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
virtual ~sun_keyboard_adaptor_device() override;
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/rs232/terminal.cpp b/src/devices/bus/rs232/terminal.cpp
index b56071b2bee..d4e0911825e 100644
--- a/src/devices/bus/rs232/terminal.cpp
+++ b/src/devices/bus/rs232/terminal.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "terminal.h"
-serial_terminal_device::serial_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+serial_terminal_device::serial_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: generic_terminal_device(mconfig, SERIAL_TERMINAL, "Serial Terminal", tag, owner, clock, "serial_terminal", __FILE__)
, device_buffered_serial_interface(mconfig, *this)
, device_rs232_port_interface(mconfig, *this)
@@ -77,7 +77,7 @@ void serial_terminal_device::device_timer(emu_timer &timer, device_timer_id id,
device_buffered_serial_interface::device_timer(timer, id, param, ptr);
}
-void serial_terminal_device::send_key(UINT8 code)
+void serial_terminal_device::send_key(uint8_t code)
{
transmit_byte(code);
}
@@ -87,7 +87,7 @@ void serial_terminal_device::tra_callback()
output_rxd(transmit_register_get_data_bit());
}
-void serial_terminal_device::received_byte(UINT8 byte)
+void serial_terminal_device::received_byte(uint8_t byte)
{
term_write(byte);
}
diff --git a/src/devices/bus/rs232/terminal.h b/src/devices/bus/rs232/terminal.h
index b3a550381eb..d9c788a1284 100644
--- a/src/devices/bus/rs232/terminal.h
+++ b/src/devices/bus/rs232/terminal.h
@@ -12,7 +12,7 @@ class serial_terminal_device : public generic_terminal_device,
public device_rs232_port_interface
{
public:
- serial_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ serial_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_buffered_serial_interface::rx_w(state); }
@@ -25,10 +25,10 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual void tra_callback() override;
- virtual void send_key(UINT8 code) override;
+ virtual void send_key(uint8_t code) override;
private:
- virtual void received_byte(UINT8 byte) override;
+ virtual void received_byte(uint8_t byte) override;
required_ioport m_rs232_txbaud;
required_ioport m_rs232_rxbaud;
diff --git a/src/devices/bus/rs232/xvd701.cpp b/src/devices/bus/rs232/xvd701.cpp
index 9b032606ea8..0022f3cc135 100644
--- a/src/devices/bus/rs232/xvd701.cpp
+++ b/src/devices/bus/rs232/xvd701.cpp
@@ -2,7 +2,7 @@
// copyright-holders:smf
#include "xvd701.h"
-jvc_xvd701_device::jvc_xvd701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+jvc_xvd701_device::jvc_xvd701_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, JVC_XVD701, "JVC XV-D701", tag, owner, clock, "xvd701", __FILE__),
device_serial_interface(mconfig, *this),
device_rs232_port_interface(mconfig, *this),
diff --git a/src/devices/bus/rs232/xvd701.h b/src/devices/bus/rs232/xvd701.h
index 29f6dd0a5a9..9c3c361b050 100644
--- a/src/devices/bus/rs232/xvd701.h
+++ b/src/devices/bus/rs232/xvd701.h
@@ -10,7 +10,7 @@ class jvc_xvd701_device : public device_t,
public device_rs232_port_interface
{
public:
- jvc_xvd701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ jvc_xvd701_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); }
diff --git a/src/devices/bus/s100/dj2db.cpp b/src/devices/bus/s100/dj2db.cpp
index 2d068245c47..48f58c4981f 100644
--- a/src/devices/bus/s100/dj2db.cpp
+++ b/src/devices/bus/s100/dj2db.cpp
@@ -250,7 +250,7 @@ ioport_constructor s100_dj2db_device::device_input_ports() const
// s100_dj2db_device - constructor
//-------------------------------------------------
-s100_dj2db_device::s100_dj2db_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+s100_dj2db_device::s100_dj2db_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, S100_DJ2DB, "DJ2DB", tag, owner, clock, "dj2db", __FILE__),
device_s100_card_interface(mconfig, *this),
m_fdc(*this, MB8866_TAG),
@@ -309,9 +309,9 @@ void s100_dj2db_device::device_reset()
// s100_smemr_r - memory read
//-------------------------------------------------
-UINT8 s100_dj2db_device::s100_smemr_r(address_space &space, offs_t offset)
+uint8_t s100_dj2db_device::s100_smemr_r(address_space &space, offs_t offset)
{
- UINT8 data = 0;
+ uint8_t data = 0;
// if (!(m_board_enbl & m_phantom)) return 0;
@@ -388,7 +388,7 @@ UINT8 s100_dj2db_device::s100_smemr_r(address_space &space, offs_t offset)
// s100_mwrt_w - memory write
//-------------------------------------------------
-void s100_dj2db_device::s100_mwrt_w(address_space &space, offs_t offset, UINT8 data)
+void s100_dj2db_device::s100_mwrt_w(address_space &space, offs_t offset, uint8_t data)
{
// if (!(m_board_enbl & m_phantom)) return;
@@ -481,7 +481,7 @@ void s100_dj2db_device::s100_mwrt_w(address_space &space, offs_t offset, UINT8 d
// s100_sinp_r - I/O read
//-------------------------------------------------
-UINT8 s100_dj2db_device::s100_sinp_r(address_space &space, offs_t offset)
+uint8_t s100_dj2db_device::s100_sinp_r(address_space &space, offs_t offset)
{
return 0;
}
@@ -491,7 +491,7 @@ UINT8 s100_dj2db_device::s100_sinp_r(address_space &space, offs_t offset)
// s100_sout_w - I/O write
//-------------------------------------------------
-void s100_dj2db_device::s100_sout_w(address_space &space, offs_t offset, UINT8 data)
+void s100_dj2db_device::s100_sout_w(address_space &space, offs_t offset, uint8_t data)
{
if (offset == 0x41)
{
diff --git a/src/devices/bus/s100/dj2db.h b/src/devices/bus/s100/dj2db.h
index 725b2f3144a..19de517522b 100644
--- a/src/devices/bus/s100/dj2db.h
+++ b/src/devices/bus/s100/dj2db.h
@@ -29,7 +29,7 @@ class s100_dj2db_device : public device_t,
{
public:
// construction/destruction
- s100_dj2db_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s100_dj2db_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -47,10 +47,10 @@ protected:
virtual void device_reset() override;
// device_s100_card_interface overrides
- virtual UINT8 s100_smemr_r(address_space &space, offs_t offset) override;
- virtual void s100_mwrt_w(address_space &space, offs_t offset, UINT8 data) override;
- virtual UINT8 s100_sinp_r(address_space &space, offs_t offset) override;
- virtual void s100_sout_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t s100_smemr_r(address_space &space, offs_t offset) override;
+ virtual void s100_mwrt_w(address_space &space, offs_t offset, uint8_t data) override;
+ virtual uint8_t s100_sinp_r(address_space &space, offs_t offset) override;
+ virtual void s100_sout_w(address_space &space, offs_t offset, uint8_t data) override;
virtual void s100_phantom_w(int state) override;
private:
@@ -63,7 +63,7 @@ private:
required_device<floppy_connector> m_floppy3;
floppy_image_device *m_floppy;
required_memory_region m_rom;
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
required_ioport m_j1a;
required_ioport m_j3a;
required_ioport m_j4;
diff --git a/src/devices/bus/s100/djdma.cpp b/src/devices/bus/s100/djdma.cpp
index 0d75e497040..427c063ceef 100644
--- a/src/devices/bus/s100/djdma.cpp
+++ b/src/devices/bus/s100/djdma.cpp
@@ -102,7 +102,7 @@ machine_config_constructor s100_djdma_device::device_mconfig_additions() const
// s100_djdma_device - constructor
//-------------------------------------------------
-s100_djdma_device::s100_djdma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+s100_djdma_device::s100_djdma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, S100_DJDMA, "DJDMA", tag, owner, clock, "djdma", __FILE__),
device_s100_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/s100/djdma.h b/src/devices/bus/s100/djdma.h
index a21e717493c..ce60e368630 100644
--- a/src/devices/bus/s100/djdma.h
+++ b/src/devices/bus/s100/djdma.h
@@ -28,7 +28,7 @@ class s100_djdma_device : public device_t,
{
public:
// construction/destruction
- s100_djdma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s100_djdma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/s100/mm65k16s.cpp b/src/devices/bus/s100/mm65k16s.cpp
index 1a6af3c4c89..058731005e8 100644
--- a/src/devices/bus/s100/mm65k16s.cpp
+++ b/src/devices/bus/s100/mm65k16s.cpp
@@ -201,7 +201,7 @@ ioport_constructor s100_mm65k16s_device::device_input_ports() const
// s100_mm65k16s_device - constructor
//-------------------------------------------------
-s100_mm65k16s_device::s100_mm65k16s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+s100_mm65k16s_device::s100_mm65k16s_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, S100_MM65K16S, "MM65K16S", tag, owner, clock, "mm65k16s", __FILE__),
device_s100_card_interface(mconfig, *this),
m_ram(*this, "ram")
@@ -232,9 +232,9 @@ void s100_mm65k16s_device::device_reset()
// s100_smemr_r - memory read
//-------------------------------------------------
-UINT8 s100_mm65k16s_device::s100_smemr_r(address_space &space, offs_t offset)
+uint8_t s100_mm65k16s_device::s100_smemr_r(address_space &space, offs_t offset)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (offset < 0xf800)
{
@@ -249,7 +249,7 @@ UINT8 s100_mm65k16s_device::s100_smemr_r(address_space &space, offs_t offset)
// s100_mwrt_w - memory write
//-------------------------------------------------
-void s100_mm65k16s_device::s100_mwrt_w(address_space &space, offs_t offset, UINT8 data)
+void s100_mm65k16s_device::s100_mwrt_w(address_space &space, offs_t offset, uint8_t data)
{
if (offset < 0xf800)
{
diff --git a/src/devices/bus/s100/mm65k16s.h b/src/devices/bus/s100/mm65k16s.h
index c8ec89af58c..d44d600ce7e 100644
--- a/src/devices/bus/s100/mm65k16s.h
+++ b/src/devices/bus/s100/mm65k16s.h
@@ -27,7 +27,7 @@ class s100_mm65k16s_device : public device_t,
{
public:
// construction/destruction
- s100_mm65k16s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s100_mm65k16s_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -39,12 +39,12 @@ protected:
virtual void device_reset() override;
// device_s100_card_interface overrides
- virtual UINT8 s100_smemr_r(address_space &space, offs_t offset) override;
- virtual void s100_mwrt_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t s100_smemr_r(address_space &space, offs_t offset) override;
+ virtual void s100_mwrt_w(address_space &space, offs_t offset, uint8_t data) override;
virtual void s100_phantom_w(int state) override;
private:
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
};
diff --git a/src/devices/bus/s100/nsmdsa.cpp b/src/devices/bus/s100/nsmdsa.cpp
index d892c1931e7..d39ef735ad5 100644
--- a/src/devices/bus/s100/nsmdsa.cpp
+++ b/src/devices/bus/s100/nsmdsa.cpp
@@ -81,7 +81,7 @@ machine_config_constructor s100_mds_a_device::device_mconfig_additions() const
// s100_mds_a_device - constructor
//-------------------------------------------------
-s100_mds_a_device::s100_mds_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+s100_mds_a_device::s100_mds_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, S100_MDS_A, "MDS-A", tag, owner, clock, "nsmdsa", __FILE__),
device_s100_card_interface(mconfig, *this),
m_floppy0(*this, "floppy0"),
@@ -114,7 +114,7 @@ void s100_mds_a_device::device_reset()
// s100_smemr_r - memory read
//-------------------------------------------------
-UINT8 s100_mds_a_device::s100_smemr_r(address_space &space, offs_t offset)
+uint8_t s100_mds_a_device::s100_smemr_r(address_space &space, offs_t offset)
{
return 0;
}
diff --git a/src/devices/bus/s100/nsmdsa.h b/src/devices/bus/s100/nsmdsa.h
index 3eb7f4049e4..96c0219dd5a 100644
--- a/src/devices/bus/s100/nsmdsa.h
+++ b/src/devices/bus/s100/nsmdsa.h
@@ -28,7 +28,7 @@ class s100_mds_a_device : public device_t,
{
public:
// construction/destruction
- s100_mds_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s100_mds_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -40,7 +40,7 @@ protected:
virtual void device_reset() override;
// device_s100_card_interface overrides
- virtual UINT8 s100_smemr_r(address_space &space, offs_t offset) override;
+ virtual uint8_t s100_smemr_r(address_space &space, offs_t offset) override;
private:
required_device<floppy_connector> m_floppy0;
diff --git a/src/devices/bus/s100/nsmdsad.cpp b/src/devices/bus/s100/nsmdsad.cpp
index 191c265cf59..bd6b6b1f9d7 100644
--- a/src/devices/bus/s100/nsmdsad.cpp
+++ b/src/devices/bus/s100/nsmdsad.cpp
@@ -82,7 +82,7 @@ machine_config_constructor s100_mds_ad_device::device_mconfig_additions() const
// s100_mds_ad_device - constructor
//-------------------------------------------------
-s100_mds_ad_device::s100_mds_ad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+s100_mds_ad_device::s100_mds_ad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, S100_MDS_AD, "MDS-A-D", tag, owner, clock, "nsmdsad", __FILE__),
device_s100_card_interface(mconfig, *this),
m_floppy0(*this, "floppy0"),
@@ -116,7 +116,7 @@ void s100_mds_ad_device::device_reset()
// s100_smemr_r - memory read
//-------------------------------------------------
-UINT8 s100_mds_ad_device::s100_smemr_r(address_space &space, offs_t offset)
+uint8_t s100_mds_ad_device::s100_smemr_r(address_space &space, offs_t offset)
{
return 0;
}
diff --git a/src/devices/bus/s100/nsmdsad.h b/src/devices/bus/s100/nsmdsad.h
index 105a526b0a6..f8c124d00e5 100644
--- a/src/devices/bus/s100/nsmdsad.h
+++ b/src/devices/bus/s100/nsmdsad.h
@@ -28,7 +28,7 @@ class s100_mds_ad_device : public device_t,
{
public:
// construction/destruction
- s100_mds_ad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s100_mds_ad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -40,7 +40,7 @@ protected:
virtual void device_reset() override;
// device_s100_card_interface overrides
- virtual UINT8 s100_smemr_r(address_space &space, offs_t offset) override;
+ virtual uint8_t s100_smemr_r(address_space &space, offs_t offset) override;
private:
required_device<floppy_connector> m_floppy0;
diff --git a/src/devices/bus/s100/s100.cpp b/src/devices/bus/s100/s100.cpp
index da63653b737..889c05b40f9 100644
--- a/src/devices/bus/s100/s100.cpp
+++ b/src/devices/bus/s100/s100.cpp
@@ -37,7 +37,7 @@ device_s100_card_interface::device_s100_card_interface(const machine_config &mco
//-------------------------------------------------
// s100_slot_t - constructor
//-------------------------------------------------
-s100_slot_t::s100_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+s100_slot_t::s100_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, S100_SLOT, "S100 slot", tag, owner, clock, "s100_slot", __FILE__),
device_slot_interface(mconfig, *this), m_bus(nullptr)
{
@@ -60,7 +60,7 @@ void s100_slot_t::device_start()
// s100_bus_t - constructor
//-------------------------------------------------
-s100_bus_t::s100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+s100_bus_t::s100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, S100_BUS, "S100", tag, owner, clock, "s100", __FILE__),
m_write_irq(*this),
m_write_nmi(*this),
@@ -136,7 +136,7 @@ void s100_bus_t::add_card(device_s100_card_interface *card)
READ8_MEMBER( s100_bus_t::smemr_r )
{
- UINT8 data = 0;
+ uint8_t data = 0;
device_s100_card_interface *entry = m_device_list.first();
@@ -172,7 +172,7 @@ WRITE8_MEMBER( s100_bus_t::mwrt_w )
READ8_MEMBER( s100_bus_t::sinp_r )
{
- UINT8 data = 0;
+ uint8_t data = 0;
device_s100_card_interface *entry = m_device_list.first();
diff --git a/src/devices/bus/s100/s100.h b/src/devices/bus/s100/s100.h
index 97d067f62e8..9a740bd3dd5 100644
--- a/src/devices/bus/s100/s100.h
+++ b/src/devices/bus/s100/s100.h
@@ -163,7 +163,7 @@ public:
// interrupts
virtual void s100_int_w(int state) { };
virtual void s100_nmi_w(int state) { };
- virtual UINT8 s100_sinta_r(offs_t offset) { return 0; };
+ virtual uint8_t s100_sinta_r(offs_t offset) { return 0; };
// vectored interrupts
virtual void s100_vi0_w(int state) { };
@@ -176,12 +176,12 @@ public:
virtual void s100_vi7_w(int state) { };
// memory access
- virtual UINT8 s100_smemr_r(address_space &space, offs_t offset) { return 0; };
- virtual void s100_mwrt_w(address_space &space, offs_t offset, UINT8 data) { };
+ virtual uint8_t s100_smemr_r(address_space &space, offs_t offset) { return 0; };
+ virtual void s100_mwrt_w(address_space &space, offs_t offset, uint8_t data) { };
// I/O access
- virtual UINT8 s100_sinp_r(address_space &space, offs_t offset) { return 0; };
- virtual void s100_sout_w(address_space &space, offs_t offset, UINT8 data) { };
+ virtual uint8_t s100_sinp_r(address_space &space, offs_t offset) { return 0; };
+ virtual void s100_sout_w(address_space &space, offs_t offset, uint8_t data) { };
// configuration access
virtual void s100_phlda_w(int state) { }
@@ -208,7 +208,7 @@ class s100_bus_t : public device_t
{
public:
// construction/destruction
- s100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
~s100_bus_t() { m_device_list.detach_all(); }
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<s100_bus_t &>(device).m_write_irq.set_callback(object); }
@@ -290,7 +290,7 @@ class s100_slot_t : public device_t,
{
public:
// construction/destruction
- s100_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s100_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/s100/wunderbus.cpp b/src/devices/bus/s100/wunderbus.cpp
index 37d10342d4e..b6e757217c9 100644
--- a/src/devices/bus/s100/wunderbus.cpp
+++ b/src/devices/bus/s100/wunderbus.cpp
@@ -236,7 +236,7 @@ ioport_constructor s100_wunderbus_device::device_input_ports() const
// s100_wunderbus_device - constructor
//-------------------------------------------------
-s100_wunderbus_device::s100_wunderbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+s100_wunderbus_device::s100_wunderbus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, S100_WUNDERBUS, "Wunderbus I/O", tag, owner, clock, "s100_wunderbus", __FILE__),
device_s100_card_interface(mconfig, *this),
m_pic(*this, I8259A_TAG),
@@ -302,12 +302,12 @@ void s100_wunderbus_device::s100_vi2_w(int state)
// s100_sinp_r - I/O read
//-------------------------------------------------
-UINT8 s100_wunderbus_device::s100_sinp_r(address_space &space, offs_t offset)
+uint8_t s100_wunderbus_device::s100_sinp_r(address_space &space, offs_t offset)
{
- UINT8 address = (m_7c->read() & 0x3e) << 2;
+ uint8_t address = (m_7c->read() & 0x3e) << 2;
if ((offset & 0xf8) != address) return 0;
- UINT8 data = 0;
+ uint8_t data = 0;
if ((offset & 0x07) < 7)
{
@@ -411,9 +411,9 @@ UINT8 s100_wunderbus_device::s100_sinp_r(address_space &space, offs_t offset)
// s100_sout_w - I/O write
//-------------------------------------------------
-void s100_wunderbus_device::s100_sout_w(address_space &space, offs_t offset, UINT8 data)
+void s100_wunderbus_device::s100_sout_w(address_space &space, offs_t offset, uint8_t data)
{
- UINT8 address = (m_7c->read() & 0x3e) << 2;
+ uint8_t address = (m_7c->read() & 0x3e) << 2;
if ((offset & 0xf8) != address) return;
if ((offset & 0x07) == 7)
diff --git a/src/devices/bus/s100/wunderbus.h b/src/devices/bus/s100/wunderbus.h
index 53aae135b06..5d2e37ed48b 100644
--- a/src/devices/bus/s100/wunderbus.h
+++ b/src/devices/bus/s100/wunderbus.h
@@ -29,7 +29,7 @@ class s100_wunderbus_device : public device_t,
{
public:
// construction/destruction
- s100_wunderbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s100_wunderbus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -48,8 +48,8 @@ protected:
virtual void s100_vi0_w(int state) override;
virtual void s100_vi1_w(int state) override;
virtual void s100_vi2_w(int state) override;
- virtual UINT8 s100_sinp_r(address_space &space, offs_t offset) override;
- virtual void s100_sout_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t s100_sinp_r(address_space &space, offs_t offset) override;
+ virtual void s100_sout_w(address_space &space, offs_t offset, uint8_t data) override;
private:
required_device<pic8259_device> m_pic;
@@ -60,7 +60,7 @@ private:
required_ioport m_7c;
required_ioport m_10a;
- UINT8 m_group;
+ uint8_t m_group;
int m_rtc_tp;
};
diff --git a/src/devices/bus/sat_ctrl/analog.cpp b/src/devices/bus/sat_ctrl/analog.cpp
index 32cf2092385..fe47de25800 100644
--- a/src/devices/bus/sat_ctrl/analog.cpp
+++ b/src/devices/bus/sat_ctrl/analog.cpp
@@ -62,7 +62,7 @@ ioport_constructor saturn_analog_device::device_input_ports() const
// saturn_analog_device - constructor
//-------------------------------------------------
-saturn_analog_device::saturn_analog_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+saturn_analog_device::saturn_analog_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SATURN_ANALOG, "Sega Saturn Analog Controller", tag, owner, clock, "saturn_analog", __FILE__),
device_saturn_control_port_interface(mconfig, *this),
m_joy(*this, "JOY"),
@@ -96,9 +96,9 @@ void saturn_analog_device::device_reset()
// read_ctrl
//-------------------------------------------------
-UINT8 saturn_analog_device::read_ctrl(UINT8 offset)
+uint8_t saturn_analog_device::read_ctrl(uint8_t offset)
{
- UINT8 res = 0;
+ uint8_t res = 0;
switch (offset)
{
case 0:
diff --git a/src/devices/bus/sat_ctrl/analog.h b/src/devices/bus/sat_ctrl/analog.h
index ebd99d570fa..670d2f09af1 100644
--- a/src/devices/bus/sat_ctrl/analog.h
+++ b/src/devices/bus/sat_ctrl/analog.h
@@ -26,7 +26,7 @@ class saturn_analog_device : public device_t,
{
public:
// construction/destruction
- saturn_analog_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_analog_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,9 +37,9 @@ protected:
virtual void device_reset() override;
// device_saturn_control_port_interface overrides
- virtual UINT8 read_ctrl(UINT8 offset) override;
- virtual UINT8 read_status() override { return 0xf1; }
- virtual UINT8 read_id(int idx) override { return m_ctrl_id; }
+ virtual uint8_t read_ctrl(uint8_t offset) override;
+ virtual uint8_t read_status() override { return 0xf1; }
+ virtual uint8_t read_id(int idx) override { return m_ctrl_id; }
private:
required_ioport m_joy;
diff --git a/src/devices/bus/sat_ctrl/ctrl.cpp b/src/devices/bus/sat_ctrl/ctrl.cpp
index 2d5473bbb19..884dcd118d4 100644
--- a/src/devices/bus/sat_ctrl/ctrl.cpp
+++ b/src/devices/bus/sat_ctrl/ctrl.cpp
@@ -58,7 +58,7 @@ device_saturn_control_port_interface::~device_saturn_control_port_interface()
// saturn_control_port_device - constructor
//-------------------------------------------------
-saturn_control_port_device::saturn_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+saturn_control_port_device::saturn_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SATURN_CONTROL_PORT, "Sega Saturn control port", tag, owner, clock, "saturn_control_port", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr)
{
@@ -84,9 +84,9 @@ void saturn_control_port_device::device_start()
}
-UINT8 saturn_control_port_device::read_status()
+uint8_t saturn_control_port_device::read_status()
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_device)
data |= m_device->read_status();
return data;
@@ -94,25 +94,25 @@ UINT8 saturn_control_port_device::read_status()
// Notice that the variable idx is only used by the multitap / segatap adapters
// Otherwise, any value is ignored and the unique controller ID is returned
-UINT8 saturn_control_port_device::read_id(int idx)
+uint8_t saturn_control_port_device::read_id(int idx)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_device)
data |= m_device->read_id(idx);
return data;
}
-UINT8 saturn_control_port_device::read_ctrl(UINT8 offset)
+uint8_t saturn_control_port_device::read_ctrl(uint8_t offset)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_device)
data |= m_device->read_ctrl(offset);
return data;
}
-UINT16 saturn_control_port_device::read_direct()
+uint16_t saturn_control_port_device::read_direct()
{
- UINT16 data = 0;
+ uint16_t data = 0;
if (m_device)
data |= m_device->read_direct();
return data;
diff --git a/src/devices/bus/sat_ctrl/ctrl.h b/src/devices/bus/sat_ctrl/ctrl.h
index ad3fe80cec7..255a02a9399 100644
--- a/src/devices/bus/sat_ctrl/ctrl.h
+++ b/src/devices/bus/sat_ctrl/ctrl.h
@@ -29,13 +29,13 @@ public:
device_saturn_control_port_interface(const machine_config &mconfig, device_t &device);
virtual ~device_saturn_control_port_interface();
- virtual UINT16 read_direct() { return 0; };
- virtual UINT8 read_ctrl(UINT8 offset) { return 0; };
- virtual UINT8 read_status() { return 0xf0; };
- virtual UINT8 read_id(int idx) { return 0xff; };
+ virtual uint16_t read_direct() { return 0; };
+ virtual uint8_t read_ctrl(uint8_t offset) { return 0; };
+ virtual uint8_t read_status() { return 0xf0; };
+ virtual uint8_t read_id(int idx) { return 0xff; };
protected:
- UINT8 m_ctrl_id;
+ uint8_t m_ctrl_id;
saturn_control_port_device *m_port;
};
@@ -46,13 +46,13 @@ class saturn_control_port_device : public device_t,
{
public:
// construction/destruction
- saturn_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~saturn_control_port_device();
- UINT16 read_direct();
- UINT8 read_ctrl(UINT8 offset);
- UINT8 read_status();
- UINT8 read_id(int idx);
+ uint16_t read_direct();
+ uint8_t read_ctrl(uint8_t offset);
+ uint8_t read_status();
+ uint8_t read_id(int idx);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/sat_ctrl/joy.cpp b/src/devices/bus/sat_ctrl/joy.cpp
index ff2ebb0733e..9a4ef6fd378 100644
--- a/src/devices/bus/sat_ctrl/joy.cpp
+++ b/src/devices/bus/sat_ctrl/joy.cpp
@@ -53,7 +53,7 @@ ioport_constructor saturn_joy_device::device_input_ports() const
// saturn_joy_device - constructor
//-------------------------------------------------
-saturn_joy_device::saturn_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+saturn_joy_device::saturn_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SATURN_JOY, "Sega Saturn Joypad", tag, owner, clock, "saturn_joy", __FILE__),
device_saturn_control_port_interface(mconfig, *this),
m_joy(*this, "JOY")
@@ -84,9 +84,9 @@ void saturn_joy_device::device_reset()
// read_ctrl
//-------------------------------------------------
-UINT8 saturn_joy_device::read_ctrl(UINT8 offset)
+uint8_t saturn_joy_device::read_ctrl(uint8_t offset)
{
- UINT8 res = 0;
+ uint8_t res = 0;
switch (offset)
{
case 0:
@@ -104,7 +104,7 @@ UINT8 saturn_joy_device::read_ctrl(UINT8 offset)
// read_direct
//-------------------------------------------------
-UINT16 saturn_joy_device::read_direct()
+uint16_t saturn_joy_device::read_direct()
{
return m_joy->read();
}
diff --git a/src/devices/bus/sat_ctrl/joy.h b/src/devices/bus/sat_ctrl/joy.h
index 58ec4e544c6..b9a54f1afcd 100644
--- a/src/devices/bus/sat_ctrl/joy.h
+++ b/src/devices/bus/sat_ctrl/joy.h
@@ -26,7 +26,7 @@ class saturn_joy_device : public device_t,
{
public:
// construction/destruction
- saturn_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,10 +37,10 @@ protected:
virtual void device_reset() override;
// device_saturn_control_port_interface overrides
- virtual UINT16 read_direct() override;
- virtual UINT8 read_ctrl(UINT8 offset) override;
- virtual UINT8 read_status() override { return 0xf1; }
- virtual UINT8 read_id(int idx) override { return m_ctrl_id; }
+ virtual uint16_t read_direct() override;
+ virtual uint8_t read_ctrl(uint8_t offset) override;
+ virtual uint8_t read_status() override { return 0xf1; }
+ virtual uint8_t read_id(int idx) override { return m_ctrl_id; }
private:
required_ioport m_joy;
diff --git a/src/devices/bus/sat_ctrl/joy_md.cpp b/src/devices/bus/sat_ctrl/joy_md.cpp
index d88753c591b..ae57cbb79a9 100644
--- a/src/devices/bus/sat_ctrl/joy_md.cpp
+++ b/src/devices/bus/sat_ctrl/joy_md.cpp
@@ -69,7 +69,7 @@ ioport_constructor saturn_joymd6b_device::device_input_ports() const
// constructors
//-------------------------------------------------
-saturn_joymd3b_device::saturn_joymd3b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+saturn_joymd3b_device::saturn_joymd3b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SATURN_JOYMD3B, "Sega Saturn Joypad MD 3buttons", tag, owner, clock, "saturn_md3b", __FILE__),
device_saturn_control_port_interface(mconfig, *this),
m_joy(*this, "JOY")
@@ -78,7 +78,7 @@ saturn_joymd3b_device::saturn_joymd3b_device(const machine_config &mconfig, cons
}
-saturn_joymd6b_device::saturn_joymd6b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+saturn_joymd6b_device::saturn_joymd6b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SATURN_JOYMD6B, "Sega Saturn Joypad MD 6buttons", tag, owner, clock, "saturn_md6b", __FILE__),
device_saturn_control_port_interface(mconfig, *this),
m_joy(*this, "JOY")
@@ -91,9 +91,9 @@ saturn_joymd6b_device::saturn_joymd6b_device(const machine_config &mconfig, cons
// read_ctrl
//-------------------------------------------------
-UINT8 saturn_joymd3b_device::read_ctrl(UINT8 offset)
+uint8_t saturn_joymd3b_device::read_ctrl(uint8_t offset)
{
- UINT8 res = 0;
+ uint8_t res = 0;
switch (offset)
{
case 0:
@@ -104,9 +104,9 @@ UINT8 saturn_joymd3b_device::read_ctrl(UINT8 offset)
return res;
}
-UINT8 saturn_joymd6b_device::read_ctrl(UINT8 offset)
+uint8_t saturn_joymd6b_device::read_ctrl(uint8_t offset)
{
- UINT8 res = 0;
+ uint8_t res = 0;
switch (offset)
{
case 0:
diff --git a/src/devices/bus/sat_ctrl/joy_md.h b/src/devices/bus/sat_ctrl/joy_md.h
index 8c2505aad5e..a19596fcdab 100644
--- a/src/devices/bus/sat_ctrl/joy_md.h
+++ b/src/devices/bus/sat_ctrl/joy_md.h
@@ -26,7 +26,7 @@ class saturn_joymd3b_device : public device_t,
{
public:
// construction/destruction
- saturn_joymd3b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_joymd3b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,9 +37,9 @@ protected:
virtual void device_reset() override {};
// device_saturn_control_port_interface overrides
- virtual UINT8 read_ctrl(UINT8 offset) override;
- virtual UINT8 read_status() override { return 0xf1; }
- virtual UINT8 read_id(int idx) override { return m_ctrl_id; }
+ virtual uint8_t read_ctrl(uint8_t offset) override;
+ virtual uint8_t read_status() override { return 0xf1; }
+ virtual uint8_t read_id(int idx) override { return m_ctrl_id; }
private:
required_ioport m_joy;
@@ -53,7 +53,7 @@ class saturn_joymd6b_device : public device_t,
{
public:
// construction/destruction
- saturn_joymd6b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_joymd6b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -64,9 +64,9 @@ protected:
virtual void device_reset() override {};
// device_saturn_control_port_interface overrides
- virtual UINT8 read_ctrl(UINT8 offset) override;
- virtual UINT8 read_status() override { return 0xf1; }
- virtual UINT8 read_id(int idx) override { return m_ctrl_id; }
+ virtual uint8_t read_ctrl(uint8_t offset) override;
+ virtual uint8_t read_status() override { return 0xf1; }
+ virtual uint8_t read_id(int idx) override { return m_ctrl_id; }
private:
required_ioport m_joy;
diff --git a/src/devices/bus/sat_ctrl/keybd.cpp b/src/devices/bus/sat_ctrl/keybd.cpp
index d84922929ff..b257ae2878c 100644
--- a/src/devices/bus/sat_ctrl/keybd.cpp
+++ b/src/devices/bus/sat_ctrl/keybd.cpp
@@ -205,7 +205,7 @@ ioport_constructor saturn_keybd_device::device_input_ports() const
// saturn_keybd_device - constructor
//-------------------------------------------------
-saturn_keybd_device::saturn_keybd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+saturn_keybd_device::saturn_keybd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SATURN_KEYBD, "Sega Saturn Keyboard", tag, owner, clock, "saturn_keybd", __FILE__),
device_saturn_control_port_interface(mconfig, *this),
m_key(*this, "KEY.%u", 0),
@@ -250,7 +250,7 @@ INPUT_CHANGED_MEMBER(saturn_keybd_device::key_stroke)
{
if (newval && !oldval)
{
- m_data = ((UINT8)(uintptr_t)(param) & 0xff);
+ m_data = ((uint8_t)(uintptr_t)(param) & 0xff);
m_status |= 8;
}
@@ -261,9 +261,9 @@ INPUT_CHANGED_MEMBER(saturn_keybd_device::key_stroke)
}
}
-UINT16 saturn_keybd_device::get_game_key()
+uint16_t saturn_keybd_device::get_game_key()
{
- UINT16 game_key = 0xffff;
+ uint16_t game_key = 0xffff;
game_key ^= ((m_key_s1->read() & 0x80) << 8); // right
game_key ^= ((m_key_s1->read() & 0x40) << 8); // left
@@ -282,9 +282,9 @@ UINT16 saturn_keybd_device::get_game_key()
return game_key;
}
-UINT8 saturn_keybd_device::read_ctrl(UINT8 offset)
+uint8_t saturn_keybd_device::read_ctrl(uint8_t offset)
{
- UINT8 res = 0;
+ uint8_t res = 0;
/*
Keyboard Status hook-up
diff --git a/src/devices/bus/sat_ctrl/keybd.h b/src/devices/bus/sat_ctrl/keybd.h
index 314e87bf118..18585c6d976 100644
--- a/src/devices/bus/sat_ctrl/keybd.h
+++ b/src/devices/bus/sat_ctrl/keybd.h
@@ -26,7 +26,7 @@ class saturn_keybd_device : public device_t,
{
public:
// construction/destruction
- saturn_keybd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_keybd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -39,17 +39,17 @@ protected:
virtual void device_reset() override;
// device_saturn_control_port_interface overrides
- virtual UINT8 read_ctrl(UINT8 offset) override;
- virtual UINT8 read_status() override { return 0xf1; }
- virtual UINT8 read_id(int idx) override { return m_ctrl_id; }
+ virtual uint8_t read_ctrl(uint8_t offset) override;
+ virtual uint8_t read_status() override { return 0xf1; }
+ virtual uint8_t read_id(int idx) override { return m_ctrl_id; }
private:
- UINT8 m_status;
- UINT8 m_data;
- UINT8 m_prev_data;
- UINT16 m_repeat_count;
+ uint8_t m_status;
+ uint8_t m_data;
+ uint8_t m_prev_data;
+ uint16_t m_repeat_count;
- UINT16 get_game_key();
+ uint16_t get_game_key();
required_ioport_array<16> m_key;
required_ioport m_key_s1;
diff --git a/src/devices/bus/sat_ctrl/mouse.cpp b/src/devices/bus/sat_ctrl/mouse.cpp
index 45ac96ea6d2..66618edccac 100644
--- a/src/devices/bus/sat_ctrl/mouse.cpp
+++ b/src/devices/bus/sat_ctrl/mouse.cpp
@@ -50,7 +50,7 @@ ioport_constructor saturn_mouse_device::device_input_ports() const
// saturn_mouse_device - constructor
//-------------------------------------------------
-saturn_mouse_device::saturn_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+saturn_mouse_device::saturn_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SATURN_MOUSE, "Sega Saturn Mouse", tag, owner, clock, "saturn_mouse", __FILE__),
device_saturn_control_port_interface(mconfig, *this),
m_pointx(*this, "MOUSE_X"),
@@ -83,12 +83,12 @@ void saturn_mouse_device::device_reset()
// read_ctrl
//-------------------------------------------------
-UINT8 saturn_mouse_device::read_ctrl(UINT8 offset)
+uint8_t saturn_mouse_device::read_ctrl(uint8_t offset)
{
- UINT8 res = 0;
- UINT8 mouse_ctrl = m_buttons->read();
- INT16 mouse_x = m_pointx->read();
- INT16 mouse_y = m_pointy->read();
+ uint8_t res = 0;
+ uint8_t mouse_ctrl = m_buttons->read();
+ int16_t mouse_x = m_pointx->read();
+ int16_t mouse_y = m_pointy->read();
if (mouse_x < 0)
mouse_ctrl |= 0x10;
diff --git a/src/devices/bus/sat_ctrl/mouse.h b/src/devices/bus/sat_ctrl/mouse.h
index 87e1d847e8c..562602ad778 100644
--- a/src/devices/bus/sat_ctrl/mouse.h
+++ b/src/devices/bus/sat_ctrl/mouse.h
@@ -26,7 +26,7 @@ class saturn_mouse_device : public device_t,
{
public:
// construction/destruction
- saturn_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,9 +37,9 @@ protected:
virtual void device_reset() override;
// device_saturn_control_port_interface overrides
- virtual UINT8 read_ctrl(UINT8 offset) override;
- virtual UINT8 read_status() override { return 0xf1; }
- virtual UINT8 read_id(int idx) override { return m_ctrl_id; }
+ virtual uint8_t read_ctrl(uint8_t offset) override;
+ virtual uint8_t read_status() override { return 0xf1; }
+ virtual uint8_t read_id(int idx) override { return m_ctrl_id; }
private:
required_ioport m_pointx;
diff --git a/src/devices/bus/sat_ctrl/multitap.cpp b/src/devices/bus/sat_ctrl/multitap.cpp
index 4de26acb070..94c2384e084 100644
--- a/src/devices/bus/sat_ctrl/multitap.cpp
+++ b/src/devices/bus/sat_ctrl/multitap.cpp
@@ -25,7 +25,7 @@ const device_type SATURN_MULTITAP = &device_creator<saturn_multitap_device>;
// saturn_multitap_device - constructor
//-------------------------------------------------
-saturn_multitap_device::saturn_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+saturn_multitap_device::saturn_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SATURN_MULTITAP, "Sega Saturn Multitap", tag, owner, clock, "saturn_multitap", __FILE__),
device_saturn_control_port_interface(mconfig, *this),
m_subctrl1_port(*this, "ctrl1"),
@@ -64,9 +64,9 @@ void saturn_multitap_device::device_reset()
// read_ctrl
//-------------------------------------------------
-UINT8 saturn_multitap_device::read_ctrl(UINT8 offset)
+uint8_t saturn_multitap_device::read_ctrl(uint8_t offset)
{
- UINT8 res = 0;
+ uint8_t res = 0;
switch (offset)
{
default:
@@ -102,7 +102,7 @@ UINT8 saturn_multitap_device::read_ctrl(UINT8 offset)
// read_id
//-------------------------------------------------
-UINT8 saturn_multitap_device::read_id(int idx)
+uint8_t saturn_multitap_device::read_id(int idx)
{
switch (idx)
{
diff --git a/src/devices/bus/sat_ctrl/multitap.h b/src/devices/bus/sat_ctrl/multitap.h
index acc8f109e3e..41715846c84 100644
--- a/src/devices/bus/sat_ctrl/multitap.h
+++ b/src/devices/bus/sat_ctrl/multitap.h
@@ -28,7 +28,7 @@ class saturn_multitap_device : public device_t,
{
public:
// construction/destruction
- saturn_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -39,9 +39,9 @@ protected:
virtual void device_reset() override;
// device_saturn_control_port_interface overrides
- virtual UINT8 read_ctrl(UINT8 offset) override;
- virtual UINT8 read_status() override { return 0x16; }
- virtual UINT8 read_id(int idx) override;
+ virtual uint8_t read_ctrl(uint8_t offset) override;
+ virtual uint8_t read_status() override { return 0x16; }
+ virtual uint8_t read_id(int idx) override;
private:
required_device<saturn_control_port_device> m_subctrl1_port;
diff --git a/src/devices/bus/sat_ctrl/pointer.cpp b/src/devices/bus/sat_ctrl/pointer.cpp
index 9762286dbbe..efc39966085 100644
--- a/src/devices/bus/sat_ctrl/pointer.cpp
+++ b/src/devices/bus/sat_ctrl/pointer.cpp
@@ -50,7 +50,7 @@ ioport_constructor saturn_track_device::device_input_ports() const
// saturn_track_device - constructor
//-------------------------------------------------
-saturn_track_device::saturn_track_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+saturn_track_device::saturn_track_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SATURN_TRACK, "Sega Saturn Pointing Controller / Trackball", tag, owner, clock, "saturn_track", __FILE__),
device_saturn_control_port_interface(mconfig, *this),
m_pointx(*this, "POINT_X"),
@@ -83,12 +83,12 @@ void saturn_track_device::device_reset()
// read_ctrl
//-------------------------------------------------
-UINT8 saturn_track_device::read_ctrl(UINT8 offset)
+uint8_t saturn_track_device::read_ctrl(uint8_t offset)
{
- UINT8 res = 0;
- UINT8 mouse_ctrl = m_buttons->read();
- INT16 mouse_x = m_pointx->read();
- INT16 mouse_y = m_pointy->read();
+ uint8_t res = 0;
+ uint8_t mouse_ctrl = m_buttons->read();
+ int16_t mouse_x = m_pointx->read();
+ int16_t mouse_y = m_pointy->read();
if (mouse_x < 0)
mouse_ctrl |= 0x10;
diff --git a/src/devices/bus/sat_ctrl/pointer.h b/src/devices/bus/sat_ctrl/pointer.h
index 9b9a8986a3f..e060ea07d43 100644
--- a/src/devices/bus/sat_ctrl/pointer.h
+++ b/src/devices/bus/sat_ctrl/pointer.h
@@ -26,7 +26,7 @@ class saturn_track_device : public device_t,
{
public:
// construction/destruction
- saturn_track_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_track_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,9 +37,9 @@ protected:
virtual void device_reset() override;
// device_saturn_control_port_interface overrides
- virtual UINT8 read_ctrl(UINT8 offset) override;
- virtual UINT8 read_status() override { return 0xf1; }
- virtual UINT8 read_id(int idx) override { return m_ctrl_id; }
+ virtual uint8_t read_ctrl(uint8_t offset) override;
+ virtual uint8_t read_status() override { return 0xf1; }
+ virtual uint8_t read_id(int idx) override { return m_ctrl_id; }
private:
required_ioport m_pointx;
diff --git a/src/devices/bus/sat_ctrl/racing.cpp b/src/devices/bus/sat_ctrl/racing.cpp
index 0f86c6d3d23..25f4653bd21 100644
--- a/src/devices/bus/sat_ctrl/racing.cpp
+++ b/src/devices/bus/sat_ctrl/racing.cpp
@@ -56,7 +56,7 @@ ioport_constructor saturn_wheel_device::device_input_ports() const
// saturn_wheel_device - constructor
//-------------------------------------------------
-saturn_wheel_device::saturn_wheel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+saturn_wheel_device::saturn_wheel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SATURN_WHEEL, "Sega Saturn Racing Wheel", tag, owner, clock, "saturn_racing", __FILE__),
device_saturn_control_port_interface(mconfig, *this),
m_joy(*this, "JOY"),
@@ -88,9 +88,9 @@ void saturn_wheel_device::device_reset()
// read_ctrl
//-------------------------------------------------
-UINT8 saturn_wheel_device::read_ctrl(UINT8 offset)
+uint8_t saturn_wheel_device::read_ctrl(uint8_t offset)
{
- UINT8 res = 0;
+ uint8_t res = 0;
switch (offset)
{
case 0:
diff --git a/src/devices/bus/sat_ctrl/racing.h b/src/devices/bus/sat_ctrl/racing.h
index 3edb9658d34..14fc3f2e0c6 100644
--- a/src/devices/bus/sat_ctrl/racing.h
+++ b/src/devices/bus/sat_ctrl/racing.h
@@ -26,7 +26,7 @@ class saturn_wheel_device : public device_t,
{
public:
// construction/destruction
- saturn_wheel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_wheel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,9 +37,9 @@ protected:
virtual void device_reset() override;
// device_saturn_control_port_interface overrides
- virtual UINT8 read_ctrl(UINT8 offset) override;
- virtual UINT8 read_status() override { return 0xf1; }
- virtual UINT8 read_id(int idx) override { return m_ctrl_id; }
+ virtual uint8_t read_ctrl(uint8_t offset) override;
+ virtual uint8_t read_status() override { return 0xf1; }
+ virtual uint8_t read_id(int idx) override { return m_ctrl_id; }
private:
required_ioport m_joy;
diff --git a/src/devices/bus/sat_ctrl/segatap.cpp b/src/devices/bus/sat_ctrl/segatap.cpp
index 7b759902cd7..508f06d655f 100644
--- a/src/devices/bus/sat_ctrl/segatap.cpp
+++ b/src/devices/bus/sat_ctrl/segatap.cpp
@@ -25,7 +25,7 @@ const device_type SATURN_SEGATAP = &device_creator<saturn_segatap_device>;
// saturn_segatap_device - constructor
//-------------------------------------------------
-saturn_segatap_device::saturn_segatap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+saturn_segatap_device::saturn_segatap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SATURN_SEGATAP, "Sega Saturn SegaTap", tag, owner, clock, "saturn_segatap", __FILE__),
device_saturn_control_port_interface(mconfig, *this),
m_subctrl1_port(*this, "ctrl1"),
@@ -60,9 +60,9 @@ void saturn_segatap_device::device_reset()
// read_ctrl
//-------------------------------------------------
-UINT8 saturn_segatap_device::read_ctrl(UINT8 offset)
+uint8_t saturn_segatap_device::read_ctrl(uint8_t offset)
{
- UINT8 res = 0;
+ uint8_t res = 0;
switch (offset)
{
default:
@@ -90,7 +90,7 @@ UINT8 saturn_segatap_device::read_ctrl(UINT8 offset)
// read_id
//-------------------------------------------------
-UINT8 saturn_segatap_device::read_id(int idx)
+uint8_t saturn_segatap_device::read_id(int idx)
{
switch (idx)
{
diff --git a/src/devices/bus/sat_ctrl/segatap.h b/src/devices/bus/sat_ctrl/segatap.h
index 149fb05f551..744b7e45620 100644
--- a/src/devices/bus/sat_ctrl/segatap.h
+++ b/src/devices/bus/sat_ctrl/segatap.h
@@ -28,7 +28,7 @@ class saturn_segatap_device : public device_t,
{
public:
// construction/destruction
- saturn_segatap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_segatap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -39,9 +39,9 @@ protected:
virtual void device_reset() override;
// device_saturn_control_port_interface overrides
- virtual UINT8 read_ctrl(UINT8 offset) override;
- virtual UINT8 read_status() override { return 0x04; }
- virtual UINT8 read_id(int idx) override;
+ virtual uint8_t read_ctrl(uint8_t offset) override;
+ virtual uint8_t read_status() override { return 0x04; }
+ virtual uint8_t read_id(int idx) override;
private:
required_device<saturn_control_port_device> m_subctrl1_port;
diff --git a/src/devices/bus/saturn/bram.cpp b/src/devices/bus/saturn/bram.cpp
index 28d0aba2945..497580a9973 100644
--- a/src/devices/bus/saturn/bram.cpp
+++ b/src/devices/bus/saturn/bram.cpp
@@ -21,32 +21,32 @@ const device_type SATURN_BRAM_16MB = &device_creator<saturn_bram16mb_device>;
const device_type SATURN_BRAM_32MB = &device_creator<saturn_bram32mb_device>;
-saturn_bram_device::saturn_bram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+saturn_bram_device::saturn_bram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sat_cart_interface( mconfig, *this ),
device_nvram_interface(mconfig, *this)
{
}
-saturn_bram4mb_device::saturn_bram4mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saturn_bram4mb_device::saturn_bram4mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: saturn_bram_device(mconfig, SATURN_BRAM_4MB, "Saturn Battery RAM 4Mbit Cart", tag, owner, clock, "sat_bram_4mb", __FILE__)
{
m_cart_type = 0x21;
}
-saturn_bram8mb_device::saturn_bram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saturn_bram8mb_device::saturn_bram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: saturn_bram_device(mconfig, SATURN_BRAM_8MB, "Saturn Battery RAM 8Mbit Cart", tag, owner, clock, "sat_bram_8mb", __FILE__)
{
m_cart_type = 0x22;
}
-saturn_bram16mb_device::saturn_bram16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saturn_bram16mb_device::saturn_bram16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: saturn_bram_device(mconfig, SATURN_BRAM_16MB, "Saturn Battery RAM 16Mbit Cart", tag, owner, clock, "sat_bram_16mb", __FILE__)
{
m_cart_type = 0x23;
}
-saturn_bram32mb_device::saturn_bram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saturn_bram32mb_device::saturn_bram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: saturn_bram_device(mconfig, SATURN_BRAM_32MB, "Saturn Battery RAM 32Mbit Cart", tag, owner, clock, "sat_bram_32mb", __FILE__)
{
m_cart_type = 0x24;
@@ -67,7 +67,7 @@ void saturn_bram_device::device_reset()
void saturn_bram_device::nvram_default()
{
- static const UINT8 init[16] =
+ static const uint8_t init[16] =
{ 'B', 'a', 'c', 'k', 'U', 'p', 'R', 'a', 'm', ' ', 'F', 'o', 'r', 'm', 'a', 't' };
memset(&m_ext_bram[0], 0, m_ext_bram.size());
diff --git a/src/devices/bus/saturn/bram.h b/src/devices/bus/saturn/bram.h
index e6237ff76ce..7a96d11706f 100644
--- a/src/devices/bus/saturn/bram.h
+++ b/src/devices/bus/saturn/bram.h
@@ -14,7 +14,7 @@ class saturn_bram_device : public device_t,
{
public:
// construction/destruction
- saturn_bram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ saturn_bram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -34,28 +34,28 @@ class saturn_bram4mb_device : public saturn_bram_device
{
public:
// construction/destruction
- saturn_bram4mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_bram4mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class saturn_bram8mb_device : public saturn_bram_device
{
public:
// construction/destruction
- saturn_bram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_bram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class saturn_bram16mb_device : public saturn_bram_device
{
public:
// construction/destruction
- saturn_bram16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_bram16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class saturn_bram32mb_device : public saturn_bram_device
{
public:
// construction/destruction
- saturn_bram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_bram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
diff --git a/src/devices/bus/saturn/dram.cpp b/src/devices/bus/saturn/dram.cpp
index d1078fcc722..c7b96edff91 100644
--- a/src/devices/bus/saturn/dram.cpp
+++ b/src/devices/bus/saturn/dram.cpp
@@ -19,19 +19,19 @@ const device_type SATURN_DRAM_8MB = &device_creator<saturn_dram8mb_device>;
const device_type SATURN_DRAM_32MB = &device_creator<saturn_dram32mb_device>;
-saturn_dram_device::saturn_dram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+saturn_dram_device::saturn_dram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sat_cart_interface( mconfig, *this )
{
}
-saturn_dram8mb_device::saturn_dram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saturn_dram8mb_device::saturn_dram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: saturn_dram_device(mconfig, SATURN_DRAM_8MB, "Saturn Data RAM 8Mbit Cart", tag, owner, clock, "sat_dram_8mb", __FILE__)
{
m_cart_type = 0x5a;
}
-saturn_dram32mb_device::saturn_dram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saturn_dram32mb_device::saturn_dram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: saturn_dram_device(mconfig, SATURN_DRAM_32MB, "Saturn Data RAM 32Mbit Cart", tag, owner, clock, "sat_dram_32mb", __FILE__)
{
m_cart_type = 0x5c;
diff --git a/src/devices/bus/saturn/dram.h b/src/devices/bus/saturn/dram.h
index 29ddbfcbcdc..3cf89b50093 100644
--- a/src/devices/bus/saturn/dram.h
+++ b/src/devices/bus/saturn/dram.h
@@ -13,7 +13,7 @@ class saturn_dram_device : public device_t,
{
public:
// construction/destruction
- saturn_dram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ saturn_dram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -30,14 +30,14 @@ class saturn_dram8mb_device : public saturn_dram_device
{
public:
// construction/destruction
- saturn_dram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_dram8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class saturn_dram32mb_device : public saturn_dram_device
{
public:
// construction/destruction
- saturn_dram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_dram32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
diff --git a/src/devices/bus/saturn/rom.cpp b/src/devices/bus/saturn/rom.cpp
index 7b8068735a1..3fbb441b6c6 100644
--- a/src/devices/bus/saturn/rom.cpp
+++ b/src/devices/bus/saturn/rom.cpp
@@ -18,13 +18,13 @@
const device_type SATURN_ROM = &device_creator<saturn_rom_device>;
-saturn_rom_device::saturn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+saturn_rom_device::saturn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sat_cart_interface( mconfig, *this )
{
}
-saturn_rom_device::saturn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+saturn_rom_device::saturn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SATURN_ROM, "Saturn ROM Carts", tag, owner, clock, "sat_rom", __FILE__),
device_sat_cart_interface( mconfig, *this )
{
diff --git a/src/devices/bus/saturn/rom.h b/src/devices/bus/saturn/rom.h
index ffd80e272ee..8f377bf2164 100644
--- a/src/devices/bus/saturn/rom.h
+++ b/src/devices/bus/saturn/rom.h
@@ -13,8 +13,8 @@ class saturn_rom_device : public device_t,
{
public:
// construction/destruction
- saturn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- saturn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ saturn_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ saturn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/saturn/sat_slot.cpp b/src/devices/bus/saturn/sat_slot.cpp
index 56137e39634..49e708d7cad 100644
--- a/src/devices/bus/saturn/sat_slot.cpp
+++ b/src/devices/bus/saturn/sat_slot.cpp
@@ -56,11 +56,11 @@ device_sat_cart_interface::~device_sat_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_sat_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_sat_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
- m_rom = (UINT32 *)device().machine().memory().region_alloc(std::string(tag).append(SATSLOT_ROM_REGION_TAG).c_str(), size, 4, ENDIANNESS_LITTLE)->base();
+ m_rom = (uint32_t *)device().machine().memory().region_alloc(std::string(tag).append(SATSLOT_ROM_REGION_TAG).c_str(), size, 4, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}
}
@@ -70,7 +70,7 @@ void device_sat_cart_interface::rom_alloc(UINT32 size, const char *tag)
// bram_alloc - alloc the space for the Backup RAM
//-------------------------------------------------
-void device_sat_cart_interface::bram_alloc(UINT32 size)
+void device_sat_cart_interface::bram_alloc(uint32_t size)
{
m_ext_bram.resize(size);
device().save_item(NAME(m_ext_bram));
@@ -81,15 +81,15 @@ void device_sat_cart_interface::bram_alloc(UINT32 size)
// dram*_alloc - alloc the space for the DRAM
//-------------------------------------------------
-void device_sat_cart_interface::dram0_alloc(UINT32 size)
+void device_sat_cart_interface::dram0_alloc(uint32_t size)
{
- m_ext_dram0.resize(size/sizeof(UINT32));
+ m_ext_dram0.resize(size/sizeof(uint32_t));
device().save_item(NAME(m_ext_dram0));
}
-void device_sat_cart_interface::dram1_alloc(UINT32 size)
+void device_sat_cart_interface::dram1_alloc(uint32_t size)
{
- m_ext_dram1.resize(size/sizeof(UINT32));
+ m_ext_dram1.resize(size/sizeof(uint32_t));
device().save_item(NAME(m_ext_dram1));
}
@@ -101,7 +101,7 @@ void device_sat_cart_interface::dram1_alloc(UINT32 size)
//-------------------------------------------------
// sat_cart_slot_device - constructor
//-------------------------------------------------
-sat_cart_slot_device::sat_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sat_cart_slot_device::sat_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SATURN_CART_SLOT, "Saturn Cartridge Slot", tag, owner, clock, "sat_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr)
@@ -154,8 +154,8 @@ image_init_result sat_cart_slot_device::call_load()
if (is_rom)
{
// from fullpath, only ROM carts
- UINT32 len = (software_entry() != nullptr) ? get_software_region_length("rom") : length();
- UINT32 *ROM;
+ uint32_t len = (software_entry() != nullptr) ? get_software_region_length("rom") : length();
+ uint32_t *ROM;
m_cart->rom_alloc(len, tag());
ROM = m_cart->get_rom_base();
@@ -169,8 +169,8 @@ image_init_result sat_cart_slot_device::call_load()
for (int i = 0; i < len/4; i ++)
ROM[i] = BITSWAP32(ROM[i],7,6,5,4,3,2,1,0,15,14,13,12,11,10,9,8,23,22,21,20,19,18,17,16,31,30,29,28,27,26,25,24);
// {
-// UINT8 tempa = ROM[i+0];
-// UINT8 tempb = ROM[i+1];
+// uint8_t tempa = ROM[i+0];
+// uint8_t tempb = ROM[i+1];
// ROM[i+1] = ROM[i+2];
// ROM[i+0] = ROM[i+3];
// ROM[i+3] = tempa;
diff --git a/src/devices/bus/saturn/sat_slot.h b/src/devices/bus/saturn/sat_slot.h
index 5aec2dfdd40..40cd5fd23e6 100644
--- a/src/devices/bus/saturn/sat_slot.h
+++ b/src/devices/bus/saturn/sat_slot.h
@@ -34,28 +34,28 @@ public:
virtual int get_cart_type() { return m_cart_type; };
- void rom_alloc(UINT32 size, const char *tag);
- void bram_alloc(UINT32 size);
- void dram0_alloc(UINT32 size);
- void dram1_alloc(UINT32 size);
- UINT32* get_rom_base() { return m_rom; }
- UINT32* get_ext_dram0_base() { return &m_ext_dram0[0]; }
- UINT32* get_ext_dram1_base() { return &m_ext_dram1[0]; }
- UINT8* get_ext_bram_base() { return &m_ext_bram[0]; }
- UINT32 get_rom_size() { return m_rom_size; }
- UINT32 get_ext_dram0_size() { return m_ext_dram0.size()*sizeof(UINT32); }
- UINT32 get_ext_dram1_size() { return m_ext_dram1.size()*sizeof(UINT32); }
- UINT32 get_ext_bram_size() { return m_ext_bram.size(); }
+ void rom_alloc(uint32_t size, const char *tag);
+ void bram_alloc(uint32_t size);
+ void dram0_alloc(uint32_t size);
+ void dram1_alloc(uint32_t size);
+ uint32_t* get_rom_base() { return m_rom; }
+ uint32_t* get_ext_dram0_base() { return &m_ext_dram0[0]; }
+ uint32_t* get_ext_dram1_base() { return &m_ext_dram1[0]; }
+ uint8_t* get_ext_bram_base() { return &m_ext_bram[0]; }
+ uint32_t get_rom_size() { return m_rom_size; }
+ uint32_t get_ext_dram0_size() { return m_ext_dram0.size()*sizeof(uint32_t); }
+ uint32_t get_ext_dram1_size() { return m_ext_dram1.size()*sizeof(uint32_t); }
+ uint32_t get_ext_bram_size() { return m_ext_bram.size(); }
protected:
int m_cart_type;
// internal state
- UINT32 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT32> m_ext_dram0;
- std::vector<UINT32> m_ext_dram1;
- std::vector<UINT8> m_ext_bram;
+ uint32_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint32_t> m_ext_dram0;
+ std::vector<uint32_t> m_ext_dram1;
+ std::vector<uint8_t> m_ext_bram;
};
@@ -67,7 +67,7 @@ class sat_cart_slot_device : public device_t,
{
public:
// construction/destruction
- sat_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sat_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~sat_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/scsi/acb4070.cpp b/src/devices/bus/scsi/acb4070.cpp
index 1503272b55c..695b9527842 100644
--- a/src/devices/bus/scsi/acb4070.cpp
+++ b/src/devices/bus/scsi/acb4070.cpp
@@ -10,7 +10,7 @@
// device type definition
const device_type ACB4070 = &device_creator<acb4070_device>;
-acb4070_device::acb4070_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+acb4070_device::acb4070_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: scsihd_device(mconfig, ACB4070, "ACB4070", tag, owner, clock, "acb4070", __FILE__)
{
}
@@ -48,7 +48,7 @@ void acb4070_device::ExecCommand()
}
}
-void acb4070_device::WriteData( UINT8 *data, int dataLength )
+void acb4070_device::WriteData( uint8_t *data, int dataLength )
{
switch( command[ 0 ] )
{
diff --git a/src/devices/bus/scsi/acb4070.h b/src/devices/bus/scsi/acb4070.h
index ea9b1583c28..b983aad0477 100644
--- a/src/devices/bus/scsi/acb4070.h
+++ b/src/devices/bus/scsi/acb4070.h
@@ -11,33 +11,33 @@ class acb4070_device : public scsihd_device
{
public:
// construction/destruction
- acb4070_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ acb4070_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void ExecCommand() override;
- virtual void WriteData( UINT8 *data, int dataLength ) override;
+ virtual void WriteData( uint8_t *data, int dataLength ) override;
private:
struct adaptec_sense_t
{
// parameter list
- UINT8 reserved1[3];
- UINT8 length;
+ uint8_t reserved1[3];
+ uint8_t length;
// descriptor list
- UINT8 density;
- UINT8 reserved2[4];
- UINT8 block_size[3];
+ uint8_t density;
+ uint8_t reserved2[4];
+ uint8_t block_size[3];
// drive parameter list
- UINT8 format_code;
- UINT8 cylinder_count[2];
- UINT8 head_count;
- UINT8 reduced_write[2];
- UINT8 write_precomp[2];
- UINT8 landing_zone;
- UINT8 step_pulse_code;
- UINT8 bit_flags;
- UINT8 sectors_per_track;
+ uint8_t format_code;
+ uint8_t cylinder_count[2];
+ uint8_t head_count;
+ uint8_t reduced_write[2];
+ uint8_t write_precomp[2];
+ uint8_t landing_zone;
+ uint8_t step_pulse_code;
+ uint8_t bit_flags;
+ uint8_t sectors_per_track;
};
};
diff --git a/src/devices/bus/scsi/cdu76s.cpp b/src/devices/bus/scsi/cdu76s.cpp
index bb6a70390ed..b9256135b87 100644
--- a/src/devices/bus/scsi/cdu76s.cpp
+++ b/src/devices/bus/scsi/cdu76s.cpp
@@ -15,7 +15,7 @@ void sony_cdu76s_device::ExecCommand()
}
}
-void sony_cdu76s_device::ReadData( UINT8 *data, int dataLength )
+void sony_cdu76s_device::ReadData( uint8_t *data, int dataLength )
{
switch ( command[0] )
{
@@ -41,7 +41,7 @@ void sony_cdu76s_device::ReadData( UINT8 *data, int dataLength )
// device type definition
const device_type CDU76S = &device_creator<sony_cdu76s_device>;
-sony_cdu76s_device::sony_cdu76s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sony_cdu76s_device::sony_cdu76s_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
scsicd_device(mconfig, CDU76S, "Sony CDU-76S", tag, owner, clock, "cdu76s", __FILE__)
{
}
diff --git a/src/devices/bus/scsi/cdu76s.h b/src/devices/bus/scsi/cdu76s.h
index d10a23c1246..0449254b958 100644
--- a/src/devices/bus/scsi/cdu76s.h
+++ b/src/devices/bus/scsi/cdu76s.h
@@ -19,10 +19,10 @@
class sony_cdu76s_device : public scsicd_device
{
public:
- sony_cdu76s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sony_cdu76s_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void ExecCommand() override;
- virtual void ReadData( UINT8 *data, int dataLength ) override;
+ virtual void ReadData( uint8_t *data, int dataLength ) override;
};
// device type definition
diff --git a/src/devices/bus/scsi/d9060hd.cpp b/src/devices/bus/scsi/d9060hd.cpp
index 3d212582a39..4ea264030eb 100644
--- a/src/devices/bus/scsi/d9060hd.cpp
+++ b/src/devices/bus/scsi/d9060hd.cpp
@@ -10,7 +10,7 @@
// device type definition
const device_type D9060HD = &device_creator<d9060hd_device>;
-d9060hd_device::d9060hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+d9060hd_device::d9060hd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: scsihd_device(mconfig, D9060HD, "D9060HD", tag, owner, clock, "d9060hd", __FILE__)
{
}
diff --git a/src/devices/bus/scsi/d9060hd.h b/src/devices/bus/scsi/d9060hd.h
index 2daed5e40af..979538a0b14 100644
--- a/src/devices/bus/scsi/d9060hd.h
+++ b/src/devices/bus/scsi/d9060hd.h
@@ -11,7 +11,7 @@ class d9060hd_device : public scsihd_device
{
public:
// construction/destruction
- d9060hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ d9060hd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void ExecCommand() override;
};
diff --git a/src/devices/bus/scsi/omti5100.cpp b/src/devices/bus/scsi/omti5100.cpp
index de40a68c32c..614f48a11a2 100644
--- a/src/devices/bus/scsi/omti5100.cpp
+++ b/src/devices/bus/scsi/omti5100.cpp
@@ -23,7 +23,7 @@ const tiny_rom_entry *omti5100_device::device_rom_region() const
}
#endif
-omti5100_device::omti5100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+omti5100_device::omti5100_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: scsihd_device(mconfig, OMTI5100, "OMTI 5100", tag, owner, clock, "omti5100", __FILE__),
m_image0(*this, "image0"),
m_image1(*this, "image1")
@@ -95,7 +95,7 @@ void omti5100_device::ExecCommand()
int track = ((command[1]&0x1f)<<16 | command[2]<<8 | command[3]) / m_param[drive].sectors;
if(((track % m_param[drive].heads) <= info->heads) && (track < (info->cylinders * m_param[drive].heads)))
{
- std::vector<UINT8> sector(info->sectorbytes);
+ std::vector<uint8_t> sector(info->sectorbytes);
memset(&sector[0], 0xe5, info->sectorbytes);
m_phase = SCSI_PHASE_STATUS;
m_status_code = SCSI_STATUS_CODE_GOOD;
@@ -119,7 +119,7 @@ void omti5100_device::ExecCommand()
}
}
-void omti5100_device::ReadData( UINT8 *data, int dataLength )
+void omti5100_device::ReadData( uint8_t *data, int dataLength )
{
switch( command[ 0 ] )
{
@@ -136,7 +136,7 @@ void omti5100_device::ReadData( UINT8 *data, int dataLength )
}
}
-void omti5100_device::WriteData( UINT8 *data, int dataLength )
+void omti5100_device::WriteData( uint8_t *data, int dataLength )
{
switch( command[ 0 ] )
{
diff --git a/src/devices/bus/scsi/omti5100.h b/src/devices/bus/scsi/omti5100.h
index 63ac7b8a4dc..6d13f0f9bad 100644
--- a/src/devices/bus/scsi/omti5100.h
+++ b/src/devices/bus/scsi/omti5100.h
@@ -11,14 +11,14 @@
class omti5100_device : public scsihd_device
{
public:
- omti5100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ omti5100_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual machine_config_constructor device_mconfig_additions() const override;
//virtual const rom_entry *device_rom_region() const;
virtual void ExecCommand() override;
- virtual void ReadData( UINT8 *data, int dataLength ) override;
- virtual void WriteData( UINT8 *data, int dataLength ) override;
+ virtual void ReadData( uint8_t *data, int dataLength ) override;
+ virtual void WriteData( uint8_t *data, int dataLength ) override;
void device_start() override;
private:
diff --git a/src/devices/bus/scsi/pc9801_sasi.cpp b/src/devices/bus/scsi/pc9801_sasi.cpp
index 619f9f074da..7fdbdd699c8 100644
--- a/src/devices/bus/scsi/pc9801_sasi.cpp
+++ b/src/devices/bus/scsi/pc9801_sasi.cpp
@@ -6,7 +6,7 @@
const device_type PC9801_SASI = &device_creator<pc9801_sasi_device>;
-pc9801_sasi_device::pc9801_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+pc9801_sasi_device::pc9801_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: scsihd_device(mconfig, PC9801_SASI, "PC-9801 SASI Controller", tag, owner, clock, "pc9801_sasi", __FILE__)
{
}
diff --git a/src/devices/bus/scsi/pc9801_sasi.h b/src/devices/bus/scsi/pc9801_sasi.h
index b3e5816573d..1cbd9eb72af 100644
--- a/src/devices/bus/scsi/pc9801_sasi.h
+++ b/src/devices/bus/scsi/pc9801_sasi.h
@@ -9,7 +9,7 @@ class pc9801_sasi_device : public scsihd_device
{
public:
// construction/destruction
- pc9801_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pc9801_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void ExecCommand() override;
};
diff --git a/src/devices/bus/scsi/s1410.cpp b/src/devices/bus/scsi/s1410.cpp
index b26b9b5aef7..d4d8ff84d29 100644
--- a/src/devices/bus/scsi/s1410.cpp
+++ b/src/devices/bus/scsi/s1410.cpp
@@ -192,7 +192,7 @@ machine_config_constructor s1410_device::device_mconfig_additions() const
// s1410_device - constructor
//-------------------------------------------------
-s1410_device::s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+s1410_device::s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: scsihd_device(mconfig, S1410, "Xebec S1410", tag, owner, clock, "s1410", __FILE__)
{
}
@@ -256,7 +256,7 @@ void s1410_device::ExecCommand()
if ((m_disk) && (m_blocks))
{
- std::vector<UINT8> data(m_sector_bytes);
+ std::vector<uint8_t> data(m_sector_bytes);
memset(&data[0], 0xc6, m_sector_bytes);
while (m_blocks > 0)
@@ -314,7 +314,7 @@ void s1410_device::ExecCommand()
}
}
-void s1410_device::WriteData( UINT8 *data, int dataLength )
+void s1410_device::WriteData( uint8_t *data, int dataLength )
{
switch( command[ 0 ] )
{
@@ -333,9 +333,9 @@ void s1410_device::WriteData( UINT8 *data, int dataLength )
break;
}
- UINT16 tracks = ((data[0]<<8)+data[1]);
- UINT8 heads = data[2];
- UINT32 capacity = tracks * heads * sectorsPerTrack * m_sector_bytes;
+ uint16_t tracks = ((data[0]<<8)+data[1]);
+ uint8_t heads = data[2];
+ uint32_t capacity = tracks * heads * sectorsPerTrack * m_sector_bytes;
logerror("S1410_CMD_INIT_DRIVE_PARAMS Tracks=%d, Heads=%d, Capacity=%d\n",tracks,heads,capacity);
}
@@ -347,7 +347,7 @@ void s1410_device::WriteData( UINT8 *data, int dataLength )
}
}
-void s1410_device::ReadData( UINT8 *data, int dataLength )
+void s1410_device::ReadData( uint8_t *data, int dataLength )
{
switch( command[ 0 ] )
{
diff --git a/src/devices/bus/scsi/s1410.h b/src/devices/bus/scsi/s1410.h
index c17d6e349ed..d76686529bf 100644
--- a/src/devices/bus/scsi/s1410.h
+++ b/src/devices/bus/scsi/s1410.h
@@ -17,15 +17,15 @@ class s1410_device : public scsihd_device
{
public:
// construction/destruction
- s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void ExecCommand() override;
- virtual void WriteData( UINT8 *data, int dataLength ) override;
- virtual void ReadData( UINT8 *data, int dataLength ) override;
+ virtual void WriteData( uint8_t *data, int dataLength ) override;
+ virtual void ReadData( uint8_t *data, int dataLength ) override;
};
diff --git a/src/devices/bus/scsi/sa1403d.cpp b/src/devices/bus/scsi/sa1403d.cpp
index 1e8e3a512cf..21f086b4218 100644
--- a/src/devices/bus/scsi/sa1403d.cpp
+++ b/src/devices/bus/scsi/sa1403d.cpp
@@ -122,7 +122,7 @@ ioport_constructor sa1403d_device::device_input_ports() const
// sa1403d_device - constructor
//-------------------------------------------------
-sa1403d_device::sa1403d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sa1403d_device::sa1403d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: scsihd_device(mconfig, SA1403D, "Shugart SA1403D", tag, owner, clock, "sa1403d", __FILE__)
{
}
@@ -137,7 +137,7 @@ void sa1403d_device::ExecCommand()
}
}
-void sa1403d_device::WriteData( UINT8 *data, int dataLength )
+void sa1403d_device::WriteData( uint8_t *data, int dataLength )
{
switch( command[ 0 ] )
{
diff --git a/src/devices/bus/scsi/sa1403d.h b/src/devices/bus/scsi/sa1403d.h
index 3241b0aa782..3299527a8f8 100644
--- a/src/devices/bus/scsi/sa1403d.h
+++ b/src/devices/bus/scsi/sa1403d.h
@@ -18,7 +18,7 @@ class sa1403d_device : public scsihd_device
{
public:
// construction/destruction
- sa1403d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sa1403d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -26,7 +26,7 @@ public:
virtual ioport_constructor device_input_ports() const override;
virtual void ExecCommand() override;
- virtual void WriteData( UINT8 *data, int dataLength ) override;
+ virtual void WriteData( uint8_t *data, int dataLength ) override;
};
diff --git a/src/devices/bus/scsi/scsi.cpp b/src/devices/bus/scsi/scsi.cpp
index 118e2d58114..3df52a5d53d 100644
--- a/src/devices/bus/scsi/scsi.cpp
+++ b/src/devices/bus/scsi/scsi.cpp
@@ -3,7 +3,7 @@
#include "scsi.h"
-SCSI_PORT_DEVICE::SCSI_PORT_DEVICE(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+SCSI_PORT_DEVICE::SCSI_PORT_DEVICE(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SCSI_PORT, "SCSI Port", tag, owner, clock, "scsi", __FILE__),
m_bsy_handler(*this),
m_sel_handler(*this),
@@ -666,7 +666,7 @@ WRITE_LINE_MEMBER( SCSI_PORT_DEVICE::write_data7 )
const device_type SCSI_PORT = &device_creator<SCSI_PORT_DEVICE>;
-SCSI_PORT_SLOT_device::SCSI_PORT_SLOT_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+SCSI_PORT_SLOT_device::SCSI_PORT_SLOT_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SCSI_PORT_SLOT, "SCSI Connector", tag, owner, clock, "scsi_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_dev(nullptr),
diff --git a/src/devices/bus/scsi/scsi.h b/src/devices/bus/scsi/scsi.h
index 19fec347f53..81dfea08959 100644
--- a/src/devices/bus/scsi/scsi.h
+++ b/src/devices/bus/scsi/scsi.h
@@ -99,7 +99,7 @@ class SCSI_PORT_DEVICE : public device_t
public:
// construction/destruction
- SCSI_PORT_DEVICE(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ SCSI_PORT_DEVICE(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_bsy_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_bsy_handler.set_callback(object); }
template<class _Object> static devcb_base &set_sel_handler(device_t &device, _Object object) { return downcast<SCSI_PORT_DEVICE &>(device).m_sel_handler.set_callback(object); }
@@ -229,7 +229,7 @@ class SCSI_PORT_SLOT_device : public device_t,
friend class scsi_port_interface;
public:
- SCSI_PORT_SLOT_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ SCSI_PORT_SLOT_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
scsi_port_interface *dev() { return m_dev; }
SCSI_PORT_DEVICE *port() { return m_port; }
diff --git a/src/devices/bus/scsi/scsicd.cpp b/src/devices/bus/scsi/scsicd.cpp
index 9ee7d92668f..2f0cccef1e5 100644
--- a/src/devices/bus/scsi/scsicd.cpp
+++ b/src/devices/bus/scsi/scsicd.cpp
@@ -11,12 +11,12 @@
// device type definition
const device_type SCSICD = &device_creator<scsicd_device>;
-scsicd_device::scsicd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+scsicd_device::scsicd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
scsihle_device(mconfig, SCSICD, "SCSI CD", tag, owner, clock, "scsicd", __FILE__)
{
}
-scsicd_device::scsicd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+scsicd_device::scsicd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
scsihle_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/devices/bus/scsi/scsicd.h b/src/devices/bus/scsi/scsicd.h
index 3acfffe2ad6..c7c2f377e50 100644
--- a/src/devices/bus/scsi/scsicd.h
+++ b/src/devices/bus/scsi/scsicd.h
@@ -17,8 +17,8 @@ class scsicd_device : public scsihle_device,
{
public:
// construction/destruction
- scsicd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- scsicd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ scsicd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ scsicd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual machine_config_constructor device_mconfig_additions() const override;
protected:
diff --git a/src/devices/bus/scsi/scsihd.cpp b/src/devices/bus/scsi/scsihd.cpp
index 8774310d0b3..a822327ca92 100644
--- a/src/devices/bus/scsi/scsihd.cpp
+++ b/src/devices/bus/scsi/scsihd.cpp
@@ -11,12 +11,12 @@
// device type definition
const device_type SCSIHD = &device_creator<scsihd_device>;
-scsihd_device::scsihd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scsihd_device::scsihd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: scsihle_device(mconfig, SCSIHD, "SCSI HD", tag, owner, clock, "scsihd", __FILE__)
{
}
-scsihd_device::scsihd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+scsihd_device::scsihd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
scsihle_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
diff --git a/src/devices/bus/scsi/scsihd.h b/src/devices/bus/scsi/scsihd.h
index 41b535a15b1..1a312a79216 100644
--- a/src/devices/bus/scsi/scsihd.h
+++ b/src/devices/bus/scsi/scsihd.h
@@ -17,8 +17,8 @@ class scsihd_device : public scsihle_device,
{
public:
// construction/destruction
- scsihd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- scsihd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ scsihd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ scsihd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual machine_config_constructor device_mconfig_additions() const override;
protected:
diff --git a/src/devices/bus/scsi/scsihle.cpp b/src/devices/bus/scsi/scsihle.cpp
index e14d875881f..96c89506444 100644
--- a/src/devices/bus/scsi/scsihle.cpp
+++ b/src/devices/bus/scsi/scsihle.cpp
@@ -10,7 +10,7 @@ Base class for HLE'd SCSI devices.
#include "scsihle.h"
-scsihle_device::scsihle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+scsihle_device::scsihle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
scsi_port_interface(mconfig, *this),
m_scsi_id(*this, "SCSI_ID"),
@@ -131,7 +131,7 @@ static const char *const phasenames[] =
#define LOG(level, ...) if(LOGLEVEL>=level) logerror(__VA_ARGS__)
-void scsihle_device::data_out(UINT8 data)
+void scsihle_device::data_out(uint8_t data)
{
// printf( "%s data out %02x\n", tag(), data );
output_data0(BIT(data, 0));
@@ -144,12 +144,12 @@ void scsihle_device::data_out(UINT8 data)
output_data7(BIT(data, 7));
}
-void scsihle_device::scsi_out_req_delay(UINT8 state)
+void scsihle_device::scsi_out_req_delay(uint8_t state)
{
req_timer->adjust(attotime::from_nsec(REQ_DELAY_NS),state);
}
-void scsihle_device::dump_bytes(UINT8 *buff, int count)
+void scsihle_device::dump_bytes(uint8_t *buff, int count)
{
int byteno;
@@ -317,7 +317,7 @@ void scsihle_device::scsibus_exec_command()
scsibus_read_data();
}
-UINT8 scsihle_device::scsibus_driveno(UINT8 drivesel)
+uint8_t scsihle_device::scsibus_driveno(uint8_t drivesel)
{
switch (drivesel)
{
@@ -333,7 +333,7 @@ UINT8 scsihle_device::scsibus_driveno(UINT8 drivesel)
}
}
-void scsihle_device::scsi_change_phase(UINT8 newphase)
+void scsihle_device::scsi_change_phase(uint8_t newphase)
{
LOG(1,"scsi_change_phase() from=%s, to=%s\n",phasenames[m_phase],phasenames[newphase]);
diff --git a/src/devices/bus/scsi/scsihle.h b/src/devices/bus/scsi/scsihle.h
index 4963210726c..72537d3b3b0 100644
--- a/src/devices/bus/scsi/scsihle.h
+++ b/src/devices/bus/scsi/scsihle.h
@@ -22,7 +22,7 @@ class scsihle_device : public device_t,
{
public:
// construction/destruction
- scsihle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ scsihle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual int GetDeviceID(); // hack for legacy_scsi_host_adapter::get_device
@@ -47,32 +47,32 @@ protected:
private:
required_ioport m_scsi_id;
- void data_out(UINT8 data);
- void scsi_out_req_delay(UINT8 state);
- void scsi_change_phase(UINT8 newphase);
+ void data_out(uint8_t data);
+ void scsi_out_req_delay(uint8_t state);
+ void scsi_change_phase(uint8_t newphase);
int get_scsi_cmd_len(int cbyte);
- UINT8 scsibus_driveno(UINT8 drivesel);
+ uint8_t scsibus_driveno(uint8_t drivesel);
void scsibus_read_data();
void scsibus_write_data();
void scsibus_exec_command();
void dump_command_bytes();
void dump_data_bytes(int count);
- void dump_bytes(UINT8 *buff, int count);
+ void dump_bytes(uint8_t *buff, int count);
emu_timer *req_timer;
emu_timer *sel_timer;
emu_timer *dataout_timer;
- UINT8 cmd_idx;
- UINT8 is_linked;
+ uint8_t cmd_idx;
+ uint8_t is_linked;
- UINT8 buffer[ 1024 ];
- UINT16 data_idx;
+ uint8_t buffer[ 1024 ];
+ uint16_t data_idx;
int bytes_left;
int data_last;
int scsiID;
- UINT8 m_input_data;
+ uint8_t m_input_data;
};
extern const input_device_default DEVICE_INPUT_DEFAULTS_NAME(SCSI_ID_0)[];
diff --git a/src/devices/bus/scv/rom.cpp b/src/devices/bus/scv/rom.cpp
index 27487e8cc73..ccf05a85d94 100644
--- a/src/devices/bus/scv/rom.cpp
+++ b/src/devices/bus/scv/rom.cpp
@@ -26,44 +26,44 @@ const device_type SCV_ROM128K = &device_creator<scv_rom128_device>;
const device_type SCV_ROM128K_RAM4K = &device_creator<scv_rom128ram4_device>;
-scv_rom8_device::scv_rom8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+scv_rom8_device::scv_rom8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_scv_cart_interface( mconfig, *this )
{
}
-scv_rom8_device::scv_rom8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scv_rom8_device::scv_rom8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SCV_ROM8K, "SCV 8K Carts", tag, owner, clock, "scv_rom8", __FILE__),
device_scv_cart_interface( mconfig, *this )
{
}
-scv_rom16_device::scv_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scv_rom16_device::scv_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: scv_rom8_device(mconfig, SCV_ROM16K, "SCV 16K Carts", tag, owner, clock, "scv_rom16", __FILE__)
{
}
-scv_rom32_device::scv_rom32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scv_rom32_device::scv_rom32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: scv_rom8_device(mconfig, SCV_ROM32K, "SCV 32K Carts", tag, owner, clock, "scv_rom32", __FILE__)
{
}
-scv_rom32ram8_device::scv_rom32ram8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scv_rom32ram8_device::scv_rom32ram8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: scv_rom8_device(mconfig, SCV_ROM32K_RAM8K, "SCV 32K + RAM 8K Carts", tag, owner, clock, "scv_rom32_ram8", __FILE__), m_ram_enabled(0)
{
}
-scv_rom64_device::scv_rom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scv_rom64_device::scv_rom64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: scv_rom8_device(mconfig, SCV_ROM16K, "SCV 64K Carts", tag, owner, clock, "scv_rom64", __FILE__), m_bank_base(0)
{
}
-scv_rom128_device::scv_rom128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scv_rom128_device::scv_rom128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: scv_rom8_device(mconfig, SCV_ROM32K, "SCV 128K Carts", tag, owner, clock, "scv_rom128", __FILE__), m_bank_base(0)
{
}
-scv_rom128ram4_device::scv_rom128ram4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+scv_rom128ram4_device::scv_rom128ram4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: scv_rom8_device(mconfig, SCV_ROM128K_RAM4K, "SCV 128K + RAM 4K Carts", tag, owner, clock, "scv_rom128_ram4", __FILE__), m_bank_base(0), m_ram_enabled(0)
{
}
diff --git a/src/devices/bus/scv/rom.h b/src/devices/bus/scv/rom.h
index 381a82fb7cf..40a56ec5ce0 100644
--- a/src/devices/bus/scv/rom.h
+++ b/src/devices/bus/scv/rom.h
@@ -13,8 +13,8 @@ class scv_rom8_device : public device_t,
{
public:
// construction/destruction
- scv_rom8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- scv_rom8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scv_rom8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ scv_rom8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override {}
@@ -30,7 +30,7 @@ class scv_rom16_device : public scv_rom8_device
{
public:
// construction/destruction
- scv_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scv_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -43,7 +43,7 @@ class scv_rom32_device : public scv_rom8_device
{
public:
// construction/destruction
- scv_rom32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scv_rom32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -56,7 +56,7 @@ class scv_rom32ram8_device : public scv_rom8_device
{
public:
// construction/destruction
- scv_rom32ram8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scv_rom32ram8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -68,7 +68,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_bank) override;
private:
- UINT8 m_ram_enabled;
+ uint8_t m_ram_enabled;
};
@@ -78,7 +78,7 @@ class scv_rom64_device : public scv_rom8_device
{
public:
// construction/destruction
- scv_rom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scv_rom64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -89,7 +89,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_bank) override;
private:
- UINT8 m_bank_base;
+ uint8_t m_bank_base;
};
@@ -99,7 +99,7 @@ class scv_rom128_device : public scv_rom8_device
{
public:
// construction/destruction
- scv_rom128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scv_rom128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -110,7 +110,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_bank) override;
private:
- UINT8 m_bank_base;
+ uint8_t m_bank_base;
};
@@ -120,7 +120,7 @@ class scv_rom128ram4_device : public scv_rom8_device
{
public:
// construction/destruction
- scv_rom128ram4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scv_rom128ram4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -132,7 +132,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_bank) override;
private:
- UINT8 m_bank_base, m_ram_enabled;
+ uint8_t m_bank_base, m_ram_enabled;
};
diff --git a/src/devices/bus/scv/slot.cpp b/src/devices/bus/scv/slot.cpp
index d0554c44584..799f4adc78a 100644
--- a/src/devices/bus/scv/slot.cpp
+++ b/src/devices/bus/scv/slot.cpp
@@ -45,7 +45,7 @@ device_scv_cart_interface::~device_scv_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_scv_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_scv_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -59,7 +59,7 @@ void device_scv_cart_interface::rom_alloc(UINT32 size, const char *tag)
// ram_alloc - alloc the space for the ram
//-------------------------------------------------
-void device_scv_cart_interface::ram_alloc(UINT32 size)
+void device_scv_cart_interface::ram_alloc(uint32_t size)
{
m_ram.resize(size);
}
@@ -72,7 +72,7 @@ void device_scv_cart_interface::ram_alloc(UINT32 size)
//-------------------------------------------------
// scv_cart_slot_device - constructor
//-------------------------------------------------
-scv_cart_slot_device::scv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+scv_cart_slot_device::scv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SCV_CART_SLOT, "SCV Cartridge Slot", tag, owner, clock, "scv_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -164,8 +164,8 @@ image_init_result scv_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT8 *ROM;
- UINT32 len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
+ uint8_t *ROM;
+ uint32_t len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
bool has_ram = (software_entry() != nullptr) && get_software_region("ram");
if (len > 0x20000)
@@ -215,7 +215,7 @@ image_init_result scv_cart_slot_device::call_load()
fullpath
-------------------------------------------------*/
-int scv_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
+int scv_cart_slot_device::get_cart_type(uint8_t *ROM, uint32_t len)
{
int type = SCV_8K;
@@ -252,8 +252,8 @@ std::string scv_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- UINT32 len = m_file->size();
- std::vector<UINT8> rom(len);
+ uint32_t len = m_file->size();
+ std::vector<uint8_t> rom(len);
int type;
m_file->read(&rom[0], len);
diff --git a/src/devices/bus/scv/slot.h b/src/devices/bus/scv/slot.h
index d6168ebed81..c39f929a634 100644
--- a/src/devices/bus/scv/slot.h
+++ b/src/devices/bus/scv/slot.h
@@ -38,20 +38,20 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_cart) {}
virtual DECLARE_WRITE8_MEMBER(write_bank) {}
- void rom_alloc(UINT32 size, const char *tag);
- void ram_alloc(UINT32 size);
- UINT8* get_rom_base() { return m_rom; }
- UINT8* get_ram_base() { return &m_ram[0]; }
- UINT32 get_rom_size() { return m_rom_size; }
- UINT32 get_ram_size() { return m_ram.size(); }
+ void rom_alloc(uint32_t size, const char *tag);
+ void ram_alloc(uint32_t size);
+ uint8_t* get_rom_base() { return m_rom; }
+ uint8_t* get_ram_base() { return &m_ram[0]; }
+ uint32_t get_rom_size() { return m_rom_size; }
+ uint32_t get_ram_size() { return m_ram.size(); }
void save_ram() { device().save_item(NAME(m_ram)); }
protected:
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT8> m_ram;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint8_t> m_ram;
};
@@ -63,7 +63,7 @@ class scv_cart_slot_device : public device_t,
{
public:
// construction/destruction
- scv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ scv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~scv_cart_slot_device();
// device-level overrides
@@ -76,7 +76,7 @@ public:
virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
int get_type() { return m_type; }
- int get_cart_type(UINT8 *ROM, UINT32 len);
+ int get_cart_type(uint8_t *ROM, uint32_t len);
void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); }
diff --git a/src/devices/bus/sega8/ccatch.cpp b/src/devices/bus/sega8/ccatch.cpp
index 5ec9295fdba..7c3c198adba 100644
--- a/src/devices/bus/sega8/ccatch.cpp
+++ b/src/devices/bus/sega8/ccatch.cpp
@@ -23,7 +23,7 @@ const device_type SEGA8_ROM_CARDCATCH = &device_creator<sega8_cardcatch_device>;
-sega8_cardcatch_device::sega8_cardcatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_cardcatch_device::sega8_cardcatch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sega8_rom_device(mconfig, SEGA8_ROM_CARDCATCH, "SG-1000 Card Catcher Cart", tag, owner, clock, "sega8_ccatch", __FILE__),
m_card(*this, "cardslot")
{
diff --git a/src/devices/bus/sega8/ccatch.h b/src/devices/bus/sega8/ccatch.h
index 959376173c5..138f39dba9b 100644
--- a/src/devices/bus/sega8/ccatch.h
+++ b/src/devices/bus/sega8/ccatch.h
@@ -12,7 +12,7 @@ class sega8_cardcatch_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_cardcatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_cardcatch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
diff --git a/src/devices/bus/sega8/mgear.cpp b/src/devices/bus/sega8/mgear.cpp
index e715d0b1652..bb40fa73bd7 100644
--- a/src/devices/bus/sega8/mgear.cpp
+++ b/src/devices/bus/sega8/mgear.cpp
@@ -23,7 +23,7 @@
const device_type SEGA8_ROM_MGEAR = &device_creator<sega8_mgear_device>;
-sega8_mgear_device::sega8_mgear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_mgear_device::sega8_mgear_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sega8_rom_device(mconfig, SEGA8_ROM_MGEAR, "Master Gear Converter", tag, owner, clock, "sega8_mgear", __FILE__),
m_subslot(*this, "subslot")
{
diff --git a/src/devices/bus/sega8/mgear.h b/src/devices/bus/sega8/mgear.h
index 960545c7350..0544fd74741 100644
--- a/src/devices/bus/sega8/mgear.h
+++ b/src/devices/bus/sega8/mgear.h
@@ -13,7 +13,7 @@ class sega8_mgear_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_mgear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_mgear_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/sega8/rom.cpp b/src/devices/bus/sega8/rom.cpp
index b9c35af15f9..096369826b2 100644
--- a/src/devices/bus/sega8/rom.cpp
+++ b/src/devices/bus/sega8/rom.cpp
@@ -43,13 +43,13 @@ const device_type SEGA8_ROM_KOREAN_NB = &device_creator<sega8_korean_nb_device>;
-sega8_rom_device::sega8_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+sega8_rom_device::sega8_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0)
{
}
-sega8_rom_device::sega8_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_rom_device::sega8_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SEGA8_ROM_STD, "Mark III, SMS & GG Carts", tag, owner, clock, "sega8_rom", __FILE__),
device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0)
{
@@ -58,31 +58,31 @@ sega8_rom_device::sega8_rom_device(const machine_config &mconfig, const char *ta
-sega8_othello_device::sega8_othello_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_othello_device::sega8_othello_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sega8_rom_device(mconfig, SEGA8_ROM_OTHELLO, "SG-1000 Othello Cart", tag, owner, clock, "sega8_othello", __FILE__)
{
}
-sega8_castle_device::sega8_castle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_castle_device::sega8_castle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sega8_rom_device(mconfig, SEGA8_ROM_CASTLE, "SG-1000 The Castle Cart", tag, owner, clock, "sega8_castle", __FILE__)
{
}
-sega8_basic_l3_device::sega8_basic_l3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_basic_l3_device::sega8_basic_l3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sega8_rom_device(mconfig, SEGA8_ROM_BASIC_L3, "SC-3000 BASIC Level III Cart", tag, owner, clock, "sega8_basicl3", __FILE__)
{
}
-sega8_music_editor_device::sega8_music_editor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_music_editor_device::sega8_music_editor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sega8_rom_device(mconfig, SEGA8_ROM_MUSIC_EDITOR, "SC-3000 Music Editor Cart", tag, owner, clock, "sega8_music", __FILE__)
{
}
-sega8_terebi_device::sega8_terebi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_terebi_device::sega8_terebi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sega8_rom_device(mconfig, SEGA8_ROM_TEREBI, "SG-1000 Terebi Oekaki Cart", tag, owner, clock, "sega8_terebi", __FILE__),
m_tvdraw_x(*this, "TVDRAW_X"),
m_tvdraw_y(*this, "TVDRAW_Y"),
@@ -91,13 +91,13 @@ sega8_terebi_device::sega8_terebi_device(const machine_config &mconfig, const ch
}
-sega8_dahjee_typea_device::sega8_dahjee_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_dahjee_typea_device::sega8_dahjee_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sega8_rom_device(mconfig, SEGA8_ROM_DAHJEE_TYPEA, "SG-1000 Dahjee RAM expansion + Cart (Type A)", tag, owner, clock, "sega8_dahjeea", __FILE__)
{
}
-sega8_dahjee_typeb_device::sega8_dahjee_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_dahjee_typeb_device::sega8_dahjee_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sega8_rom_device(mconfig, SEGA8_ROM_DAHJEE_TYPEB, "SG-1000 Dahjee RAM expansion + Cart (Type B)", tag, owner, clock, "sega8_dahjeeb", __FILE__)
{
}
@@ -105,7 +105,7 @@ sega8_dahjee_typeb_device::sega8_dahjee_typeb_device(const machine_config &mconf
-sega8_eeprom_device::sega8_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_eeprom_device::sega8_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SEGA8_ROM_EEPROM, "GG Carts + EEPROM", tag, owner, clock, "sega8_eeprom", __FILE__),
device_sega8_cart_interface( mconfig, *this ),
m_eeprom(*this, "eeprom"), m_93c46_enabled(0), m_93c46_lines(0)
@@ -113,58 +113,58 @@ sega8_eeprom_device::sega8_eeprom_device(const machine_config &mconfig, const ch
}
-sega8_codemasters_device::sega8_codemasters_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_codemasters_device::sega8_codemasters_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SEGA8_ROM_CODEMASTERS, "Mark III, SMS & GG Codemasters Carts", tag, owner, clock, "sega8_codemasters", __FILE__),
device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0)
{
}
-sega8_4pak_device::sega8_4pak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_4pak_device::sega8_4pak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sega8_rom_device(mconfig, SEGA8_ROM_4PAK, "SMS 4-Pak Cart", tag, owner, clock, "sega8_4pak", __FILE__)
{
}
-sega8_zemina_device::sega8_zemina_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+sega8_zemina_device::sega8_zemina_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0)
{
}
-sega8_zemina_device::sega8_zemina_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_zemina_device::sega8_zemina_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SEGA8_ROM_ZEMINA, "SMS Zemina Carts", tag, owner, clock, "sega8_zemina", __FILE__),
device_sega8_cart_interface( mconfig, *this ), m_ram_base(0), m_ram_enabled(0)
{
}
-sega8_nemesis_device::sega8_nemesis_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_nemesis_device::sega8_nemesis_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sega8_zemina_device(mconfig, SEGA8_ROM_NEMESIS, "SMS Nemesis Cart", tag, owner, clock, "sega8_nemesis", __FILE__)
{
}
-sega8_janggun_device::sega8_janggun_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_janggun_device::sega8_janggun_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SEGA8_ROM_JANGGUN, "SMS Janggun Cart", tag, owner, clock, "sega8_janggun", __FILE__),
device_sega8_cart_interface( mconfig, *this )
{
}
-sega8_hicom_device::sega8_hicom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_hicom_device::sega8_hicom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sega8_rom_device(mconfig, SEGA8_ROM_HICOM, "SMS Hi-Com Carts", tag, owner, clock, "sega8_hicom", __FILE__), m_rom_bank_base(0)
{
}
-sega8_korean_device::sega8_korean_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_korean_device::sega8_korean_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sega8_rom_device(mconfig, SEGA8_ROM_KOREAN, "SMS Korean Carts", tag, owner, clock, "sega8_korean", __FILE__)
{
}
-sega8_korean_nb_device::sega8_korean_nb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sega8_korean_nb_device::sega8_korean_nb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sega8_rom_device(mconfig, SEGA8_ROM_KOREAN_NB, "SMS Korean No-Bank Mapper Carts", tag, owner, clock, "sega8_korean_nb", __FILE__)
{
}
@@ -653,7 +653,7 @@ READ8_MEMBER(sega8_eeprom_device::read_cart)
if (offset == 0x8000 && m_93c46_enabled)
{
- UINT8 value = (m_93c46_lines & 0xfc) | 0x02;
+ uint8_t value = (m_93c46_lines & 0xfc) | 0x02;
value |= m_eeprom->do_read() ? 1 : 0;
return value;
}
diff --git a/src/devices/bus/sega8/rom.h b/src/devices/bus/sega8/rom.h
index 462ea7d8e28..ef3448a8428 100644
--- a/src/devices/bus/sega8/rom.h
+++ b/src/devices/bus/sega8/rom.h
@@ -13,8 +13,8 @@ class sega8_rom_device : public device_t,
{
public:
// construction/destruction
- sega8_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- sega8_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ sega8_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -28,8 +28,8 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_mapper) override;
protected:
- UINT8 m_rom_bank_base[3];
- UINT8 m_ram_base;
+ uint8_t m_rom_bank_base[3];
+ uint8_t m_ram_base;
int m_ram_enabled;
};
@@ -42,7 +42,7 @@ class sega8_othello_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_othello_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_othello_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -57,7 +57,7 @@ class sega8_castle_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_castle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_castle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -72,7 +72,7 @@ class sega8_basic_l3_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_basic_l3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_basic_l3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -91,7 +91,7 @@ class sega8_music_editor_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_music_editor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_music_editor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -110,7 +110,7 @@ class sega8_terebi_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_terebi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_terebi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -127,7 +127,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_mapper) override {}
protected:
- UINT8 m_tvdraw_data;
+ uint8_t m_tvdraw_data;
};
@@ -137,7 +137,7 @@ class sega8_dahjee_typea_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_dahjee_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_dahjee_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -156,7 +156,7 @@ class sega8_dahjee_typeb_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_dahjee_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_dahjee_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart) override;
@@ -178,7 +178,7 @@ class sega8_eeprom_device : public device_t,
{
public:
// construction/destruction
- sega8_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -193,11 +193,11 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_mapper) override;
protected:
- UINT8 m_rom_bank_base[3];
+ uint8_t m_rom_bank_base[3];
required_device<eeprom_serial_93cxx_device> m_eeprom;
int m_93c46_enabled;
- UINT8 m_93c46_lines;
+ uint8_t m_93c46_lines;
};
@@ -208,7 +208,7 @@ class sega8_codemasters_device : public device_t,
{
public:
// construction/destruction
- sega8_codemasters_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_codemasters_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -222,8 +222,8 @@ public:
// no mapper write for this!
protected:
- UINT8 m_rom_bank_base[3];
- UINT8 m_ram_base;
+ uint8_t m_rom_bank_base[3];
+ uint8_t m_ram_base;
int m_ram_enabled;
};
@@ -234,7 +234,7 @@ class sega8_4pak_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_4pak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_4pak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -245,7 +245,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_cart) override;
private:
- UINT8 m_reg[3];
+ uint8_t m_reg[3];
};
@@ -256,8 +256,8 @@ class sega8_zemina_device : public device_t,
{
public:
// construction/destruction
- sega8_zemina_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- sega8_zemina_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_zemina_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ sega8_zemina_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -271,8 +271,8 @@ public:
// no mapper write for this!
protected:
- UINT8 m_rom_bank_base[6];
- UINT8 m_ram_base;
+ uint8_t m_rom_bank_base[6];
+ uint8_t m_ram_base;
int m_ram_enabled;
};
@@ -283,7 +283,7 @@ class sega8_nemesis_device : public sega8_zemina_device
{
public:
// construction/destruction
- sega8_nemesis_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_nemesis_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void late_bank_setup() override;
};
@@ -296,7 +296,7 @@ class sega8_janggun_device : public device_t,
{
public:
// construction/destruction
- sega8_janggun_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_janggun_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { save_item(NAME(m_rom_bank_base)); }
@@ -309,7 +309,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_mapper) override;
protected:
- UINT8 m_rom_bank_base[6];
+ uint8_t m_rom_bank_base[6];
};
@@ -319,7 +319,7 @@ class sega8_hicom_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_hicom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_hicom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override { save_item(NAME(m_rom_bank_base)); }
@@ -332,7 +332,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_mapper) override;
protected:
- UINT8 m_rom_bank_base;
+ uint8_t m_rom_bank_base;
};
@@ -342,7 +342,7 @@ class sega8_korean_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_korean_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_korean_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void late_bank_setup() override;
@@ -358,7 +358,7 @@ class sega8_korean_nb_device : public sega8_rom_device
{
public:
// construction/destruction
- sega8_korean_nb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_korean_nb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_WRITE8_MEMBER(write_mapper) override {}
diff --git a/src/devices/bus/sega8/sega8_slot.cpp b/src/devices/bus/sega8/sega8_slot.cpp
index 3cfb14b4981..41ae0e6cf17 100644
--- a/src/devices/bus/sega8/sega8_slot.cpp
+++ b/src/devices/bus/sega8/sega8_slot.cpp
@@ -74,7 +74,7 @@ device_sega8_cart_interface::~device_sega8_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_sega8_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_sega8_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -92,7 +92,7 @@ void device_sega8_cart_interface::rom_alloc(UINT32 size, const char *tag)
// ram_alloc - alloc the space for the ram
//-------------------------------------------------
-void device_sega8_cart_interface::ram_alloc(UINT32 size)
+void device_sega8_cart_interface::ram_alloc(uint32_t size)
{
m_ram.resize(size);
}
@@ -107,7 +107,7 @@ void device_sega8_cart_interface::ram_alloc(UINT32 size)
// sega8_cart_slot_device - constructor
//-------------------------------------------------
-sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_card, const char *shortname, const char *source) :
+sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, bool is_card, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -119,7 +119,7 @@ sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, de
m_is_card = is_card;
}
-sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SEGA8_CART_SLOT, "Sega Master System / Game Gear / SG1000 Cartridge Slot", tag, owner, clock, "sega8_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -131,7 +131,7 @@ sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, co
{
}
-sega8_card_slot_device::sega8_card_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sega8_card_slot_device::sega8_card_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
sega8_cart_slot_device(mconfig, SEGA8_CARD_SLOT, "Sega Master System / Game Gear / SG1000 Card Slot", tag, owner, clock, TRUE, "sega8_card_slot", __FILE__)
{
}
@@ -213,7 +213,7 @@ static const char *sega8_get_slot(int type)
call load
-------------------------------------------------*/
-image_verify_result sega8_cart_slot_device::verify_cart( UINT8 *magic, int size )
+image_verify_result sega8_cart_slot_device::verify_cart( uint8_t *magic, int size )
{
image_verify_result retval(image_verify_result::FAIL);
@@ -227,9 +227,9 @@ image_verify_result sega8_cart_slot_device::verify_cart( UINT8 *magic, int size
return retval;
}
-void sega8_cart_slot_device::set_lphaser_xoffset( UINT8 *rom, int size )
+void sega8_cart_slot_device::set_lphaser_xoffset( uint8_t *rom, int size )
{
- static const UINT8 signatures[7][16] =
+ static const uint8_t signatures[7][16] =
{
/* Spacegun */
{ 0x54, 0x4d, 0x52, 0x20, 0x53, 0x45, 0x47, 0x41, 0xff, 0xff, 0x9d, 0x99, 0x10, 0x90, 0x00, 0x40 },
@@ -335,9 +335,9 @@ image_init_result sega8_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT32 len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
- UINT32 offset = 0;
- UINT8 *ROM;
+ uint32_t len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
+ uint32_t offset = 0;
+ uint8_t *ROM;
if (m_is_card && len > 0x8000)
{
@@ -438,9 +438,9 @@ void sega8_cart_slot_device::call_unload()
The Korean game Jang Pung II also seems to use a codemasters style mapper.
*/
-int sms_state::detect_codemasters_mapper( UINT8 *rom )
+int sms_state::detect_codemasters_mapper( uint8_t *rom )
{
- static const UINT8 jang_pung2[16] = { 0x00, 0xba, 0x38, 0x0d, 0x00, 0xb8, 0x38, 0x0c, 0x00, 0xb6, 0x38, 0x0b, 0x00, 0xb4, 0x38, 0x0a };
+ static const uint8_t jang_pung2[16] = { 0x00, 0xba, 0x38, 0x0d, 0x00, 0xb8, 0x38, 0x0c, 0x00, 0xb6, 0x38, 0x0b, 0x00, 0xb4, 0x38, 0x0a };
if (((rom[0x7fe0] & 0x0f ) <= 9) && (rom[0x7fe3] == 0x93 || rom[0x7fe3] == 0x94 || rom[0x7fe3] == 0x95) && rom[0x7fef] == 0x00)
return 1;
@@ -452,9 +452,9 @@ int sms_state::detect_codemasters_mapper( UINT8 *rom )
}
-int sms_state::detect_korean_mapper( UINT8 *rom )
+int sms_state::detect_korean_mapper( uint8_t *rom )
{
- static const UINT8 signatures[2][16] =
+ static const uint8_t signatures[2][16] =
{
{ 0x3e, 0x11, 0x32, 0x00, 0xa0, 0x78, 0xcd, 0x84, 0x85, 0x3e, 0x02, 0x32, 0x00, 0xa0, 0xc9, 0xff }, /* Dodgeball King */
{ 0x41, 0x48, 0x37, 0x37, 0x44, 0x37, 0x4e, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20 }, /* Sangokushi 3 */
@@ -472,7 +472,7 @@ int sms_state::detect_korean_mapper( UINT8 *rom )
}
#endif
-int sega8_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
+int sega8_cart_slot_device::get_cart_type(uint8_t *ROM, uint32_t len)
{
int type = SEGA8_BASE_ROM;
@@ -484,7 +484,7 @@ int sega8_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
{
if (ROM[i] == 0x32) // Z80 opcode for: LD (xxxx), A
{
- UINT16 addr = (ROM[i + 2] << 8) | ROM[i + 1];
+ uint16_t addr = (ROM[i + 2] << 8) | ROM[i + 1];
if (addr == 0xffff)
{ i += 2; _ffff++; continue; }
if (addr == 0x0002 || addr == 0x0003 || addr == 0x0004)
@@ -533,7 +533,7 @@ int sega8_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
{
if (ROM[i] == 0x32)
{
- UINT16 addr = ROM[i + 1] | (ROM[i + 2] << 8);
+ uint16_t addr = ROM[i + 1] | (ROM[i + 2] << 8);
switch (addr & 0xf000)
{
@@ -597,8 +597,8 @@ std::string sega8_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- UINT32 len = m_file->size(), offset = 0;
- std::vector<UINT8> rom(len);
+ uint32_t len = m_file->size(), offset = 0;
+ std::vector<uint8_t> rom(len);
int type;
m_file->read(&rom[0], len);
@@ -668,7 +668,7 @@ WRITE8_MEMBER(sega8_cart_slot_device::write_ram)
Internal header logging
-------------------------------------------------*/
-void sega8_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len, UINT32 nvram_len)
+void sega8_cart_slot_device::internal_header_logging(uint8_t *ROM, uint32_t len, uint32_t nvram_len)
{
static const char *const system_region[] =
{
@@ -711,9 +711,9 @@ void sega8_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len, UIN
};
char reserved[10];
- UINT8 version, csum_size, region, serial[3];
- UINT16 checksum, csum = 0;
- UINT32 csum_end;
+ uint8_t version, csum_size, region, serial[3];
+ uint16_t checksum, csum = 0;
+ uint32_t csum_end;
// LOG FILE DETAILS
logerror("FILE DETAILS\n" );
@@ -773,7 +773,7 @@ void sega8_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len, UIN
if (m_type == SEGA8_CODEMASTERS)
{
- UINT8 day, month, year, hour, minute;
+ uint8_t day, month, year, hour, minute;
csum = 0;
day = ROM[0x7fe1];
diff --git a/src/devices/bus/sega8/sega8_slot.h b/src/devices/bus/sega8/sega8_slot.h
index 4d032e30b50..408f0aa9d87 100644
--- a/src/devices/bus/sega8/sega8_slot.h
+++ b/src/devices/bus/sega8/sega8_slot.h
@@ -55,8 +55,8 @@ public:
virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_ram) {}
- void rom_alloc(UINT32 size, const char *tag);
- void ram_alloc(UINT32 size);
+ void rom_alloc(uint32_t size, const char *tag);
+ void ram_alloc(uint32_t size);
virtual void late_bank_setup() {}
@@ -69,18 +69,18 @@ public:
int get_sms_mode() { return m_sms_mode; }
//protected:
- UINT8* get_rom_base() { return m_rom; }
- UINT8* get_ram_base() { return &m_ram[0]; }
- UINT32 get_rom_size() { return m_rom_size; }
- UINT32 get_ram_size() { return m_ram.size(); }
+ uint8_t* get_rom_base() { return m_rom; }
+ uint8_t* get_ram_base() { return &m_ram[0]; }
+ uint32_t get_rom_size() { return m_rom_size; }
+ uint32_t get_ram_size() { return m_ram.size(); }
void save_ram() { device().save_item(NAME(m_ram)); }
//private:
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT8> m_ram;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint8_t> m_ram;
int m_rom_page_count;
bool has_battery;
@@ -102,8 +102,8 @@ class sega8_cart_slot_device : public device_t,
{
public:
// construction/destruction
- sega8_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_card, const char *shortname, const char *source);
- sega8_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, bool is_card, const char *shortname, const char *source);
+ sega8_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~sega8_cart_slot_device();
// device-level overrides
@@ -116,12 +116,12 @@ public:
virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
int get_type() { return m_type; }
- int get_cart_type(UINT8 *ROM, UINT32 len);
+ int get_cart_type(uint8_t *ROM, uint32_t len);
void setup_ram();
- void internal_header_logging(UINT8 *ROM, UINT32 len, UINT32 nvram_len);
- image_verify_result verify_cart(UINT8 *magic, int size);
- void set_lphaser_xoffset(UINT8 *rom, int size);
+ void internal_header_logging(uint8_t *ROM, uint32_t len, uint32_t nvram_len);
+ image_verify_result verify_cart(uint8_t *magic, int size);
+ void set_lphaser_xoffset(uint8_t *rom, int size);
void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); }
@@ -163,7 +163,7 @@ class sega8_card_slot_device : public sega8_cart_slot_device
{
public:
// construction/destruction
- sega8_card_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega8_card_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void device_config_complete() override { update_names(SEGA8_CARD_SLOT, "card", "card"); }
};
diff --git a/src/devices/bus/sg1000_exp/fm_unit.cpp b/src/devices/bus/sg1000_exp/fm_unit.cpp
index 41142e95bbf..fdb380e79b2 100644
--- a/src/devices/bus/sg1000_exp/fm_unit.cpp
+++ b/src/devices/bus/sg1000_exp/fm_unit.cpp
@@ -72,7 +72,7 @@ machine_config_constructor sega_fm_unit_device::device_mconfig_additions() const
// sega_fm_unit_device - constructor
//-------------------------------------------------
-sega_fm_unit_device::sega_fm_unit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sega_fm_unit_device::sega_fm_unit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SEGA_FM_UNIT, "Sega FM Sound Unit", tag, owner, clock, "sega_fm_unit", __FILE__),
device_sg1000_expansion_slot_interface(mconfig, *this),
m_ym(*this, "ym2413"),
@@ -147,13 +147,13 @@ WRITE8_MEMBER(sega_fm_unit_device::peripheral_w)
}
-bool sega_fm_unit_device::is_readable(UINT8 offset)
+bool sega_fm_unit_device::is_readable(uint8_t offset)
{
return (offset <= 3) ? true : false;
}
-bool sega_fm_unit_device::is_writeable(UINT8 offset)
+bool sega_fm_unit_device::is_writeable(uint8_t offset)
{
return (offset <= 3) ? true : false;
}
diff --git a/src/devices/bus/sg1000_exp/fm_unit.h b/src/devices/bus/sg1000_exp/fm_unit.h
index 9f71ff81190..b821b00c6fd 100644
--- a/src/devices/bus/sg1000_exp/fm_unit.h
+++ b/src/devices/bus/sg1000_exp/fm_unit.h
@@ -30,7 +30,7 @@ class sega_fm_unit_device : public device_t,
{
public:
// construction/destruction
- sega_fm_unit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega_fm_unit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -40,13 +40,13 @@ protected:
// device_sg1000_expansion_slot_interface overrides
virtual DECLARE_READ8_MEMBER(peripheral_r) override;
virtual DECLARE_WRITE8_MEMBER(peripheral_w) override;
- virtual bool is_readable(UINT8 offset) override;
- virtual bool is_writeable(UINT8 offset) override;
+ virtual bool is_readable(uint8_t offset) override;
+ virtual bool is_writeable(uint8_t offset) override;
private:
required_device<ym2413_device> m_ym;
optional_device<segapsg_device> m_psg;
- UINT8 m_audio_control;
+ uint8_t m_audio_control;
};
diff --git a/src/devices/bus/sg1000_exp/sg1000exp.cpp b/src/devices/bus/sg1000_exp/sg1000exp.cpp
index 0460efccbef..9560905de41 100644
--- a/src/devices/bus/sg1000_exp/sg1000exp.cpp
+++ b/src/devices/bus/sg1000_exp/sg1000exp.cpp
@@ -53,7 +53,7 @@ device_sg1000_expansion_slot_interface::~device_sg1000_expansion_slot_interface(
// sg1000_expansion_slot_device - constructor
//-------------------------------------------------
-sg1000_expansion_slot_device::sg1000_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sg1000_expansion_slot_device::sg1000_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SG1000_EXPANSION_SLOT, "Sega SG-1000 expansion slot", tag, owner, clock, "sg1000_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr)
{
@@ -85,7 +85,7 @@ void sg1000_expansion_slot_device::device_start()
READ8_MEMBER(sg1000_expansion_slot_device::read)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_device)
data = m_device->peripheral_r(space, offset & 0x07);
return data;
@@ -98,7 +98,7 @@ WRITE8_MEMBER(sg1000_expansion_slot_device::write)
}
-bool sg1000_expansion_slot_device::is_readable(UINT8 offset)
+bool sg1000_expansion_slot_device::is_readable(uint8_t offset)
{
if (m_device)
return m_device->is_readable(offset & 0x07);
@@ -106,7 +106,7 @@ bool sg1000_expansion_slot_device::is_readable(UINT8 offset)
}
-bool sg1000_expansion_slot_device::is_writeable(UINT8 offset)
+bool sg1000_expansion_slot_device::is_writeable(uint8_t offset)
{
if (m_device)
return m_device->is_writeable(offset & 0x07);
diff --git a/src/devices/bus/sg1000_exp/sg1000exp.h b/src/devices/bus/sg1000_exp/sg1000exp.h
index 183ee9ea948..12cecb1bc89 100644
--- a/src/devices/bus/sg1000_exp/sg1000exp.h
+++ b/src/devices/bus/sg1000_exp/sg1000exp.h
@@ -43,13 +43,13 @@ class sg1000_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- sg1000_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sg1000_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~sg1000_expansion_slot_device();
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
- bool is_readable(UINT8 offset);
- bool is_writeable(UINT8 offset);
+ bool is_readable(uint8_t offset);
+ bool is_writeable(uint8_t offset);
protected:
// device-level overrides
@@ -73,8 +73,8 @@ public:
virtual DECLARE_READ8_MEMBER(peripheral_r) { return 0xff; };
virtual DECLARE_WRITE8_MEMBER(peripheral_w) { };
- virtual bool is_readable(UINT8 offset) { return true; };
- virtual bool is_writeable(UINT8 offset) { return true; };
+ virtual bool is_readable(uint8_t offset) { return true; };
+ virtual bool is_writeable(uint8_t offset) { return true; };
protected:
sg1000_expansion_slot_device *m_port;
diff --git a/src/devices/bus/sg1000_exp/sk1100.cpp b/src/devices/bus/sg1000_exp/sk1100.cpp
index b6c2e037748..275a73b67b8 100644
--- a/src/devices/bus/sg1000_exp/sk1100.cpp
+++ b/src/devices/bus/sg1000_exp/sk1100.cpp
@@ -186,7 +186,7 @@ machine_config_constructor sega_sk1100_device::device_mconfig_additions() const
// sega_sk1100_device - constructor
//-------------------------------------------------
-sega_sk1100_device::sega_sk1100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sega_sk1100_device::sega_sk1100_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SEGA_SK1100, "Sega SK-1100 Keyboard", tag, owner, clock, "sega_sk1100", __FILE__),
device_sg1000_expansion_slot_interface(mconfig, *this),
m_cassette(*this, "cassette"),
@@ -229,7 +229,7 @@ WRITE8_MEMBER(sega_sk1100_device::peripheral_w)
}
-bool sega_sk1100_device::is_readable(UINT8 offset)
+bool sega_sk1100_device::is_readable(uint8_t offset)
{
return (m_keylatch != 0x07 ? true : false);
}
@@ -273,7 +273,7 @@ READ8_MEMBER( sega_sk1100_device::ppi_pb_r )
*/
/* keyboard */
- UINT8 data = m_pb[m_keylatch]->read();
+ uint8_t data = m_pb[m_keylatch]->read();
/* cartridge contact */
data |= 0x10;
diff --git a/src/devices/bus/sg1000_exp/sk1100.h b/src/devices/bus/sg1000_exp/sk1100.h
index 8ee058e9d5e..592ee0dd5b5 100644
--- a/src/devices/bus/sg1000_exp/sk1100.h
+++ b/src/devices/bus/sg1000_exp/sk1100.h
@@ -34,7 +34,7 @@ class sega_sk1100_device : public device_t,
{
public:
// construction/destruction
- sega_sk1100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sega_sk1100_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -51,7 +51,7 @@ protected:
// device_sg1000_expansion_slot_interface overrides
virtual DECLARE_READ8_MEMBER(peripheral_r) override;
virtual DECLARE_WRITE8_MEMBER(peripheral_w) override;
- virtual bool is_readable(UINT8 offset) override;
+ virtual bool is_readable(uint8_t offset) override;
private:
required_device<cassette_image_device> m_cassette;
@@ -60,7 +60,7 @@ private:
required_ioport_array<8> m_pb;
/* keyboard state */
- UINT8 m_keylatch;
+ uint8_t m_keylatch;
};
diff --git a/src/devices/bus/sms_ctrl/graphic.cpp b/src/devices/bus/sms_ctrl/graphic.cpp
index 31d211e30a8..9cff60be1ac 100644
--- a/src/devices/bus/sms_ctrl/graphic.cpp
+++ b/src/devices/bus/sms_ctrl/graphic.cpp
@@ -75,7 +75,7 @@ ioport_constructor sms_graphic_device::device_input_ports() const
// sms_graphic_device - constructor
//-------------------------------------------------
-sms_graphic_device::sms_graphic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sms_graphic_device::sms_graphic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SMS_GRAPHIC, "Sega SMS Graphic Board", tag, owner, clock, "sms_graphic", __FILE__)
, device_sms_control_port_interface(mconfig, *this)
, m_buttons(*this, "BUTTONS")
@@ -103,7 +103,7 @@ void sms_graphic_device::device_start()
// sms_peripheral_r - joypad read
//-------------------------------------------------
-UINT8 sms_graphic_device::peripheral_r()
+uint8_t sms_graphic_device::peripheral_r()
{
switch (m_index)
{
@@ -138,7 +138,7 @@ UINT8 sms_graphic_device::peripheral_r()
return 0xff;
}
-void sms_graphic_device::peripheral_w(UINT8 data)
+void sms_graphic_device::peripheral_w(uint8_t data)
{
// Check for toggle on TH/TL
if ((data ^ m_previous_write) & 0xc0)
diff --git a/src/devices/bus/sms_ctrl/graphic.h b/src/devices/bus/sms_ctrl/graphic.h
index 82d624c07b5..b6c364d4984 100644
--- a/src/devices/bus/sms_ctrl/graphic.h
+++ b/src/devices/bus/sms_ctrl/graphic.h
@@ -28,7 +28,7 @@ class sms_graphic_device : public device_t,
{
public:
// construction/destruction
- sms_graphic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_graphic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -38,8 +38,8 @@ protected:
virtual void device_start() override;
// device_sms_control_port_interface overrides
- virtual UINT8 peripheral_r() override;
- virtual void peripheral_w(UINT8 data) override;
+ virtual uint8_t peripheral_r() override;
+ virtual void peripheral_w(uint8_t data) override;
private:
required_ioport m_buttons;
@@ -47,8 +47,8 @@ private:
required_ioport m_y;
int m_index;
- UINT8 m_previous_write;
- UINT8 m_pressure;
+ uint8_t m_previous_write;
+ uint8_t m_pressure;
};
diff --git a/src/devices/bus/sms_ctrl/joypad.cpp b/src/devices/bus/sms_ctrl/joypad.cpp
index 99ca264cec4..e750e2435ab 100644
--- a/src/devices/bus/sms_ctrl/joypad.cpp
+++ b/src/devices/bus/sms_ctrl/joypad.cpp
@@ -64,7 +64,7 @@ ioport_constructor sms_joypad_device::device_input_ports() const
// sms_joypad_device - constructor
//-------------------------------------------------
-sms_joypad_device::sms_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_joypad_device::sms_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SMS_JOYPAD, "Sega SMS Control Pad", tag, owner, clock, "sms_joypad", __FILE__),
device_sms_control_port_interface(mconfig, *this),
m_joypad(*this, "JOYPAD")
@@ -85,7 +85,7 @@ void sms_joypad_device::device_start()
// sms_peripheral_r - joypad read
//-------------------------------------------------
-UINT8 sms_joypad_device::peripheral_r()
+uint8_t sms_joypad_device::peripheral_r()
{
return m_joypad->read();
}
diff --git a/src/devices/bus/sms_ctrl/joypad.h b/src/devices/bus/sms_ctrl/joypad.h
index d8028bef6c3..56e076a6819 100644
--- a/src/devices/bus/sms_ctrl/joypad.h
+++ b/src/devices/bus/sms_ctrl/joypad.h
@@ -28,7 +28,7 @@ class sms_joypad_device : public device_t,
{
public:
// construction/destruction
- sms_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -38,7 +38,7 @@ protected:
virtual void device_start() override;
// device_sms_control_port_interface overrides
- virtual UINT8 peripheral_r() override;
+ virtual uint8_t peripheral_r() override;
private:
required_ioport m_joypad;
diff --git a/src/devices/bus/sms_ctrl/lphaser.cpp b/src/devices/bus/sms_ctrl/lphaser.cpp
index 474b8100d76..3ba680032dc 100644
--- a/src/devices/bus/sms_ctrl/lphaser.cpp
+++ b/src/devices/bus/sms_ctrl/lphaser.cpp
@@ -80,7 +80,7 @@ ioport_constructor sms_light_phaser_device::device_input_ports() const
// sms_light_phaser_device - constructor
//-------------------------------------------------
-sms_light_phaser_device::sms_light_phaser_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_light_phaser_device::sms_light_phaser_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SMS_LIGHT_PHASER, "Sega SMS Light Phaser", tag, owner, clock, "sms_light_phaser", __FILE__),
device_video_interface(mconfig, *this),
device_sms_control_port_interface(mconfig, *this),
@@ -115,7 +115,7 @@ void sms_light_phaser_device::device_reset()
// sms_peripheral_r - light phaser read
//-------------------------------------------------
-UINT8 sms_light_phaser_device::peripheral_r()
+uint8_t sms_light_phaser_device::peripheral_r()
{
return m_lphaser_pins->read();
}
@@ -187,8 +187,8 @@ int sms_light_phaser_device::bright_aim_area( emu_timer *timer, int lgun_x, int
dx_radius = ceil((float) sqrt((float) (r_x_r - (dy * dy))));
}
- aim_area.min_x = std::max(INT32(lgun_x - dx_radius), visarea.min_x);
- aim_area.max_x = std::min(INT32(lgun_x + dx_radius), visarea.max_x);
+ aim_area.min_x = std::max(int32_t(lgun_x - dx_radius), visarea.min_x);
+ aim_area.max_x = std::min(int32_t(lgun_x + dx_radius), visarea.max_x);
while (!new_check_point)
{
@@ -224,9 +224,9 @@ int sms_light_phaser_device::bright_aim_area( emu_timer *timer, int lgun_x, int
else
{
rgb_t color;
- UINT8 brightness;
+ uint8_t brightness;
/* brightness of the lightgray color in the frame drawn by Light Phaser games */
- const UINT8 sensor_min_brightness = 0x7f;
+ const uint8_t sensor_min_brightness = 0x7f;
color = m_port->pixel_r();
@@ -258,7 +258,7 @@ int sms_light_phaser_device::bright_aim_area( emu_timer *timer, int lgun_x, int
}
-UINT16 sms_light_phaser_device::screen_hpos_nonscaled(int scaled_hpos)
+uint16_t sms_light_phaser_device::screen_hpos_nonscaled(int scaled_hpos)
{
const rectangle &visarea = m_screen->visible_area();
int offset_x = (scaled_hpos * (visarea.max_x - visarea.min_x)) / 255;
@@ -266,7 +266,7 @@ UINT16 sms_light_phaser_device::screen_hpos_nonscaled(int scaled_hpos)
}
-UINT16 sms_light_phaser_device::screen_vpos_nonscaled(int scaled_vpos)
+uint16_t sms_light_phaser_device::screen_vpos_nonscaled(int scaled_vpos)
{
const rectangle &visarea = m_screen->visible_area();
int offset_y = (scaled_vpos * (visarea.max_y - visarea.min_y)) / 255;
diff --git a/src/devices/bus/sms_ctrl/lphaser.h b/src/devices/bus/sms_ctrl/lphaser.h
index 860b8d4007f..d3004e2de80 100644
--- a/src/devices/bus/sms_ctrl/lphaser.h
+++ b/src/devices/bus/sms_ctrl/lphaser.h
@@ -29,7 +29,7 @@ class sms_light_phaser_device : public device_t,
{
public:
// construction/destruction
- sms_light_phaser_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_light_phaser_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -43,7 +43,7 @@ protected:
virtual void device_reset() override;
// device_sms_control_port_interface overrides
- virtual UINT8 peripheral_r() override;
+ virtual uint8_t peripheral_r() override;
private:
required_ioport m_lphaser_pins;
@@ -57,8 +57,8 @@ private:
void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
void sensor_check();
int bright_aim_area( emu_timer *timer, int lgun_x, int lgun_y );
- UINT16 screen_hpos_nonscaled(int scaled_hpos);
- UINT16 screen_vpos_nonscaled(int scaled_vpos);
+ uint16_t screen_hpos_nonscaled(int scaled_hpos);
+ uint16_t screen_vpos_nonscaled(int scaled_vpos);
};
diff --git a/src/devices/bus/sms_ctrl/multitap.cpp b/src/devices/bus/sms_ctrl/multitap.cpp
index fd098b82c18..55101810647 100644
--- a/src/devices/bus/sms_ctrl/multitap.cpp
+++ b/src/devices/bus/sms_ctrl/multitap.cpp
@@ -27,7 +27,7 @@ const device_type SMS_MULTITAP = &device_creator<sms_multitap_device>;
// sms_multitap_device - constructor
//-------------------------------------------------
-sms_multitap_device::sms_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_multitap_device::sms_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SMS_MULTITAP, "Sega SMS Multitap", tag, owner, clock, "sms_multitap", __FILE__),
device_sms_control_port_interface(mconfig, *this),
m_subctrl1_port(*this, "ctrl1"),
@@ -60,9 +60,9 @@ void sms_multitap_device::device_start()
// sms_peripheral_r - multitap read
//-------------------------------------------------
-UINT8 sms_multitap_device::peripheral_r()
+uint8_t sms_multitap_device::peripheral_r()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
switch(m_read_state)
{
@@ -91,9 +91,9 @@ UINT8 sms_multitap_device::peripheral_r()
// sms_peripheral_w - multitap write
//-------------------------------------------------
-void sms_multitap_device::peripheral_w(UINT8 data)
+void sms_multitap_device::peripheral_w(uint8_t data)
{
- UINT8 output_data;
+ uint8_t output_data;
// check if TH level is low (0) and was high (1)
if (!(data & 0x40) && (m_last_data & 0x40))
diff --git a/src/devices/bus/sms_ctrl/multitap.h b/src/devices/bus/sms_ctrl/multitap.h
index bf3e79e5616..93c71f8e215 100644
--- a/src/devices/bus/sms_ctrl/multitap.h
+++ b/src/devices/bus/sms_ctrl/multitap.h
@@ -28,7 +28,7 @@ class sms_multitap_device : public device_t,
{
public:
// construction/destruction
- sms_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ32_MEMBER(pixel_r);
@@ -38,8 +38,8 @@ protected:
virtual machine_config_constructor device_mconfig_additions() const override;
// device_sms_control_port_interface overrides
- virtual UINT8 peripheral_r() override;
- virtual void peripheral_w(UINT8 data) override;
+ virtual uint8_t peripheral_r() override;
+ virtual void peripheral_w(uint8_t data) override;
private:
required_device<sms_control_port_device> m_subctrl1_port;
@@ -47,8 +47,8 @@ private:
required_device<sms_control_port_device> m_subctrl3_port;
required_device<sms_control_port_device> m_subctrl4_port;
- UINT8 m_read_state;
- UINT8 m_last_data;
+ uint8_t m_read_state;
+ uint8_t m_last_data;
};
diff --git a/src/devices/bus/sms_ctrl/paddle.cpp b/src/devices/bus/sms_ctrl/paddle.cpp
index 805e0827533..88f6af4137a 100644
--- a/src/devices/bus/sms_ctrl/paddle.cpp
+++ b/src/devices/bus/sms_ctrl/paddle.cpp
@@ -40,7 +40,7 @@ const device_type SMS_PADDLE = &device_creator<sms_paddle_device>;
CUSTOM_INPUT_MEMBER( sms_paddle_device::rldu_pins_r )
{
- UINT8 data = m_paddle_x->read();
+ uint8_t data = m_paddle_x->read();
if (m_read_state)
data >>= 4;
@@ -89,7 +89,7 @@ ioport_constructor sms_paddle_device::device_input_ports() const
// sms_paddle_device - constructor
//-------------------------------------------------
-sms_paddle_device::sms_paddle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_paddle_device::sms_paddle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SMS_PADDLE, "Sega SMS Paddle", tag, owner, clock, "sms_paddle", __FILE__),
device_sms_control_port_interface(mconfig, *this),
m_paddle_pins(*this, "CTRL_PORT"),
@@ -117,7 +117,7 @@ void sms_paddle_device::device_start()
// sms_peripheral_r - paddle read
//-------------------------------------------------
-UINT8 sms_paddle_device::peripheral_r()
+uint8_t sms_paddle_device::peripheral_r()
{
int num_intervals = (machine().time() - m_start_time).as_double() / m_interval.as_double();
m_read_state = num_intervals & 1;
diff --git a/src/devices/bus/sms_ctrl/paddle.h b/src/devices/bus/sms_ctrl/paddle.h
index 968abe1b345..c5da3741b04 100644
--- a/src/devices/bus/sms_ctrl/paddle.h
+++ b/src/devices/bus/sms_ctrl/paddle.h
@@ -28,7 +28,7 @@ class sms_paddle_device : public device_t,
{
public:
// construction/destruction
- sms_paddle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_paddle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -41,13 +41,13 @@ protected:
virtual void device_start() override;
// device_sms_control_port_interface overrides
- virtual UINT8 peripheral_r() override;
+ virtual uint8_t peripheral_r() override;
private:
required_ioport m_paddle_pins;
required_ioport m_paddle_x;
- UINT8 m_read_state;
+ uint8_t m_read_state;
attotime m_start_time;
const attotime m_interval;
};
diff --git a/src/devices/bus/sms_ctrl/rfu.cpp b/src/devices/bus/sms_ctrl/rfu.cpp
index 3c27307c137..d2e376a6d80 100644
--- a/src/devices/bus/sms_ctrl/rfu.cpp
+++ b/src/devices/bus/sms_ctrl/rfu.cpp
@@ -62,7 +62,7 @@ ioport_constructor sms_rapid_fire_device::device_input_ports() const
// sms_rapid_fire_device - constructor
//-------------------------------------------------
-sms_rapid_fire_device::sms_rapid_fire_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_rapid_fire_device::sms_rapid_fire_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SMS_RAPID_FIRE, "Sega SMS Rapid Fire", tag, owner, clock, "sms_rapid_fire", __FILE__),
device_sms_control_port_interface(mconfig, *this),
m_rfire_sw(*this, "rfu_sw"),
@@ -92,9 +92,9 @@ void sms_rapid_fire_device::device_start()
// sms_peripheral_r - rapid fire read
//-------------------------------------------------
-UINT8 sms_rapid_fire_device::peripheral_r()
+uint8_t sms_rapid_fire_device::peripheral_r()
{
- UINT8 data;
+ uint8_t data;
int num_intervals = (machine().time() - m_start_time).as_double() / m_interval.as_double();
m_read_state = num_intervals & 1;
@@ -117,7 +117,7 @@ UINT8 sms_rapid_fire_device::peripheral_r()
// sms_peripheral_w - rapid fire write
//-------------------------------------------------
-void sms_rapid_fire_device::peripheral_w(UINT8 data)
+void sms_rapid_fire_device::peripheral_w(uint8_t data)
{
m_subctrl_port->port_w(data);
}
diff --git a/src/devices/bus/sms_ctrl/rfu.h b/src/devices/bus/sms_ctrl/rfu.h
index 6a56b06ae3a..6784b55c66d 100644
--- a/src/devices/bus/sms_ctrl/rfu.h
+++ b/src/devices/bus/sms_ctrl/rfu.h
@@ -28,7 +28,7 @@ class sms_rapid_fire_device : public device_t,
{
public:
// construction/destruction
- sms_rapid_fire_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_rapid_fire_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -42,14 +42,14 @@ protected:
virtual machine_config_constructor device_mconfig_additions() const override;
// device_sms_control_port_interface overrides
- virtual UINT8 peripheral_r() override;
- virtual void peripheral_w(UINT8 data) override;
+ virtual uint8_t peripheral_r() override;
+ virtual void peripheral_w(uint8_t data) override;
private:
required_ioport m_rfire_sw;
required_device<sms_control_port_device> m_subctrl_port;
- UINT8 m_read_state;
+ uint8_t m_read_state;
attotime m_start_time;
const attotime m_interval;
};
diff --git a/src/devices/bus/sms_ctrl/smsctrl.cpp b/src/devices/bus/sms_ctrl/smsctrl.cpp
index 170a716a70f..e99cce2c827 100644
--- a/src/devices/bus/sms_ctrl/smsctrl.cpp
+++ b/src/devices/bus/sms_ctrl/smsctrl.cpp
@@ -60,7 +60,7 @@ device_sms_control_port_interface::~device_sms_control_port_interface()
// sms_control_port_device - constructor
//-------------------------------------------------
-sms_control_port_device::sms_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_control_port_device::sms_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SMS_CONTROL_PORT, "Sega SMS control port", tag, owner, clock, "sms_control_port", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr),
m_th_pin_handler(*this),
@@ -91,15 +91,15 @@ void sms_control_port_device::device_start()
}
-UINT8 sms_control_port_device::port_r()
+uint8_t sms_control_port_device::port_r()
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (m_device)
data = m_device->peripheral_r();
return data;
}
-void sms_control_port_device::port_w( UINT8 data )
+void sms_control_port_device::port_w( uint8_t data )
{
if (m_device)
m_device->peripheral_w(data);
@@ -111,7 +111,7 @@ void sms_control_port_device::th_pin_w(int state)
m_th_pin_handler(state);
}
-UINT32 sms_control_port_device::pixel_r()
+uint32_t sms_control_port_device::pixel_r()
{
return m_pixel_handler();
}
diff --git a/src/devices/bus/sms_ctrl/smsctrl.h b/src/devices/bus/sms_ctrl/smsctrl.h
index 4cce2437149..b85b9d91954 100644
--- a/src/devices/bus/sms_ctrl/smsctrl.h
+++ b/src/devices/bus/sms_ctrl/smsctrl.h
@@ -51,7 +51,7 @@ class sms_control_port_device : public device_t,
{
public:
// construction/destruction
- sms_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~sms_control_port_device();
// static configuration helpers
@@ -72,11 +72,11 @@ public:
// pin 8 - GND
// bit 7 - pin 9 - TR (Button 2)
//
- UINT8 port_r();
- void port_w( UINT8 data );
+ uint8_t port_r();
+ void port_w( uint8_t data );
void th_pin_w(int state);
- UINT32 pixel_r();
+ uint32_t pixel_r();
//protected:
// device-level overrides
@@ -100,8 +100,8 @@ public:
device_sms_control_port_interface(const machine_config &mconfig, device_t &device);
virtual ~device_sms_control_port_interface();
- virtual UINT8 peripheral_r() { return 0xff; };
- virtual void peripheral_w(UINT8 data) { };
+ virtual uint8_t peripheral_r() { return 0xff; };
+ virtual void peripheral_w(uint8_t data) { };
protected:
sms_control_port_device *m_port;
diff --git a/src/devices/bus/sms_ctrl/sports.cpp b/src/devices/bus/sms_ctrl/sports.cpp
index d2a5647e965..5cd92b4e565 100644
--- a/src/devices/bus/sms_ctrl/sports.cpp
+++ b/src/devices/bus/sms_ctrl/sports.cpp
@@ -92,7 +92,7 @@ WRITE_LINE_MEMBER( sms_sports_pad_device::th_pin_w )
CUSTOM_INPUT_MEMBER( sms_sports_pad_device::rldu_pins_r )
{
- UINT8 data = 0;
+ uint8_t data = 0;
switch (m_read_state)
{
@@ -157,7 +157,7 @@ ioport_constructor sms_sports_pad_device::device_input_ports() const
// sms_sports_pad_device - constructor
//-------------------------------------------------
-sms_sports_pad_device::sms_sports_pad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_sports_pad_device::sms_sports_pad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SMS_SPORTS_PAD, "Sega SMS Sports Pad US", tag, owner, clock, "sms_sports_pad", __FILE__),
device_sms_control_port_interface(mconfig, *this),
m_sports_in(*this, "SPORTS_IN"),
@@ -192,7 +192,7 @@ void sms_sports_pad_device::device_start()
// sms_peripheral_r - sports pad read
//-------------------------------------------------
-UINT8 sms_sports_pad_device::peripheral_r()
+uint8_t sms_sports_pad_device::peripheral_r()
{
return m_sports_in->read();
}
@@ -202,7 +202,7 @@ UINT8 sms_sports_pad_device::peripheral_r()
// sms_peripheral_w - sports pad write
//-------------------------------------------------
-void sms_sports_pad_device::peripheral_w(UINT8 data)
+void sms_sports_pad_device::peripheral_w(uint8_t data)
{
m_sports_out->write(data);
}
diff --git a/src/devices/bus/sms_ctrl/sports.h b/src/devices/bus/sms_ctrl/sports.h
index 5ca209e748d..5e371372e3c 100644
--- a/src/devices/bus/sms_ctrl/sports.h
+++ b/src/devices/bus/sms_ctrl/sports.h
@@ -28,7 +28,7 @@ class sms_sports_pad_device : public device_t,
{
public:
// construction/destruction
- sms_sports_pad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_sports_pad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -42,8 +42,8 @@ protected:
virtual void device_start() override;
// device_sms_control_port_interface overrides
- virtual UINT8 peripheral_r() override;
- virtual void peripheral_w(UINT8 data) override;
+ virtual uint8_t peripheral_r() override;
+ virtual void peripheral_w(uint8_t data) override;
private:
required_ioport m_sports_in;
@@ -51,10 +51,10 @@ private:
required_ioport m_sports_x;
required_ioport m_sports_y;
- UINT8 m_read_state;
- UINT8 m_th_pin_state;
- UINT8 m_x_axis_reset_value;
- UINT8 m_y_axis_reset_value;
+ uint8_t m_read_state;
+ uint8_t m_th_pin_state;
+ uint8_t m_x_axis_reset_value;
+ uint8_t m_y_axis_reset_value;
const attotime m_interval;
emu_timer *m_sportspad_timer;
static const device_timer_id TIMER_SPORTSPAD = 0;
diff --git a/src/devices/bus/sms_ctrl/sportsjp.cpp b/src/devices/bus/sms_ctrl/sportsjp.cpp
index e9b148c19e9..97914397272 100644
--- a/src/devices/bus/sms_ctrl/sportsjp.cpp
+++ b/src/devices/bus/sms_ctrl/sportsjp.cpp
@@ -92,7 +92,7 @@ ioport_constructor sms_sports_pad_jp_device::device_input_ports() const
// sms_sports_pad_jp_device - constructor
//-------------------------------------------------
-sms_sports_pad_jp_device::sms_sports_pad_jp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_sports_pad_jp_device::sms_sports_pad_jp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SMS_SPORTS_PAD_JP, "Sega SMS Sports Pad JP", tag, owner, clock, "sms_sports_pad_jp", __FILE__),
device_sms_control_port_interface(mconfig, *this),
m_sports_jp_in(*this, "SPORTS_JP_IN"),
@@ -126,7 +126,7 @@ void sms_sports_pad_jp_device::device_start()
// sms_peripheral_r - sports pad read
//-------------------------------------------------
-UINT8 sms_sports_pad_jp_device::peripheral_r()
+uint8_t sms_sports_pad_jp_device::peripheral_r()
{
int num_intervals = (machine().time() - m_start_time).as_double() / m_interval.as_double();
diff --git a/src/devices/bus/sms_ctrl/sportsjp.h b/src/devices/bus/sms_ctrl/sportsjp.h
index 3e82c18dd85..2679f685806 100644
--- a/src/devices/bus/sms_ctrl/sportsjp.h
+++ b/src/devices/bus/sms_ctrl/sportsjp.h
@@ -28,7 +28,7 @@ class sms_sports_pad_jp_device : public device_t,
{
public:
// construction/destruction
- sms_sports_pad_jp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_sports_pad_jp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -42,7 +42,7 @@ protected:
virtual void device_start() override;
// device_sms_control_port_interface overrides
- virtual UINT8 peripheral_r() override;
+ virtual uint8_t peripheral_r() override;
private:
required_ioport m_sports_jp_in;
@@ -50,9 +50,9 @@ private:
required_ioport m_sports_jp_x;
required_ioport m_sports_jp_y;
- UINT8 m_rldu_pins_state;
- UINT8 m_tl_pin_state;
- UINT8 m_tr_pin_state;
+ uint8_t m_rldu_pins_state;
+ uint8_t m_tl_pin_state;
+ uint8_t m_tr_pin_state;
attotime m_start_time;
const attotime m_interval;
};
diff --git a/src/devices/bus/sms_exp/gender.cpp b/src/devices/bus/sms_exp/gender.cpp
index 49ccc50e24e..c021b9feef3 100644
--- a/src/devices/bus/sms_exp/gender.cpp
+++ b/src/devices/bus/sms_exp/gender.cpp
@@ -33,7 +33,7 @@ const device_type SMS_GENDER_ADAPTER = &device_creator<sms_gender_adapter_device
// sms_gender_adapter_device - constructor
//-------------------------------------------------
-sms_gender_adapter_device::sms_gender_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_gender_adapter_device::sms_gender_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SMS_GENDER_ADAPTER, "Gender Adapter", tag, owner, clock, "sms_gender_adapter", __FILE__),
device_sms_expansion_slot_interface(mconfig, *this),
m_subslot(*this, "subslot")
diff --git a/src/devices/bus/sms_exp/gender.h b/src/devices/bus/sms_exp/gender.h
index 79c654c6022..d71f35c44bf 100644
--- a/src/devices/bus/sms_exp/gender.h
+++ b/src/devices/bus/sms_exp/gender.h
@@ -29,7 +29,7 @@ class sms_gender_adapter_device : public device_t,
{
public:
// construction/destruction
- sms_gender_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_gender_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device_sms_expansion_slot_interface overrides
virtual DECLARE_READ8_MEMBER(read) override;
diff --git a/src/devices/bus/sms_exp/smsexp.cpp b/src/devices/bus/sms_exp/smsexp.cpp
index 73961674687..9cd787cabf5 100644
--- a/src/devices/bus/sms_exp/smsexp.cpp
+++ b/src/devices/bus/sms_exp/smsexp.cpp
@@ -50,7 +50,7 @@ device_sms_expansion_slot_interface::~device_sms_expansion_slot_interface()
// sms_expansion_slot_device - constructor
//-------------------------------------------------
-sms_expansion_slot_device::sms_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sms_expansion_slot_device::sms_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SMS_EXPANSION_SLOT, "Sega SMS expansion slot", tag, owner, clock, "sms_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr)
{
diff --git a/src/devices/bus/sms_exp/smsexp.h b/src/devices/bus/sms_exp/smsexp.h
index 2d575b6da40..9ef2a6ef852 100644
--- a/src/devices/bus/sms_exp/smsexp.h
+++ b/src/devices/bus/sms_exp/smsexp.h
@@ -41,7 +41,7 @@ class sms_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- sms_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sms_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~sms_expansion_slot_device();
// reading and writing
diff --git a/src/devices/bus/snes/bsx.cpp b/src/devices/bus/snes/bsx.cpp
index a534018f78d..569f538b590 100644
--- a/src/devices/bus/snes/bsx.cpp
+++ b/src/devices/bus/snes/bsx.cpp
@@ -24,7 +24,7 @@ const device_type SNS_HIROM_BSX = &device_creator<sns_rom_bsxhi_device>;
const device_type SNS_BSMEMPAK = &device_creator<sns_rom_bsmempak_device>;
-sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_base_unit(nullptr),
access_00_1f(0),
@@ -37,7 +37,7 @@ sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, device_typ
{
}
-sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_device(mconfig, SNS_ROM_BSX, "SNES BS-X Cart", tag, owner, clock, "sns_rom_bsx", __FILE__),
m_base_unit(nullptr),
access_00_1f(0),
@@ -50,19 +50,19 @@ sns_rom_bsx_device::sns_rom_bsx_device(const machine_config &mconfig, const char
{
}
-sns_rom_bsxlo_device::sns_rom_bsxlo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_bsxlo_device::sns_rom_bsxlo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_device(mconfig, SNS_LOROM_BSX, "SNES Cart (LoROM) + BS-X slot", tag, owner, clock, "sns_rom_bsxlo", __FILE__),
m_slot(*this, "bs_slot")
{
}
-sns_rom_bsxhi_device::sns_rom_bsxhi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_bsxhi_device::sns_rom_bsxhi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom21_device(mconfig, SNS_HIROM_BSX, "SNES Cart (HiROM) + BS-X slot", tag, owner, clock, "sns_rom_bsxhi", __FILE__),
m_slot(*this, "bs_slot")
{
}
-sns_rom_bsmempak_device::sns_rom_bsmempak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_bsmempak_device::sns_rom_bsmempak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_device(mconfig, SNS_BSMEMPAK, "SNES BS-X Memory packs", tag, owner, clock, "sns_bsmempak", __FILE__), m_command(0), m_write_old(0), m_write_new(0), m_flash_enable(0), m_read_enable(0), m_write_enable(0)
{
}
@@ -145,7 +145,7 @@ void BSX_base::init()
}
-UINT8 BSX_base::read(UINT32 offset)
+uint8_t BSX_base::read(uint32_t offset)
{
offset &= 0xffff;
if (offset < 0x2188 || offset >= 0x21a0)
@@ -159,7 +159,7 @@ UINT8 BSX_base::read(UINT32 offset)
// no 218b? no 218d? no 2191? no 2195? no 219a-219f?
case 0x2192:
{
- UINT8 counter = r2192_counter++;
+ uint8_t counter = r2192_counter++;
if (r2192_counter >= 18)
r2192_counter = 0;
@@ -207,7 +207,7 @@ UINT8 BSX_base::read(UINT32 offset)
}
-void BSX_base::write(UINT32 offset, UINT8 data)
+void BSX_base::write(uint32_t offset, uint8_t data)
{
offset &= 0xffff;
if (offset < 0x2188 || offset >= 0x21a0)
@@ -436,7 +436,7 @@ READ8_MEMBER(sns_rom_bsx_device::chip_read)
if ((offset & 0xf0ffff) == 0x005000) //$[00-0f]:5000 reg access
{
- UINT8 n = (offset >> 16) & 0x0f;
+ uint8_t n = (offset >> 16) & 0x0f;
return m_cart_regs[n];
}
@@ -455,7 +455,7 @@ WRITE8_MEMBER(sns_rom_bsx_device::chip_write)
if ((offset & 0xf0ffff) == 0x005000) //$[00-0f]:5000 reg access
{
- UINT8 n = (offset >> 16) & 0x0f;
+ uint8_t n = (offset >> 16) & 0x0f;
m_cart_regs[n] = data;
if (n == 0x0e && data & 0x80)
access_update();
diff --git a/src/devices/bus/snes/bsx.h b/src/devices/bus/snes/bsx.h
index 43ee42f7b4a..677b81808dc 100644
--- a/src/devices/bus/snes/bsx.h
+++ b/src/devices/bus/snes/bsx.h
@@ -14,16 +14,16 @@ public:
running_machine &machine() const { return m_machine; }
void init();
- UINT8 read(UINT32 offset);
- void write(UINT32 offset, UINT8 data);
+ uint8_t read(uint32_t offset);
+ void write(uint32_t offset, uint8_t data);
private:
// regs
- UINT8 regs[0x18]; // 0x2188-0x219f
+ uint8_t regs[0x18]; // 0x2188-0x219f
// counter + clock
- UINT8 r2192_counter;
- UINT8 r2192_hour, r2192_minute, r2192_second;
+ uint8_t r2192_counter;
+ uint8_t r2192_hour, r2192_minute, r2192_second;
running_machine& m_machine;
};
@@ -34,8 +34,8 @@ class sns_rom_bsx_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_bsx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- sns_rom_bsx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_bsx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ sns_rom_bsx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -54,17 +54,17 @@ public:
std::unique_ptr<BSX_base> m_base_unit;
// cart regs
- UINT8 m_cart_regs[16];
- UINT8 access_00_1f; // 1 = CART, 0 = NOTHING
- UINT8 access_80_9f; // 1 = CART, 0 = NOTHING
- UINT8 access_40_4f; // 1 = NOTHING, 0 = PRAM
- UINT8 access_50_5f; // 1 = NOTHING, 0 = PRAM
- UINT8 access_60_6f; // 1 = PRAM, 0 = NOTHING
- UINT8 rom_access; // 2 = HiROM, 1 = LoROM, 0 = PRAM
+ uint8_t m_cart_regs[16];
+ uint8_t access_00_1f; // 1 = CART, 0 = NOTHING
+ uint8_t access_80_9f; // 1 = CART, 0 = NOTHING
+ uint8_t access_40_4f; // 1 = NOTHING, 0 = PRAM
+ uint8_t access_50_5f; // 1 = NOTHING, 0 = PRAM
+ uint8_t access_60_6f; // 1 = PRAM, 0 = NOTHING
+ uint8_t rom_access; // 2 = HiROM, 1 = LoROM, 0 = PRAM
void access_update();
- UINT8 m_pram[0x80000];
+ uint8_t m_pram[0x80000];
private:
required_device<sns_bsx_cart_slot_device> m_slot;
@@ -76,7 +76,7 @@ class sns_rom_bsxlo_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_bsxlo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_bsxlo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -96,7 +96,7 @@ class sns_rom_bsxhi_device : public sns_rom21_device
{
public:
// construction/destruction
- sns_rom_bsxhi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_bsxhi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -117,7 +117,7 @@ class sns_rom_bsmempak_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_bsmempak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_bsmempak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -132,9 +132,9 @@ public:
// virtual DECLARE_WRITE8_MEMBER(chip_write);
// flash regs
- UINT32 m_command;
- UINT8 m_write_old;
- UINT8 m_write_new;
+ uint32_t m_command;
+ uint8_t m_write_old;
+ uint8_t m_write_new;
int m_flash_enable;
int m_read_enable;
diff --git a/src/devices/bus/snes/event.cpp b/src/devices/bus/snes/event.cpp
index ef39d9fbce6..ca46a2a89ea 100644
--- a/src/devices/bus/snes/event.cpp
+++ b/src/devices/bus/snes/event.cpp
@@ -20,7 +20,7 @@
const device_type SNS_PFEST94 = &device_creator<sns_pfest94_device>;
-sns_pfest94_device::sns_pfest94_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_pfest94_device::sns_pfest94_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SNS_PFEST94, "SNES Powerfest '94", tag, owner, clock, "sns_pfest94", __FILE__),
device_sns_cart_interface(mconfig, *this),
m_upd7725(*this, "dsp"),
@@ -36,8 +36,8 @@ sns_pfest94_device::sns_pfest94_device(const machine_config &mconfig, const char
void sns_pfest94_device::device_start()
{
- m_dsp_prg.resize(0x2000/sizeof(UINT32));
- m_dsp_data.resize(0x800/sizeof(UINT16));
+ m_dsp_prg.resize(0x2000/sizeof(uint32_t));
+ m_dsp_data.resize(0x800/sizeof(uint16_t));
pfest94_timer = timer_alloc(TIMER_EVENT);
pfest94_timer->reset();
@@ -162,11 +162,11 @@ WRITE8_MEMBER( sns_pfest94_device::chip_write )
//-------------------------------------------------
// helpers
-inline UINT32 get_prg(UINT8 *CPU, UINT32 addr)
+inline uint32_t get_prg(uint8_t *CPU, uint32_t addr)
{
return ((CPU[addr * 4] << 24) | (CPU[addr * 4 + 1] << 16) | (CPU[addr * 4 + 2] << 8) | 0x00);
}
-inline UINT16 get_data(UINT8 *CPU, UINT32 addr)
+inline uint16_t get_data(uint8_t *CPU, uint32_t addr)
{
return ((CPU[addr * 2] << 8) | CPU[addr * 2 + 1]);
}
diff --git a/src/devices/bus/snes/event.h b/src/devices/bus/snes/event.h
index a09adf15949..4703ed9b2cf 100644
--- a/src/devices/bus/snes/event.h
+++ b/src/devices/bus/snes/event.h
@@ -14,7 +14,7 @@ class sns_pfest94_device : public device_t,
{
public:
// construction/destruction
- sns_pfest94_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_pfest94_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -38,13 +38,13 @@ public:
virtual DECLARE_READ16_MEMBER(necdsp_data_r);
private:
- UINT8 m_base_bank;
- UINT8 m_mask;
- UINT8 m_status;
- UINT32 m_count;
+ uint8_t m_base_bank;
+ uint8_t m_mask;
+ uint8_t m_status;
+ uint32_t m_count;
- std::vector<UINT32> m_dsp_prg;
- std::vector<UINT16> m_dsp_data;
+ std::vector<uint32_t> m_dsp_prg;
+ std::vector<uint16_t> m_dsp_data;
static const device_timer_id TIMER_EVENT = 0;
emu_timer *pfest94_timer;
diff --git a/src/devices/bus/snes/rom.cpp b/src/devices/bus/snes/rom.cpp
index 3763f11ed91..1eed877ce83 100644
--- a/src/devices/bus/snes/rom.cpp
+++ b/src/devices/bus/snes/rom.cpp
@@ -29,19 +29,19 @@ const device_type SNS_LOROM_MCPIR2 = &device_creator<sns_rom_mcpirate2_device>;
const device_type SNS_LOROM_20COL = &device_creator<sns_rom_20col_device>;
-sns_rom_device::sns_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+sns_rom_device::sns_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sns_cart_interface( mconfig, *this )
{
}
-sns_rom_device::sns_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_device::sns_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SNS_LOROM, "SNES Cart (LoROM)", tag, owner, clock, "sns_rom", __FILE__),
device_sns_cart_interface( mconfig, *this )
{
}
-sns_rom_obc1_device::sns_rom_obc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_obc1_device::sns_rom_obc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_device(mconfig, SNS_LOROM_OBC1, "SNES Cart (LoROM) + OBC-1", tag, owner, clock, "sns_rom_obc1", __FILE__), m_address(0), m_offset(0), m_shift(0)
{
}
@@ -49,43 +49,43 @@ sns_rom_obc1_device::sns_rom_obc1_device(const machine_config &mconfig, const ch
// Pirate LoROM 'mappers'
-sns_rom_pokemon_device::sns_rom_pokemon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_pokemon_device::sns_rom_pokemon_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_device(mconfig, SNS_LOROM_POKEMON, "SNES Pirate Carts with Protection", tag, owner, clock, "sns_rom_pokemon", __FILE__), m_latch(0)
{
}
-sns_rom_tekken2_device::sns_rom_tekken2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_tekken2_device::sns_rom_tekken2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_device(mconfig, SNS_LOROM_TEKKEN2, "SNES Tekken 2", tag, owner, clock, "sns_rom_tekken2", __FILE__), m_prot(0)
{
}
-sns_rom_soulblad_device::sns_rom_soulblad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_soulblad_device::sns_rom_soulblad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_device(mconfig, SNS_LOROM_SOULBLAD, "SNES Soul Blade", tag, owner, clock, "sns_rom_soulblad", __FILE__)
{
}
-sns_rom_banana_device::sns_rom_banana_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_banana_device::sns_rom_banana_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_device(mconfig, SNS_LOROM_BANANA, "SNES Banana de Pijamas", tag, owner, clock, "sns_rom_banana", __FILE__)
{
}
-sns_rom_bugs_device::sns_rom_bugs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_bugs_device::sns_rom_bugs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_device(mconfig, SNS_LOROM_BUGSLIFE, "SNES A Bug's Life", tag, owner, clock, "sns_rom_bugslife", __FILE__)
{
}
// Multigame LoROM 'mappers'
-sns_rom_mcpirate1_device::sns_rom_mcpirate1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_mcpirate1_device::sns_rom_mcpirate1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_device(mconfig, SNS_LOROM_MCPIR1, "SNES Pirate Multigame Carts Type 1", tag, owner, clock, "sns_rom_mcpirate1", __FILE__), m_base_bank(0)
{
}
-sns_rom_mcpirate2_device::sns_rom_mcpirate2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_mcpirate2_device::sns_rom_mcpirate2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_device(mconfig, SNS_LOROM_MCPIR2, "SNES Pirate Multigame Carts Type 2", tag, owner, clock, "sns_rom_mcpirate2", __FILE__), m_base_bank(0)
{
}
-sns_rom_20col_device::sns_rom_20col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_20col_device::sns_rom_20col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_device(mconfig, SNS_LOROM_20COL, "SNES Super 20 Collection", tag, owner, clock, "sns_rom_20col", __FILE__), m_base_bank(0)
{
}
@@ -204,8 +204,8 @@ READ8_MEMBER(sns_rom_device::read_h)
READ8_MEMBER( sns_rom_obc1_device::chip_read )
{
- UINT16 address = offset & 0x1fff;
- UINT8 value;
+ uint16_t address = offset & 0x1fff;
+ uint8_t value;
switch (address)
{
@@ -240,8 +240,8 @@ READ8_MEMBER( sns_rom_obc1_device::chip_read )
WRITE8_MEMBER( sns_rom_obc1_device::chip_write )
{
- UINT16 address = offset & 0x1fff;
- UINT8 temp;
+ uint16_t address = offset & 0x1fff;
+ uint8_t temp;
switch(address)
{
@@ -308,7 +308,7 @@ WRITE8_MEMBER( sns_rom_pokemon_device::chip_write )
// The protection itself is accessed in banks $80-$bf. Accessing (read/write, doesn't matter) address lines
// A8,A9,A10 in these banks in a certain sequence makes the mc return a 4bit value. [d4s]
// Details on a possible algorythm behind the sequence of accesses were provided by nocash. Thanks!
-void sns_rom_tekken2_device::update_prot(UINT32 offset)
+void sns_rom_tekken2_device::update_prot(uint32_t offset)
{
// accesses to [80-bf][8000-87ff] ranges update the protection value
offset &= 0x7ff;
@@ -377,7 +377,7 @@ WRITE8_MEMBER( sns_rom_tekken2_device::chip_write )
// Banks $c0-$ff return open bus.
READ8_MEMBER( sns_rom_soulblad_device::chip_read )
{
- UINT8 value;
+ uint8_t value;
offset &= 3;
switch (offset)
{
diff --git a/src/devices/bus/snes/rom.h b/src/devices/bus/snes/rom.h
index a197383d1cb..ddd73ab33da 100644
--- a/src/devices/bus/snes/rom.h
+++ b/src/devices/bus/snes/rom.h
@@ -13,8 +13,8 @@ class sns_rom_device : public device_t,
{
public:
// construction/destruction
- sns_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- sns_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ sns_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -30,7 +30,7 @@ class sns_rom_obc1_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_obc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_obc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -43,7 +43,7 @@ public:
int m_address;
int m_offset;
int m_shift;
- UINT8 m_ram[0x2000];
+ uint8_t m_ram[0x2000];
};
@@ -54,7 +54,7 @@ class sns_rom_pokemon_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_pokemon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_pokemon_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -63,7 +63,7 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(chip_read) override; // protection device
virtual DECLARE_WRITE8_MEMBER(chip_write) override; // protection device
- UINT8 m_latch;
+ uint8_t m_latch;
};
// ======================> sns_rom_tekken2_device
@@ -72,7 +72,7 @@ class sns_rom_tekken2_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_tekken2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_tekken2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -82,11 +82,11 @@ public:
virtual DECLARE_READ8_MEMBER(chip_read) override; // protection device
virtual DECLARE_WRITE8_MEMBER(chip_write) override; // protection device
- void update_prot(UINT32 offset);
+ void update_prot(uint32_t offset);
// bit0-3 prot value, bit4 direction, bit5 function
// reads must return (prot value) +1/-1/<<1/>>1 depending on bit4 & bit5
- UINT8 m_prot;
+ uint8_t m_prot;
};
// ======================> sns_rom_soulblad_device
@@ -95,7 +95,7 @@ class sns_rom_soulblad_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_soulblad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_soulblad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(chip_read) override; // protection device
@@ -107,7 +107,7 @@ class sns_rom_mcpirate1_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_mcpirate1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_mcpirate1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -117,7 +117,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_l) override;
virtual DECLARE_READ8_MEMBER(read_h) override;
virtual DECLARE_WRITE8_MEMBER(chip_write) override; // bankswitch device
- UINT8 m_base_bank;
+ uint8_t m_base_bank;
};
// ======================> sns_rom_mcpirate2_device
@@ -126,7 +126,7 @@ class sns_rom_mcpirate2_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_mcpirate2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_mcpirate2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -136,7 +136,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_l) override;
virtual DECLARE_READ8_MEMBER(read_h) override;
virtual DECLARE_WRITE8_MEMBER(chip_write) override; // bankswitch device
- UINT8 m_base_bank;
+ uint8_t m_base_bank;
};
// ======================> sns_rom_20col_device
@@ -145,7 +145,7 @@ class sns_rom_20col_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_20col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_20col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -154,7 +154,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_l) override;
virtual DECLARE_READ8_MEMBER(read_h) override;
virtual DECLARE_WRITE8_MEMBER(chip_write) override; // bankswitch device
- UINT8 m_base_bank;
+ uint8_t m_base_bank;
};
// ======================> sns_rom_banana_device
@@ -163,7 +163,7 @@ class sns_rom_banana_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_banana_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_banana_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
// virtual void device_start();
@@ -172,7 +172,7 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(chip_read) override; // protection device
virtual DECLARE_WRITE8_MEMBER(chip_write) override; // protection device
- UINT8 m_latch[16];
+ uint8_t m_latch[16];
};
// ======================> sns_rom_bugs_device
@@ -181,7 +181,7 @@ class sns_rom_bugs_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_bugs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_bugs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -190,7 +190,7 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(chip_read) override; // protection device
virtual DECLARE_WRITE8_MEMBER(chip_write) override; // protection device
- UINT8 m_latch[0x800];
+ uint8_t m_latch[0x800];
};
diff --git a/src/devices/bus/snes/rom21.cpp b/src/devices/bus/snes/rom21.cpp
index 175e64991de..78db94492d8 100644
--- a/src/devices/bus/snes/rom21.cpp
+++ b/src/devices/bus/snes/rom21.cpp
@@ -19,19 +19,19 @@ const device_type SNS_HIROM = &device_creator<sns_rom21_device>;
const device_type SNS_HIROM_SRTC = &device_creator<sns_rom21_srtc_device>;
-sns_rom21_device::sns_rom21_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+sns_rom21_device::sns_rom21_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sns_cart_interface( mconfig, *this )
{
}
-sns_rom21_device::sns_rom21_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom21_device::sns_rom21_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SNS_HIROM, "SNES Cart (HiROM)", tag, owner, clock, "sns_rom21", __FILE__),
device_sns_cart_interface( mconfig, *this )
{
}
-sns_rom21_srtc_device::sns_rom21_srtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom21_srtc_device::sns_rom21_srtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom21_device(mconfig, SNS_HIROM_SRTC, "SNES Cart (HiROM) + S-RTC", tag, owner, clock, "sns_rom21_srtc", __FILE__), m_mode(0), m_index(0)
{
}
@@ -94,7 +94,7 @@ READ8_MEMBER(sns_rom21_device::read_h)
***************************************************************************/
-static const UINT8 srtc_months[12] =
+static const uint8_t srtc_months[12] =
{
31, 28, 31,
30, 31, 30,
@@ -124,10 +124,10 @@ void sns_rom21_srtc_device::update_time()
// Returns day-of-week for specified date
// e.g. 0 = Sunday, 1 = Monday, ... 6 = Saturday
// Usage: weekday(2008, 1, 1) returns the weekday of January 1st, 2008
-UINT8 sns_rom21_srtc_device::srtc_weekday( UINT32 year, UINT32 month, UINT32 day )
+uint8_t sns_rom21_srtc_device::srtc_weekday( uint32_t year, uint32_t month, uint32_t day )
{
- UINT32 y = 1900, m = 1; // Epoch is 1900-01-01
- UINT32 sum = 0; // Number of days passed since epoch
+ uint32_t y = 1900, m = 1; // Epoch is 1900-01-01
+ uint32_t sum = 0; // Number of days passed since epoch
year = std::max(1900U, year);
month = std::max(1U, std::min(12U, month));
@@ -135,7 +135,7 @@ UINT8 sns_rom21_srtc_device::srtc_weekday( UINT32 year, UINT32 month, UINT32 day
while (y < year)
{
- UINT8 leapyear = 0;
+ uint8_t leapyear = 0;
if ((y % 4) == 0)
{
leapyear = 1;
@@ -150,10 +150,10 @@ UINT8 sns_rom21_srtc_device::srtc_weekday( UINT32 year, UINT32 month, UINT32 day
while (m < month)
{
- UINT32 days = srtc_months[m - 1];
+ uint32_t days = srtc_months[m - 1];
if (days == 28)
{
- UINT8 leapyear = 0;
+ uint8_t leapyear = 0;
if ((y % 4) == 0)
{
leapyear = 1;
@@ -225,9 +225,9 @@ WRITE8_MEMBER(sns_rom21_srtc_device::chip_write)
if (m_index == 12)
{
// Day of week is automatically calculated and written
- UINT32 day = m_rtc_ram[6] + m_rtc_ram[7] * 10;
- UINT32 month = m_rtc_ram[8];
- UINT32 year = m_rtc_ram[9] + m_rtc_ram[10] * 10 + m_rtc_ram[11] * 100;
+ uint32_t day = m_rtc_ram[6] + m_rtc_ram[7] * 10;
+ uint32_t month = m_rtc_ram[8];
+ uint32_t year = m_rtc_ram[9] + m_rtc_ram[10] * 10 + m_rtc_ram[11] * 100;
year += 1000;
m_rtc_ram[m_index++] = srtc_weekday(year, month, day);
@@ -243,7 +243,7 @@ WRITE8_MEMBER(sns_rom21_srtc_device::chip_write)
}
else if (data == 4)
{
- UINT8 i;
+ uint8_t i;
m_mode = RTCM_Ready;
m_index = -1;
for(i = 0; i < 13; i++)
diff --git a/src/devices/bus/snes/rom21.h b/src/devices/bus/snes/rom21.h
index 2196e90ca56..befd130f02f 100644
--- a/src/devices/bus/snes/rom21.h
+++ b/src/devices/bus/snes/rom21.h
@@ -13,8 +13,8 @@ class sns_rom21_device : public device_t,
{
public:
// construction/destruction
- sns_rom21_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- sns_rom21_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom21_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ sns_rom21_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -31,7 +31,7 @@ class sns_rom21_srtc_device : public sns_rom21_device
{
public:
// construction/destruction
- sns_rom21_srtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom21_srtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -51,12 +51,12 @@ public:
};
void update_time();
- UINT8 srtc_weekday(UINT32 year, UINT32 month, UINT32 day);
+ uint8_t srtc_weekday(uint32_t year, uint32_t month, uint32_t day);
//this is now allocated in the main snes cart class, to allow saving to nvram
- //UINT8 m_rtc_ram[13];
- INT32 m_mode;
- INT8 m_index;
+ //uint8_t m_rtc_ram[13];
+ int32_t m_mode;
+ int8_t m_index;
};
diff --git a/src/devices/bus/snes/sa1.cpp b/src/devices/bus/snes/sa1.cpp
index b22af792a97..3608aa9bd8d 100644
--- a/src/devices/bus/snes/sa1.cpp
+++ b/src/devices/bus/snes/sa1.cpp
@@ -85,7 +85,7 @@
const device_type SNS_LOROM_SA1 = &device_creator<sns_sa1_device>;
-sns_sa1_device::sns_sa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_sa1_device::sns_sa1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SNS_LOROM_SA1, "SNES Cart + SA-1", tag, owner, clock, "sns_rom_sa1", __FILE__),
device_sns_cart_interface( mconfig, *this ),
m_sa1(*this, "sa1cpu"), m_sa1_ctrl(0), m_scpu_sie(0), m_sa1_reset(0), m_sa1_nmi(0), m_sa1_irq(0), m_scpu_ctrl(0), m_sa1_sie(0), m_irq_vector(0), m_nmi_vector(0), m_hcount(0), m_vcount(0), m_bank_c_hi(0), m_bank_c_rom(0), m_bank_d_hi(0), m_bank_d_rom(0), m_bank_e_hi(0), m_bank_e_rom(0), m_bank_f_hi(0), m_bank_f_rom(0), m_bwram_snes(0), m_bwram_sa1(0), m_bwram_sa1_source(0), m_bwram_sa1_format(0), m_bwram_write_snes(0), m_bwram_write_sa1(0), m_bwpa_sa1(0), m_iram_write_snes(0), m_iram_write_sa1(0), m_dma_ctrl(0), m_dma_ccparam(0), m_src_addr(0), m_dst_addr(0), m_dma_cnt(0), m_math_ctlr(0), m_math_overflow(0), m_math_a(0), m_math_b(0), m_math_res(0), m_vda(0), m_vbit(0), m_vlen(0), m_drm(0), m_scpu_flags(0), m_sa1_flags(0), m_hcr(0), m_vcr(0)
@@ -195,7 +195,7 @@ void sns_sa1_device::recalc_irqs()
// handle this separately to avoid accessing recursively the regs?
-UINT8 sns_sa1_device::var_length_read(address_space &space, UINT32 offset)
+uint8_t sns_sa1_device::var_length_read(address_space &space, uint32_t offset)
{
// handle 0xffea/0xffeb/0xffee/0xffef
if ((offset & 0xffffe0) == 0x00ffe0)
@@ -236,9 +236,9 @@ void sns_sa1_device::dma_transfer(address_space &space)
while (m_dma_cnt--)
{
- UINT8 data = 0; // open bus?
- UINT32 dma_src = m_src_addr++;
- UINT32 dma_dst = m_dst_addr++;
+ uint8_t data = 0; // open bus?
+ uint32_t dma_src = m_src_addr++;
+ uint32_t dma_dst = m_dst_addr++;
// source and destination cannot be the same
// source = { 0=ROM, 1=BWRAM, 2=IRAM }
@@ -312,9 +312,9 @@ void sns_sa1_device::dma_cctype2_transfer(address_space &space)
{
}
-UINT8 sns_sa1_device::read_regs(address_space &space, UINT32 offset)
+uint8_t sns_sa1_device::read_regs(address_space &space, uint32_t offset)
{
- UINT8 value = 0xff;
+ uint8_t value = 0xff;
offset &= 0x1ff; // $2200 + offset gives the reg value to compare with docs
switch (offset)
@@ -349,23 +349,23 @@ UINT8 sns_sa1_device::read_regs(address_space &space, UINT32 offset)
break;
case 0x106:
// Math Result bits0-7
- value = (UINT64)(m_math_res >> 0) & 0xff;
+ value = (uint64_t)(m_math_res >> 0) & 0xff;
break;
case 0x107:
// Math Result bits8-15
- value = (UINT64)(m_math_res >> 8) & 0xff;
+ value = (uint64_t)(m_math_res >> 8) & 0xff;
break;
case 0x108:
// Math Result bits16-23
- value = (UINT64)(m_math_res >> 16) & 0xff;
+ value = (uint64_t)(m_math_res >> 16) & 0xff;
break;
case 0x109:
// Math Result bits24-31
- value = (UINT64)(m_math_res >> 24) & 0xff;
+ value = (uint64_t)(m_math_res >> 24) & 0xff;
break;
case 0x10a:
// Math Result bits32-39
- value = (UINT64)(m_math_res >> 32) & 0xff;
+ value = (uint64_t)(m_math_res >> 32) & 0xff;
break;
case 0x10b:
// Math Overflow (above 40bit result)
@@ -374,7 +374,7 @@ UINT8 sns_sa1_device::read_regs(address_space &space, UINT32 offset)
case 0x10c:
// Var-Length Read Port Low
{
- UINT32 data = (var_length_read(space, m_vda + 0) << 0) | (var_length_read(space, m_vda + 1) << 8)
+ uint32_t data = (var_length_read(space, m_vda + 0) << 0) | (var_length_read(space, m_vda + 1) << 8)
| (var_length_read(space, m_vda + 2) << 16);
data >>= m_vbit;
value = (data >> 0) & 0xff;
@@ -383,7 +383,7 @@ UINT8 sns_sa1_device::read_regs(address_space &space, UINT32 offset)
case 0x10d:
// Var-Length Read Port High
{
- UINT32 data = (var_length_read(space, m_vda + 0) << 0) | (var_length_read(space, m_vda + 1) << 8)
+ uint32_t data = (var_length_read(space, m_vda + 0) << 0) | (var_length_read(space, m_vda + 1) << 8)
| (var_length_read(space, m_vda + 2) << 16);
data >>= m_vbit;
@@ -408,7 +408,7 @@ UINT8 sns_sa1_device::read_regs(address_space &space, UINT32 offset)
return value;
}
-void sns_sa1_device::write_regs(address_space &space, UINT32 offset, UINT8 data)
+void sns_sa1_device::write_regs(address_space &space, uint32_t offset, uint8_t data)
{
offset &= 0x1ff; // $2200 + offset gives the reg value to compare with docs
@@ -749,7 +749,7 @@ void sns_sa1_device::write_regs(address_space &space, UINT32 offset, UINT8 data)
switch (m_math_ctlr)
{
case 0: //signed multiplication
- m_math_res = (INT16)m_math_a * (INT16)m_math_b;
+ m_math_res = (int16_t)m_math_a * (int16_t)m_math_b;
m_math_b = 0;
break;
case 1: //unsigned division
@@ -757,15 +757,15 @@ void sns_sa1_device::write_regs(address_space &space, UINT32 offset, UINT8 data)
m_math_res = 0;
else
{
- INT16 quotient = (INT16)m_math_a / (UINT16)m_math_b;
- UINT16 remainder = (INT16)m_math_a % (UINT16)m_math_b;
- m_math_res = (UINT64)((remainder << 16) | quotient);
+ int16_t quotient = (int16_t)m_math_a / (uint16_t)m_math_b;
+ uint16_t remainder = (int16_t)m_math_a % (uint16_t)m_math_b;
+ m_math_res = (uint64_t)((remainder << 16) | quotient);
}
break;
case 2: //sigma (accumulative multiplication)
case 3:
- UINT64 acum = (INT16)m_math_a * (INT16)m_math_b;
- UINT64 mask = U64(0xffffffffff);
+ uint64_t acum = (int16_t)m_math_a * (int16_t)m_math_b;
+ uint64_t mask = U64(0xffffffffff);
m_math_res += acum;
m_math_overflow = (m_math_res > mask) ? 0x80 : 0;
m_math_res &= mask;
@@ -807,20 +807,20 @@ void sns_sa1_device::write_regs(address_space &space, UINT32 offset, UINT8 data)
}
}
-UINT8 sns_sa1_device::read_iram(UINT32 offset)
+uint8_t sns_sa1_device::read_iram(uint32_t offset)
{
return m_internal_ram[offset & 0x7ff];
}
-void sns_sa1_device::write_iram(UINT32 offset, UINT8 data)
+void sns_sa1_device::write_iram(uint32_t offset, uint8_t data)
{
m_internal_ram[offset & 0x7ff] = data;
}
-UINT8 sns_sa1_device::read_bwram(UINT32 offset)
+uint8_t sns_sa1_device::read_bwram(uint32_t offset)
{
int shift;
- UINT8 mask;
+ uint8_t mask;
if (m_nvram.empty())
return 0xff; // this should probably never happen, or are there SA-1 games with no BWRAM?
@@ -850,9 +850,9 @@ UINT8 sns_sa1_device::read_bwram(UINT32 offset)
return (m_nvram[offset & (m_nvram.size() - 1)] >> shift) & mask;
}
-void sns_sa1_device::write_bwram(UINT32 offset, UINT8 data)
+void sns_sa1_device::write_bwram(uint32_t offset, uint8_t data)
{
- UINT8 mask;
+ uint8_t mask;
if (m_nvram.empty())
return; // this should probably never happen, or are there SA-1 games with no BWRAM?
@@ -973,7 +973,7 @@ WRITE8_MEMBER(sns_sa1_device::write_h)
READ8_MEMBER( sns_sa1_device::chip_read )
{
- UINT16 address = offset & 0xffff;
+ uint16_t address = offset & 0xffff;
if (offset < 0x400000 && address >= 0x2200 && address < 0x2400)
return read_regs(space, address & 0x1ff); // SA-1 Regs
@@ -993,7 +993,7 @@ READ8_MEMBER( sns_sa1_device::chip_read )
WRITE8_MEMBER( sns_sa1_device::chip_write )
{
- UINT16 address = offset & 0xffff;
+ uint16_t address = offset & 0xffff;
if (offset < 0x400000 && address >= 0x2200 && address < 0x2400)
write_regs(space, address & 0x1ff, data); // SA-1 Regs
@@ -1019,7 +1019,7 @@ WRITE8_MEMBER( sns_sa1_device::chip_write )
READ8_MEMBER( sns_sa1_device::sa1_hi_r )
{
- UINT16 address = offset & 0xffff;
+ uint16_t address = offset & 0xffff;
if (offset < 0x400000)
{
@@ -1045,7 +1045,7 @@ READ8_MEMBER( sns_sa1_device::sa1_hi_r )
READ8_MEMBER( sns_sa1_device::sa1_lo_r )
{
- UINT16 address = offset & 0xffff;
+ uint16_t address = offset & 0xffff;
if (offset < 0x400000)
{
@@ -1099,7 +1099,7 @@ READ8_MEMBER( sns_sa1_device::sa1_lo_r )
WRITE8_MEMBER( sns_sa1_device::sa1_hi_w )
{
- UINT16 address = offset & 0xffff;
+ uint16_t address = offset & 0xffff;
if (offset < 0x400000)
{
if (address < 0x6000)
diff --git a/src/devices/bus/snes/sa1.h b/src/devices/bus/snes/sa1.h
index 5d0767340c5..bcd5b6503cc 100644
--- a/src/devices/bus/snes/sa1.h
+++ b/src/devices/bus/snes/sa1.h
@@ -14,7 +14,7 @@ class sns_sa1_device : public device_t,
{
public:
// construction/destruction
- sns_sa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_sa1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -38,72 +38,72 @@ public:
private:
- UINT8 var_length_read(address_space &space, UINT32 offset);
+ uint8_t var_length_read(address_space &space, uint32_t offset);
void dma_transfer(address_space &space);
void dma_cctype1_transfer(address_space &space);
void dma_cctype2_transfer(address_space &space);
- UINT8 read_regs(address_space &space, UINT32 offset);
- UINT8 read_iram(UINT32 offset);
- UINT8 read_bwram(UINT32 offset);
- void write_regs(address_space &space, UINT32 offset, UINT8 data);
- void write_iram(UINT32 offset, UINT8 data);
- void write_bwram(UINT32 offset, UINT8 data);
+ uint8_t read_regs(address_space &space, uint32_t offset);
+ uint8_t read_iram(uint32_t offset);
+ uint8_t read_bwram(uint32_t offset);
+ void write_regs(address_space &space, uint32_t offset, uint8_t data);
+ void write_iram(uint32_t offset, uint8_t data);
+ void write_bwram(uint32_t offset, uint8_t data);
void recalc_irqs();
required_device<g65816_device> m_sa1;
- UINT8 m_internal_ram[0x800];
+ uint8_t m_internal_ram[0x800];
// register related
// $2200
- UINT8 m_sa1_ctrl;
+ uint8_t m_sa1_ctrl;
// $2201
- UINT8 m_scpu_sie;
+ uint8_t m_scpu_sie;
// $2203-$2208
- UINT16 m_sa1_reset, m_sa1_nmi, m_sa1_irq;
+ uint16_t m_sa1_reset, m_sa1_nmi, m_sa1_irq;
// $2209
- UINT8 m_scpu_ctrl;
+ uint8_t m_scpu_ctrl;
// $220a
- UINT8 m_sa1_sie;
+ uint8_t m_sa1_sie;
// $200c-$200d - S-CPU vectors
- UINT16 m_irq_vector, m_nmi_vector;
+ uint16_t m_irq_vector, m_nmi_vector;
// $2012-$2015
- UINT16 m_hcount, m_vcount;
+ uint16_t m_hcount, m_vcount;
// $2220-$2223
int m_bank_c_hi, m_bank_c_rom;
int m_bank_d_hi, m_bank_d_rom;
int m_bank_e_hi, m_bank_e_rom;
int m_bank_f_hi, m_bank_f_rom;
// $2224-$2225 & $223f
- UINT8 m_bwram_snes, m_bwram_sa1;
+ uint8_t m_bwram_snes, m_bwram_sa1;
int m_bwram_sa1_source, m_bwram_sa1_format;
// $2226-$2227
int m_bwram_write_snes, m_bwram_write_sa1;
// $2228
- UINT32 m_bwpa_sa1;
+ uint32_t m_bwpa_sa1;
// $2229-$222a
- UINT8 m_iram_write_snes, m_iram_write_sa1;
+ uint8_t m_iram_write_snes, m_iram_write_sa1;
// $2230-$2231
- UINT8 m_dma_ctrl, m_dma_ccparam;
+ uint8_t m_dma_ctrl, m_dma_ccparam;
// $2232-$2237
- UINT32 m_src_addr, m_dst_addr;
+ uint32_t m_src_addr, m_dst_addr;
// $2238-$2239
- UINT16 m_dma_cnt;
+ uint16_t m_dma_cnt;
// $2240-$224f
- UINT8 m_brf_reg[0x10];
+ uint8_t m_brf_reg[0x10];
// $2250-$2254
- UINT8 m_math_ctlr, m_math_overflow;
- UINT16 m_math_a, m_math_b;
- UINT64 m_math_res;
+ uint8_t m_math_ctlr, m_math_overflow;
+ uint16_t m_math_a, m_math_b;
+ uint64_t m_math_res;
// $2258-$225b
- UINT32 m_vda;
- UINT8 m_vbit, m_vlen;
+ uint32_t m_vda;
+ uint8_t m_vbit, m_vlen;
int m_drm;
// $2300-$2301
- UINT8 m_scpu_flags, m_sa1_flags;
+ uint8_t m_scpu_flags, m_sa1_flags;
// $2302-$2305
- UINT16 m_hcr, m_vcr;
+ uint16_t m_hcr, m_vcr;
};
diff --git a/src/devices/bus/snes/sdd1.cpp b/src/devices/bus/snes/sdd1.cpp
index 9570b5110ad..e1f870d5ff4 100644
--- a/src/devices/bus/snes/sdd1.cpp
+++ b/src/devices/bus/snes/sdd1.cpp
@@ -20,15 +20,15 @@
// Input Manager
-void SDD1_IM::IM_prepareDecomp(UINT32 in_buf)
+void SDD1_IM::IM_prepareDecomp(uint32_t in_buf)
{
m_byte_ptr = in_buf;
m_bit_count = 4;
}
-UINT8 SDD1_IM::IM_getCodeword(UINT8 *ROM, UINT32 *mmc, const UINT8 code_len)
+uint8_t SDD1_IM::IM_getCodeword(uint8_t *ROM, uint32_t *mmc, const uint8_t code_len)
{
- UINT8 codeword = ROM[SSD1_ADD(m_byte_ptr)] << m_bit_count;
+ uint8_t codeword = ROM[SSD1_ADD(m_byte_ptr)] << m_bit_count;
++m_bit_count;
@@ -49,9 +49,9 @@ UINT8 SDD1_IM::IM_getCodeword(UINT8 *ROM, UINT32 *mmc, const UINT8 code_len)
// GCD
-void SDD1_GCD::GCD_getRunCount(UINT8 *ROM, UINT32 *mmc, UINT8 code_num, UINT8* MPScount, UINT8* LPSind)
+void SDD1_GCD::GCD_getRunCount(uint8_t *ROM, uint32_t *mmc, uint8_t code_num, uint8_t* MPScount, uint8_t* LPSind)
{
- const UINT8 run_count[] =
+ const uint8_t run_count[] =
{
0x00, 0x00, 0x01, 0x00, 0x03, 0x01, 0x02, 0x00,
0x07, 0x03, 0x05, 0x01, 0x06, 0x02, 0x04, 0x00,
@@ -87,7 +87,7 @@ void SDD1_GCD::GCD_getRunCount(UINT8 *ROM, UINT32 *mmc, UINT8 code_num, UINT8* M
0x70, 0x30, 0x50, 0x10, 0x60, 0x20, 0x40, 0x00,
};
- UINT8 codeword = m_IM->IM_getCodeword(ROM, mmc, code_num);
+ uint8_t codeword = m_IM->IM_getCodeword(ROM, mmc, code_num);
if (codeword & 0x80)
{
@@ -108,9 +108,9 @@ void SDD1_BG::BG_prepareDecomp()
m_LPSind = 0;
}
-UINT8 SDD1_BG::BG_getBit(UINT8 *ROM, UINT32 *mmc, UINT8* endOfRun)
+uint8_t SDD1_BG::BG_getBit(uint8_t *ROM, uint32_t *mmc, uint8_t* endOfRun)
{
- UINT8 bit;
+ uint8_t bit;
if (!(m_MPScount || m_LPSind))
{
@@ -144,9 +144,9 @@ UINT8 SDD1_BG::BG_getBit(UINT8 *ROM, UINT32 *mmc, UINT8* endOfRun)
struct SDD1_PEM_state
{
- UINT8 code_num;
- UINT8 nextIfMPS;
- UINT8 nextIfLPS;
+ uint8_t code_num;
+ uint8_t nextIfMPS;
+ uint8_t nextIfLPS;
};
static const SDD1_PEM_state PEM_evolution_table[33] =
@@ -195,15 +195,15 @@ void SDD1_PEM::PEM_prepareDecomp()
}
}
-UINT8 SDD1_PEM::PEM_getBit(UINT8 *ROM, UINT32 *mmc, UINT8 context)
+uint8_t SDD1_PEM::PEM_getBit(uint8_t *ROM, uint32_t *mmc, uint8_t context)
{
- UINT8 endOfRun;
- UINT8 bit;
+ uint8_t endOfRun;
+ uint8_t bit;
SDD1_PEM_ContextInfo *pContInfo = &(m_contextInfo)[context];
- UINT8 currStatus = pContInfo->status;
+ uint8_t currStatus = pContInfo->status;
const SDD1_PEM_state* pState = &(PEM_evolution_table[currStatus]);
- UINT8 currentMPS = pContInfo->MPS;
+ uint8_t currentMPS = pContInfo->MPS;
bit = m_BG[pState->code_num]->BG_getBit(ROM, mmc, &endOfRun);
@@ -228,9 +228,9 @@ UINT8 SDD1_PEM::PEM_getBit(UINT8 *ROM, UINT32 *mmc, UINT8 context)
// CM
-void SDD1_CM::CM_prepareDecomp(UINT8 *ROM, UINT32 *mmc, UINT32 first_byte)
+void SDD1_CM::CM_prepareDecomp(uint8_t *ROM, uint32_t *mmc, uint32_t first_byte)
{
- INT32 i = 0;
+ int32_t i = 0;
m_bitplanesInfo = ROM[SSD1_ADD(first_byte)] & 0xc0;
m_contextBitsInfo = ROM[SSD1_ADD(first_byte)] & 0x30;
m_bit_number = 0;
@@ -252,11 +252,11 @@ void SDD1_CM::CM_prepareDecomp(UINT8 *ROM, UINT32 *mmc, UINT32 first_byte)
}
}
-UINT8 SDD1_CM::CM_getBit(UINT8 *ROM, UINT32 *mmc)
+uint8_t SDD1_CM::CM_getBit(uint8_t *ROM, uint32_t *mmc)
{
- UINT8 currContext;
- UINT16 *context_bits;
- UINT8 bit;
+ uint8_t currContext;
+ uint16_t *context_bits;
+ uint8_t bit;
switch (m_bitplanesInfo)
{
@@ -309,17 +309,17 @@ UINT8 SDD1_CM::CM_getBit(UINT8 *ROM, UINT32 *mmc)
// OL
-void SDD1_OL::OL_prepareDecomp(UINT8 *ROM, UINT32 *mmc, UINT32 first_byte, UINT16 out_len, UINT8 *out_buf)
+void SDD1_OL::OL_prepareDecomp(uint8_t *ROM, uint32_t *mmc, uint32_t first_byte, uint16_t out_len, uint8_t *out_buf)
{
m_bitplanesInfo = ROM[SSD1_ADD(first_byte)] & 0xc0;
m_length = out_len;
m_buffer = out_buf;
}
-void SDD1_OL::OL_launch(UINT8 *ROM, UINT32 *mmc)
+void SDD1_OL::OL_launch(uint8_t *ROM, uint32_t *mmc)
{
- UINT8 i;
- UINT8 register1, register2 = 0;
+ uint8_t i;
+ uint8_t register1, register2 = 0;
switch (m_bitplanesInfo)
{
@@ -385,7 +385,7 @@ SDD1_emu::SDD1_emu(running_machine &machine)
m_OL = std::make_unique<SDD1_OL>(m_CM.get());
}
-void SDD1_emu::SDD1emu_decompress(UINT8 *ROM, UINT32 *mmc, UINT32 in_buf, UINT16 out_len, UINT8 *out_buf)
+void SDD1_emu::SDD1emu_decompress(uint8_t *ROM, uint32_t *mmc, uint32_t in_buf, uint16_t out_len, uint8_t *out_buf)
{
m_IM->IM_prepareDecomp(in_buf);
m_BG0->BG_prepareDecomp();
@@ -411,13 +411,13 @@ void SDD1_emu::SDD1emu_decompress(UINT8 *ROM, UINT32 *mmc, UINT32 in_buf, UINT16
const device_type SNS_LOROM_SDD1 = &device_creator<sns_rom_sdd1_device>;
-sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sns_cart_interface( mconfig, *this ), m_sdd1_enable(0), m_xfer_enable(0), m_sdd1emu(nullptr)
{
}
-sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_sdd1_device::sns_rom_sdd1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SNS_LOROM_SDD1, "SNES Cart + S-DD1", tag, owner, clock, "sns_rom_sdd1", __FILE__),
device_sns_cart_interface( mconfig, *this ), m_sdd1_enable(0), m_xfer_enable(0), m_sdd1emu(nullptr)
{
@@ -428,7 +428,7 @@ void sns_rom_sdd1_device::device_start()
{
m_sdd1emu = std::make_unique<SDD1_emu>(machine());
- m_buffer.data = std::make_unique<UINT8[]>(0x10000);
+ m_buffer.data = std::make_unique<uint8_t[]>(0x10000);
m_buffer.ready = 0;
save_item(NAME(m_sdd1_enable));
@@ -472,7 +472,7 @@ void sns_rom_sdd1_device::device_reset()
READ8_MEMBER( sns_rom_sdd1_device::chip_read )
{
- UINT16 addr = offset & 0xffff;
+ uint16_t addr = offset & 0xffff;
switch (addr)
{
@@ -493,11 +493,11 @@ READ8_MEMBER( sns_rom_sdd1_device::chip_read )
WRITE8_MEMBER( sns_rom_sdd1_device::chip_write )
{
- UINT16 addr = offset & 0xffff;
+ uint16_t addr = offset & 0xffff;
if ((addr & 0x4380) == 0x4300)
{
- UINT8 channel = (addr >> 4) & 7;
+ uint8_t channel = (addr >> 4) & 7;
switch(addr & 0xf)
{
case 2:
@@ -545,7 +545,7 @@ WRITE8_MEMBER( sns_rom_sdd1_device::chip_write )
}
-UINT8 sns_rom_sdd1_device::read_helper(UINT32 addr)
+uint8_t sns_rom_sdd1_device::read_helper(uint32_t addr)
{
if (m_sdd1_enable & m_xfer_enable)
{
@@ -557,7 +557,7 @@ UINT8 sns_rom_sdd1_device::read_helper(UINT32 addr)
// S-DD1 always uses fixed transfer mode, so address will not change during transfer
if ((addr + 0xc00000) == m_dma[i].addr)
{
- UINT8 data;
+ uint8_t data;
if (!m_buffer.ready)
{
// first byte read for channel performs full decompression.
@@ -573,7 +573,7 @@ UINT8 sns_rom_sdd1_device::read_helper(UINT32 addr)
}
// fetch a decompressed byte; once buffer is depleted, disable channel and invalidate buffer
- data = m_buffer.data[(UINT16)m_buffer.offset++];
+ data = m_buffer.data[(uint16_t)m_buffer.offset++];
if (m_buffer.offset >= m_buffer.size)
{
m_buffer.ready = 0;
diff --git a/src/devices/bus/snes/sdd1.h b/src/devices/bus/snes/sdd1.h
index e9dcc9e71e1..244c552f101 100644
--- a/src/devices/bus/snes/sdd1.h
+++ b/src/devices/bus/snes/sdd1.h
@@ -15,11 +15,11 @@ public:
m_bit_count(0)
{ }
- UINT32 m_byte_ptr;
- UINT8 m_bit_count;
+ uint32_t m_byte_ptr;
+ uint8_t m_bit_count;
- void IM_prepareDecomp(UINT32 in_buf);
- UINT8 IM_getCodeword(UINT8 *ROM, UINT32 *mmc, const UINT8 code_len);
+ void IM_prepareDecomp(uint32_t in_buf);
+ uint8_t IM_getCodeword(uint8_t *ROM, uint32_t *mmc, const uint8_t code_len);
};
class SDD1_GCD //Golomb-Code Decoder
@@ -30,13 +30,13 @@ public:
SDD1_IM* m_IM;
- void GCD_getRunCount(UINT8 *ROM, UINT32 *mmc, UINT8 code_num, UINT8* MPScount, UINT8* LPSind);
+ void GCD_getRunCount(uint8_t *ROM, uint32_t *mmc, uint8_t code_num, uint8_t* MPScount, uint8_t* LPSind);
};
class SDD1_BG // Bits Generator
{
public:
- SDD1_BG(SDD1_GCD* associatedGCD, UINT8 code)
+ SDD1_BG(SDD1_GCD* associatedGCD, uint8_t code)
: m_code_num(code),
m_MPScount(0),
m_LPSind(0),
@@ -44,19 +44,19 @@ public:
{
}
- UINT8 m_code_num;
- UINT8 m_MPScount;
- UINT8 m_LPSind;
+ uint8_t m_code_num;
+ uint8_t m_MPScount;
+ uint8_t m_LPSind;
SDD1_GCD* m_GCD;
void BG_prepareDecomp();
- UINT8 BG_getBit(UINT8 *ROM, UINT32 *mmc, UINT8* endOfRun);
+ uint8_t BG_getBit(uint8_t *ROM, uint32_t *mmc, uint8_t* endOfRun);
} ;
struct SDD1_PEM_ContextInfo
{
- UINT8 status;
- UINT8 MPS;
+ uint8_t status;
+ uint8_t MPS;
};
class SDD1_PEM //Probability Estimation Module
@@ -82,7 +82,7 @@ public:
SDD1_BG* m_BG[8];
void PEM_prepareDecomp();
- UINT8 PEM_getBit(UINT8 *ROM, UINT32 *mmc, UINT8 context);
+ uint8_t PEM_getBit(uint8_t *ROM, uint32_t *mmc, uint8_t context);
} ;
@@ -92,15 +92,15 @@ public:
SDD1_CM(SDD1_PEM* associatedPEM)
: m_bitplanesInfo(0), m_contextBitsInfo(0), m_bit_number(0), m_currBitplane(0), m_PEM(associatedPEM) { }
- UINT8 m_bitplanesInfo;
- UINT8 m_contextBitsInfo;
- UINT8 m_bit_number;
- UINT8 m_currBitplane;
- UINT16 m_prevBitplaneBits[8];
+ uint8_t m_bitplanesInfo;
+ uint8_t m_contextBitsInfo;
+ uint8_t m_bit_number;
+ uint8_t m_currBitplane;
+ uint16_t m_prevBitplaneBits[8];
SDD1_PEM* m_PEM;
- void CM_prepareDecomp(UINT8 *ROM, UINT32 *mmc, UINT32 first_byte);
- UINT8 CM_getBit(UINT8 *ROM, UINT32 *mmc);
+ void CM_prepareDecomp(uint8_t *ROM, uint32_t *mmc, uint32_t first_byte);
+ uint8_t CM_getBit(uint8_t *ROM, uint32_t *mmc);
} ;
@@ -110,13 +110,13 @@ public:
SDD1_OL(SDD1_CM* associatedCM)
: m_bitplanesInfo(0), m_length(0), m_buffer(nullptr), m_CM(associatedCM) { }
- UINT8 m_bitplanesInfo;
- UINT16 m_length;
- UINT8* m_buffer;
+ uint8_t m_bitplanesInfo;
+ uint16_t m_length;
+ uint8_t* m_buffer;
SDD1_CM* m_CM;
- void OL_prepareDecomp(UINT8 *ROM, UINT32 *mmc, UINT32 first_byte, UINT16 out_len, UINT8 *out_buf);
- void OL_launch(UINT8 *ROM, UINT32 *mmc);
+ void OL_prepareDecomp(uint8_t *ROM, uint32_t *mmc, uint32_t first_byte, uint16_t out_len, uint8_t *out_buf);
+ void OL_launch(uint8_t *ROM, uint32_t *mmc);
} ;
class SDD1_emu
@@ -140,7 +140,7 @@ public:
std::unique_ptr<SDD1_CM> m_CM;
std::unique_ptr<SDD1_OL> m_OL;
- void SDD1emu_decompress(UINT8 *ROM, UINT32 *mmc, UINT32 in_buf, UINT16 out_len, UINT8 *out_buf);
+ void SDD1emu_decompress(uint8_t *ROM, uint32_t *mmc, uint32_t in_buf, uint16_t out_len, uint8_t *out_buf);
private:
running_machine& m_machine;
@@ -155,8 +155,8 @@ class sns_rom_sdd1_device : public device_t,
{
public:
// construction/destruction
- sns_rom_sdd1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- sns_rom_sdd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_sdd1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ sns_rom_sdd1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -170,26 +170,26 @@ public:
virtual DECLARE_READ8_MEMBER(chip_read) override;
virtual DECLARE_WRITE8_MEMBER(chip_write) override;
- UINT8 read_helper(UINT32 offset);
+ uint8_t read_helper(uint32_t offset);
- UINT8 m_sdd1_enable; // channel bit-mask
- UINT8 m_xfer_enable; // channel bit-mask
- UINT32 m_mmc[4]; // memory map controller ROM indices
+ uint8_t m_sdd1_enable; // channel bit-mask
+ uint8_t m_xfer_enable; // channel bit-mask
+ uint32_t m_mmc[4]; // memory map controller ROM indices
struct
{
- UINT32 addr; // $43x2-$43x4 -- DMA transfer address
- UINT16 size; // $43x5-$43x6 -- DMA transfer size
+ uint32_t addr; // $43x2-$43x4 -- DMA transfer address
+ uint16_t size; // $43x5-$43x6 -- DMA transfer size
} m_dma[8];
std::unique_ptr<SDD1_emu> m_sdd1emu;
struct
{
- std::unique_ptr<UINT8[]> data; // pointer to decompressed S-DD1 data (65536 bytes)
- UINT16 offset; // read index into S-DD1 decompression buffer
- UINT32 size; // length of data buffer; reads decrement counter, set ready to false at 0
- UINT8 ready; // 1 when data[] is valid; 0 to invoke sdd1emu.decompress()
+ std::unique_ptr<uint8_t[]> data; // pointer to decompressed S-DD1 data (65536 bytes)
+ uint16_t offset; // read index into S-DD1 decompression buffer
+ uint32_t size; // length of data buffer; reads decrement counter, set ready to false at 0
+ uint8_t ready; // 1 when data[] is valid; 0 to invoke sdd1emu.decompress()
} m_buffer;
};
diff --git a/src/devices/bus/snes/sfx.cpp b/src/devices/bus/snes/sfx.cpp
index 9fce31d00db..e44042de962 100644
--- a/src/devices/bus/snes/sfx.cpp
+++ b/src/devices/bus/snes/sfx.cpp
@@ -18,7 +18,7 @@
const device_type SNS_LOROM_SUPERFX = &device_creator<sns_rom_superfx_device>;
-sns_rom_superfx_device::sns_rom_superfx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_superfx_device::sns_rom_superfx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_device(mconfig, SNS_LOROM_SUPERFX, "SNES Cart (LoROM) + SuperFX", tag, owner, clock, "sns_rom_superfx", __FILE__),
m_superfx(*this, "superfx")
{
@@ -124,7 +124,7 @@ READ8_MEMBER(sns_rom_superfx_device::read_h)
}
else
{
- static const UINT8 sfx_data[16] = {
+ static const uint8_t sfx_data[16] = {
0x00, 0x01, 0x00, 0x01, 0x04, 0x01, 0x00, 0x01,
0x00, 0x01, 0x08, 0x01, 0x00, 0x01, 0x0c, 0x01,
};
diff --git a/src/devices/bus/snes/sfx.h b/src/devices/bus/snes/sfx.h
index 785a68bb827..678b09b5e1c 100644
--- a/src/devices/bus/snes/sfx.h
+++ b/src/devices/bus/snes/sfx.h
@@ -14,7 +14,7 @@ class sns_rom_superfx_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_superfx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_superfx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -40,7 +40,7 @@ public:
virtual DECLARE_WRITE_LINE_MEMBER(snes_extern_irq_w);
- UINT8 sfx_ram[0x200000];
+ uint8_t sfx_ram[0x200000];
};
diff --git a/src/devices/bus/snes/sgb.cpp b/src/devices/bus/snes/sgb.cpp
index 5a2888a8294..d61281952b6 100644
--- a/src/devices/bus/snes/sgb.cpp
+++ b/src/devices/bus/snes/sgb.cpp
@@ -23,7 +23,7 @@ const device_type SNS_LOROM_SUPERGB = &device_creator<sns_rom_sgb1_device>;
const device_type SNS_LOROM_SUPERGB2 = &device_creator<sns_rom_sgb2_device>;
-sns_rom_sgb_device::sns_rom_sgb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+sns_rom_sgb_device::sns_rom_sgb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_sgb_cpu(*this, "sgb_cpu"),
m_sgb_apu(*this, "sgb_apu"),
@@ -47,13 +47,13 @@ sns_rom_sgb_device::sns_rom_sgb_device(const machine_config &mconfig, device_typ
}
-sns_rom_sgb1_device::sns_rom_sgb1_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) :
+sns_rom_sgb1_device::sns_rom_sgb1_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) :
sns_rom_sgb_device(mconfig, SNS_LOROM_SUPERGB, "SNES Super Game Boy Cart", tag, owner, clock, "sns_rom_sgb", __FILE__)
{
}
-sns_rom_sgb2_device::sns_rom_sgb2_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) :
+sns_rom_sgb2_device::sns_rom_sgb2_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) :
sns_rom_sgb_device(mconfig, SNS_LOROM_SUPERGB2, "SNES Super Game Boy 2 Cart", tag, owner, clock, "sns_rom_sgb2", __FILE__)
{
}
@@ -242,7 +242,7 @@ READ8_MEMBER(sns_rom_sgb_device::read_h)
READ8_MEMBER( sns_rom_sgb_device::chip_read )
{
- UINT16 address = offset & 0xffff;
+ uint16_t address = offset & 0xffff;
//LY counter
if (address == 0x6000)
@@ -284,7 +284,7 @@ READ8_MEMBER( sns_rom_sgb_device::chip_read )
//VRAM port
if (address == 0x7800)
{
- UINT8 data = m_lcd_output[m_vram_offs];
+ uint8_t data = m_lcd_output[m_vram_offs];
m_vram_offs = (m_vram_offs + 1) % 320;
return data;
}
@@ -292,16 +292,16 @@ READ8_MEMBER( sns_rom_sgb_device::chip_read )
return 0x00; // this should never happen?
}
-void sns_rom_sgb_device::lcd_render(UINT32 *source)
+void sns_rom_sgb_device::lcd_render(uint32_t *source)
{
- memset(m_lcd_output, 0x00, 320 * sizeof(UINT16));
+ memset(m_lcd_output, 0x00, 320 * sizeof(uint16_t));
for (int y = 0; y < 8; y++)
{
for (int x = 0; x < 160; x++)
{
- UINT32 pixel = *source++;
- UINT16 addr = y * 2 + (x / 8 * 16);
+ uint32_t pixel = *source++;
+ uint16_t addr = y * 2 + (x / 8 * 16);
m_lcd_output[addr + 0] |= ((pixel & 1) >> 0) << (7 - (x & 7));
m_lcd_output[addr + 1] |= ((pixel & 2) >> 1) << (7 - (x & 7));
}
@@ -310,7 +310,7 @@ void sns_rom_sgb_device::lcd_render(UINT32 *source)
WRITE8_MEMBER( sns_rom_sgb_device::chip_write )
{
- UINT16 address = offset & 0xffff;
+ uint16_t address = offset & 0xffff;
//VRAM port
if (address == 0x6001)
@@ -318,7 +318,7 @@ WRITE8_MEMBER( sns_rom_sgb_device::chip_write )
m_vram = data;
m_vram_offs = 0;
- UINT8 offset = (m_sgb_row - (4 - (m_vram - (m_sgb_ly & 3)))) & 3;
+ uint8_t offset = (m_sgb_row - (4 - (m_vram - (m_sgb_ly & 3)))) & 3;
lcd_render(m_lcd_buffer + offset * 160 * 8);
return;
diff --git a/src/devices/bus/snes/sgb.h b/src/devices/bus/snes/sgb.h
index dc959109923..44e6f2ac9c4 100644
--- a/src/devices/bus/snes/sgb.h
+++ b/src/devices/bus/snes/sgb.h
@@ -20,7 +20,7 @@ class sns_rom_sgb_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_sgb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ sns_rom_sgb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -51,25 +51,25 @@ protected:
required_device<gb_cart_slot_device> m_cartslot;
required_memory_region m_region_bios;
- void lcd_render(UINT32 *source);
+ void lcd_render(uint32_t *source);
// ICD2 regs
- UINT8 m_sgb_ly;
- UINT8 m_sgb_row;
- UINT8 m_vram;
- UINT8 m_port;
- UINT8 m_joy1, m_joy2, m_joy3, m_joy4;
- UINT8 m_joy_pckt[16];
- UINT16 m_vram_offs;
- UINT8 m_mlt_req;
-
- UINT32 m_lcd_buffer[4 * 160 * 8];
- UINT16 m_lcd_output[320];
- UINT16 m_lcd_row;
+ uint8_t m_sgb_ly;
+ uint8_t m_sgb_row;
+ uint8_t m_vram;
+ uint8_t m_port;
+ uint8_t m_joy1, m_joy2, m_joy3, m_joy4;
+ uint8_t m_joy_pckt[16];
+ uint16_t m_vram_offs;
+ uint8_t m_mlt_req;
+
+ uint32_t m_lcd_buffer[4 * 160 * 8];
+ uint16_t m_lcd_output[320];
+ uint16_t m_lcd_row;
// input bits
int m_packetsize;
- UINT8 m_packet_data[64][16];
+ uint8_t m_packet_data[64][16];
bool m_bios_disabled;
};
@@ -79,7 +79,7 @@ class sns_rom_sgb1_device : public sns_rom_sgb_device
{
public:
// construction/destruction
- sns_rom_sgb1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_sgb1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -91,7 +91,7 @@ class sns_rom_sgb2_device : public sns_rom_sgb_device
{
public:
// construction/destruction
- sns_rom_sgb2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_sgb2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/snes/snes_slot.cpp b/src/devices/bus/snes/snes_slot.cpp
index c70a1cac664..ae553a7f612 100644
--- a/src/devices/bus/snes/snes_slot.cpp
+++ b/src/devices/bus/snes/snes_slot.cpp
@@ -88,7 +88,7 @@ device_sns_cart_interface::~device_sns_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_sns_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_sns_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -102,7 +102,7 @@ void device_sns_cart_interface::rom_alloc(UINT32 size, const char *tag)
// nvram_alloc - alloc the space for the nvram
//-------------------------------------------------
-void device_sns_cart_interface::nvram_alloc(UINT32 size)
+void device_sns_cart_interface::nvram_alloc(uint32_t size)
{
m_nvram.resize(size);
}
@@ -115,7 +115,7 @@ void device_sns_cart_interface::nvram_alloc(UINT32 size)
// saved by the device itself)
//-------------------------------------------------
-void device_sns_cart_interface::rtc_ram_alloc(UINT32 size)
+void device_sns_cart_interface::rtc_ram_alloc(uint32_t size)
{
m_rtc_ram.resize(size);
}
@@ -126,7 +126,7 @@ void device_sns_cart_interface::rtc_ram_alloc(UINT32 size)
// (optional) add-on CPU bios
//-------------------------------------------------
-void device_sns_cart_interface::addon_bios_alloc(UINT32 size)
+void device_sns_cart_interface::addon_bios_alloc(uint32_t size)
{
m_bios.resize(size);
}
@@ -137,7 +137,7 @@ void device_sns_cart_interface::addon_bios_alloc(UINT32 size)
// blocks, so to simplify ROM access
//-------------------------------------------------
-void device_sns_cart_interface::rom_map_setup(UINT32 size)
+void device_sns_cart_interface::rom_map_setup(uint32_t size)
{
int i;
// setup the rom_bank_map array to faster ROM read
@@ -172,7 +172,7 @@ void device_sns_cart_interface::rom_map_setup(UINT32 size)
//-------------------------------------------------
// base_sns_cart_slot_device - constructor
//-------------------------------------------------
-base_sns_cart_slot_device::base_sns_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+base_sns_cart_slot_device::base_sns_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -181,17 +181,17 @@ base_sns_cart_slot_device::base_sns_cart_slot_device(const machine_config &mconf
{
}
-sns_cart_slot_device::sns_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sns_cart_slot_device::sns_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
base_sns_cart_slot_device(mconfig, SNS_CART_SLOT, "SNES Cartridge Slot", tag, owner, clock, "sns_cart_slot", __FILE__)
{
}
-sns_sufami_cart_slot_device::sns_sufami_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sns_sufami_cart_slot_device::sns_sufami_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
base_sns_cart_slot_device(mconfig, SNS_SUFAMI_CART_SLOT, "SNES Sufami Turbo Cartridge Slot", tag, owner, clock, "sns_sufami_cart_slot", __FILE__)
{
}
-sns_bsx_cart_slot_device::sns_bsx_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sns_bsx_cart_slot_device::sns_bsx_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
base_sns_cart_slot_device(mconfig, SNS_BSX_CART_SLOT, "SNES BS-X Cartridge Slot", tag, owner, clock, "sns_bsx_cart_slot", __FILE__)
{
}
@@ -320,10 +320,10 @@ static const char *sns_get_slot(int type)
/* Here we add a couple of cart utilities, to avoid duplicating the code in each DEVICE_IMAGE_LOAD */
-UINT32 base_sns_cart_slot_device::snes_skip_header( UINT8 *ROM, UINT32 rom_size )
+uint32_t base_sns_cart_slot_device::snes_skip_header( uint8_t *ROM, uint32_t rom_size )
{
- UINT8 header[512];
- UINT32 offset = 512;
+ uint8_t header[512];
+ uint32_t offset = 512;
/* Check for a header (512 bytes) */
memcpy(header, ROM, 512);
@@ -357,14 +357,14 @@ UINT32 base_sns_cart_slot_device::snes_skip_header( UINT8 *ROM, UINT32 rom_size
/* This function assign a 'score' to data immediately after 'offset' to measure how valid they are
as information block (to decide if the image is HiRom, LoRom, ExLoRom or ExHiRom) */
/* Code from bsnes, courtesy of byuu - http://byuu.org/ , based on previous code by Cowering */
-static int snes_validate_infoblock( UINT8 *infoblock, UINT32 offset )
+static int snes_validate_infoblock( uint8_t *infoblock, uint32_t offset )
{
int score = 0;
- UINT16 reset_vector = infoblock[offset + 0x3c] | (infoblock[offset + 0x3d] << 8);
- UINT16 checksum = infoblock[offset + 0x1e] | (infoblock[offset + 0x1f] << 8);
- UINT16 ichecksum = infoblock[offset + 0x1c] | (infoblock[offset + 0x1d] << 8);
- UINT8 reset_opcode = infoblock[(offset & ~0x7fff) | (reset_vector & 0x7fff)]; //first opcode executed upon reset
- UINT8 mapper = infoblock[offset + 0x15] & ~0x10; //mask off irrelevant FastROM-capable bit
+ uint16_t reset_vector = infoblock[offset + 0x3c] | (infoblock[offset + 0x3d] << 8);
+ uint16_t checksum = infoblock[offset + 0x1e] | (infoblock[offset + 0x1f] << 8);
+ uint16_t ichecksum = infoblock[offset + 0x1c] | (infoblock[offset + 0x1d] << 8);
+ uint8_t reset_opcode = infoblock[(offset & ~0x7fff) | (reset_vector & 0x7fff)]; //first opcode executed upon reset
+ uint8_t mapper = infoblock[offset + 0x15] & ~0x10; //mask off irrelevant FastROM-capable bit
/* $00:[000-7fff] contains uninitialized RAM and MMIO.
reset vector must point to ROM at $00:[8000-ffff] to be considered valid. */
@@ -466,12 +466,12 @@ static int snes_validate_infoblock( UINT8 *infoblock, UINT32 offset )
/* This determines if a cart is in Mode 20, 21, 22 or 25; sets state->m_cart[0].mode and
state->m_cart[0].sram accordingly; and returns the offset of the internal header (needed to
detect BSX and ST carts) */
-static UINT32 snes_find_hilo_mode(device_t *device, UINT8 *buffer, UINT32 buf_len )
+static uint32_t snes_find_hilo_mode(device_t *device, uint8_t *buffer, uint32_t buf_len )
{
- UINT8 valid_mode20 = 0;
- UINT8 valid_mode21 = 0;
- UINT8 valid_mode25 = 0;
- UINT32 retvalue;
+ uint8_t valid_mode20 = 0;
+ uint8_t valid_mode21 = 0;
+ uint8_t valid_mode25 = 0;
+ uint32_t retvalue;
/* Now to determine if this is a lo-ROM, a hi-ROM or an extended lo/hi-ROM */
if (buf_len > 0x007fc0)
@@ -502,7 +502,7 @@ static UINT32 snes_find_hilo_mode(device_t *device, UINT8 *buffer, UINT32 buf_le
}
-static int snes_find_addon_chip( UINT8 *buffer, UINT32 start_offs )
+static int snes_find_addon_chip( uint8_t *buffer, uint32_t start_offs )
{
/* Info mostly taken from http://snesemu.black-ship.net/misc/hardware/-from%20nsrt.edgeemu.com-chipinfo.htm */
switch (buffer[start_offs + 0x16])
@@ -604,15 +604,15 @@ image_init_result base_sns_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT8 *ROM;
- UINT32 len, offset = 0;
+ uint8_t *ROM;
+ uint32_t len, offset = 0;
const char *slot_name;
/* Check for a header (512 bytes), and skip it if found */
if (software_entry() == nullptr)
{
- UINT32 tmplen = length();
- std::vector<UINT8> tmpROM(tmplen);
+ uint32_t tmplen = length();
+ std::vector<uint8_t> tmpROM(tmplen);
fread(&tmpROM[0], tmplen);
offset = snes_skip_header(&tmpROM[0], tmplen);
fseek(offset, SEEK_SET);
@@ -664,8 +664,8 @@ image_init_result base_sns_cart_slot_device::call_load()
if (m_cart->get_nvram_size() || m_cart->get_rtc_ram_size())
{
- UINT32 tot_size = m_cart->get_nvram_size() + m_cart->get_rtc_ram_size();
- std::vector<UINT8> temp_nvram(tot_size);
+ uint32_t tot_size = m_cart->get_nvram_size() + m_cart->get_rtc_ram_size();
+ std::vector<uint8_t> temp_nvram(tot_size);
battery_load(&temp_nvram[0], tot_size, 0xff);
if (m_cart->get_nvram_size())
memcpy(m_cart->get_nvram_base(), &temp_nvram[0], m_cart->get_nvram_size());
@@ -694,8 +694,8 @@ void base_sns_cart_slot_device::call_unload()
{
if (m_cart->get_nvram_size() || m_cart->get_rtc_ram_size())
{
- UINT32 tot_size = m_cart->get_nvram_size() + m_cart->get_rtc_ram_size();
- std::vector<UINT8> temp_nvram(tot_size);
+ uint32_t tot_size = m_cart->get_nvram_size() + m_cart->get_rtc_ram_size();
+ std::vector<uint8_t> temp_nvram(tot_size);
if (m_cart->get_nvram_size())
memcpy(&temp_nvram[0], m_cart->get_nvram_base(), m_cart->get_nvram_size());
if (m_cart->get_rtc_ram_size())
@@ -797,7 +797,7 @@ void base_sns_cart_slot_device::setup_addon_from_fullpath()
if (!m_cart->get_addon_bios_size())
{
std::string region = std::string(m_cart->device().tag()).append(":addon");
- UINT8 *ROM;
+ uint8_t *ROM;
switch (m_addon)
{
@@ -843,15 +843,15 @@ void base_sns_cart_slot_device::setup_addon_from_fullpath()
void base_sns_cart_slot_device::setup_nvram()
{
- UINT8 *ROM = (UINT8 *)m_cart->get_rom_base();
- UINT32 size = 0;
+ uint8_t *ROM = (uint8_t *)m_cart->get_rom_base();
+ uint32_t size = 0;
if (software_entry() == nullptr)
{
int hilo_mode = snes_find_hilo_mode(this, ROM, m_cart->get_rom_size());
- UINT8 sram_size = (m_type == SNES_SFX) ? (ROM[0x00ffbd] & 0x07) : (ROM[hilo_mode + 0x18] & 0x07);
+ uint8_t sram_size = (m_type == SNES_SFX) ? (ROM[0x00ffbd] & 0x07) : (ROM[hilo_mode + 0x18] & 0x07);
if (sram_size)
{
- UINT32 max = (hilo_mode == 0x007fc0) ? 0x80000 : 0x20000; // MODE20 vs MODE21
+ uint32_t max = (hilo_mode == 0x007fc0) ? 0x80000 : 0x20000; // MODE20 vs MODE21
size = 1024 << sram_size;
if (size > max)
size = max;
@@ -880,7 +880,7 @@ void base_sns_cart_slot_device::setup_nvram()
-void base_sns_cart_slot_device::get_cart_type_addon(UINT8 *ROM, UINT32 len, int &type, int &addon)
+void base_sns_cart_slot_device::get_cart_type_addon(uint8_t *ROM, uint32_t len, int &type, int &addon)
{
// First, look if the cart is HiROM or LoROM (and set snes_cart accordingly)
int hilo_mode = snes_find_hilo_mode(this,ROM, len);
@@ -913,7 +913,7 @@ void base_sns_cart_slot_device::get_cart_type_addon(UINT8 *ROM, UINT32 len, int
// Detect BS-X Flash Cart
if ((ROM[hilo_mode + 0x13] == 0x00 || ROM[hilo_mode + 0x13] == 0xff) && ROM[hilo_mode + 0x14] == 0x00)
{
- UINT8 n15 = ROM[hilo_mode + 0x15];
+ uint8_t n15 = ROM[hilo_mode + 0x15];
if (n15 == 0x00 || n15 == 0x80 || n15 == 0x84 || n15 == 0x9c || n15 == 0xbc || n15 == 0xfc)
{
if (ROM[hilo_mode + 0x1a] == 0x33 || ROM[hilo_mode + 0x1a] == 0xff)
@@ -996,9 +996,9 @@ std::string base_sns_cart_slot_device::get_default_card_software()
if (fullpath)
{
const char *slot_string;
- UINT32 offset;
- UINT32 len = m_file->size();
- std::vector<UINT8> rom(len);
+ uint32_t offset;
+ uint32_t len = m_file->size();
+ std::vector<uint8_t> rom(len);
int type = 0, addon = 0;
m_file->read(&rom[0], len);
@@ -1151,7 +1151,7 @@ static int char_to_int_conv( char id )
#define UNK "UNKNOWN"
-void base_sns_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len)
+void base_sns_cart_slot_device::internal_header_logging(uint8_t *ROM, uint32_t len)
{
static const char *const cart_types[] =
{
@@ -1270,7 +1270,7 @@ void base_sns_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len)
// Detect BS-X Flash Cart
if ((ROM[hilo_mode + 0x13] == 0x00 || ROM[hilo_mode + 0x13] == 0xff) && ROM[hilo_mode + 0x14] == 0x00)
{
- UINT8 n15 = ROM[hilo_mode + 0x15];
+ uint8_t n15 = ROM[hilo_mode + 0x15];
if (n15 == 0x00 || n15 == 0x80 || n15 == 0x84 || n15 == 0x9c || n15 == 0xbc || n15 == 0xfc)
{
if (ROM[hilo_mode + 0x1a] == 0x33 || ROM[hilo_mode + 0x1a] == 0xff)
diff --git a/src/devices/bus/snes/snes_slot.h b/src/devices/bus/snes/snes_slot.h
index c86595d3557..3e7823aec9c 100644
--- a/src/devices/bus/snes/snes_slot.h
+++ b/src/devices/bus/snes/snes_slot.h
@@ -116,31 +116,31 @@ public:
virtual DECLARE_WRITE8_MEMBER(chip_write) {}
virtual void speedup_addon_bios_access() {};
- void rom_alloc(UINT32 size, const char *tag);
- void nvram_alloc(UINT32 size);
- void rtc_ram_alloc(UINT32 size);
- void addon_bios_alloc(UINT32 size);
- UINT8* get_rom_base() { return m_rom; };
- UINT8* get_nvram_base() { return &m_nvram[0]; };
- UINT8* get_addon_bios_base() { return &m_bios[0]; };
- UINT8* get_rtc_ram_base() { return &m_rtc_ram[0]; };
- UINT32 get_rom_size() { return m_rom_size; };
- UINT32 get_nvram_size() { return m_nvram.size(); };
- UINT32 get_addon_bios_size() { return m_bios.size(); };
- UINT32 get_rtc_ram_size() { return m_rtc_ram.size(); };
-
- void rom_map_setup(UINT32 size);
+ void rom_alloc(uint32_t size, const char *tag);
+ void nvram_alloc(uint32_t size);
+ void rtc_ram_alloc(uint32_t size);
+ void addon_bios_alloc(uint32_t size);
+ uint8_t* get_rom_base() { return m_rom; };
+ uint8_t* get_nvram_base() { return &m_nvram[0]; };
+ uint8_t* get_addon_bios_base() { return &m_bios[0]; };
+ uint8_t* get_rtc_ram_base() { return &m_rtc_ram[0]; };
+ uint32_t get_rom_size() { return m_rom_size; };
+ uint32_t get_nvram_size() { return m_nvram.size(); };
+ uint32_t get_addon_bios_size() { return m_bios.size(); };
+ uint32_t get_rtc_ram_size() { return m_rtc_ram.size(); };
+
+ void rom_map_setup(uint32_t size);
void save_nvram() { device().save_item(NAME(m_nvram)); }
void save_rtc_ram() { device().save_item(NAME(m_rtc_ram)); }
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT8> m_nvram;
- std::vector<UINT8> m_bios;
- std::vector<UINT8> m_rtc_ram; // temp pointer to save RTC ram to nvram (will disappear when RTCs become devices)
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint8_t> m_nvram;
+ std::vector<uint8_t> m_bios;
+ std::vector<uint8_t> m_rtc_ram; // temp pointer to save RTC ram to nvram (will disappear when RTCs become devices)
- UINT8 rom_bank_map[256]; // 32K chunks of rom
+ uint8_t rom_bank_map[256]; // 32K chunks of rom
};
@@ -152,7 +152,7 @@ class base_sns_cart_slot_device : public device_t,
{
public:
// construction/destruction
- base_sns_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ base_sns_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual ~base_sns_cart_slot_device();
// device-level overrides
@@ -164,12 +164,12 @@ public:
virtual void call_unload() override;
virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
- void get_cart_type_addon(UINT8 *ROM, UINT32 len, int &type, int &addon);
- UINT32 snes_skip_header(UINT8 *ROM, UINT32 snes_rom_size);
+ void get_cart_type_addon(uint8_t *ROM, uint32_t len, int &type, int &addon);
+ uint32_t snes_skip_header(uint8_t *ROM, uint32_t snes_rom_size);
int get_type() { return m_type; }
void setup_nvram();
- void internal_header_logging(UINT8 *ROM, UINT32 len);
+ void internal_header_logging(uint8_t *ROM, uint32_t len);
void save_ram() { if (m_cart && m_cart->get_nvram_size()) m_cart->save_nvram();
if (m_cart && m_cart->get_rtc_ram_size()) m_cart->save_rtc_ram(); }
@@ -217,7 +217,7 @@ class sns_cart_slot_device : public base_sns_cart_slot_device
{
public:
// construction/destruction
- sns_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const char *image_interface() const override { return "snes_cart"; }
virtual const char *file_extensions() const override { return "sfc"; }
};
@@ -228,7 +228,7 @@ class sns_sufami_cart_slot_device : public base_sns_cart_slot_device
{
public:
// construction/destruction
- sns_sufami_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_sufami_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const char *image_interface() const override { return "st_cart"; }
virtual const char *file_extensions() const override { return "st"; }
virtual bool must_be_loaded() const override { return 0; }
@@ -240,7 +240,7 @@ class sns_bsx_cart_slot_device : public base_sns_cart_slot_device
{
public:
// construction/destruction
- sns_bsx_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_bsx_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual const char *image_interface() const override { return "bspack"; }
virtual const char *file_extensions() const override { return "bs"; }
virtual bool must_be_loaded() const override { return 0; }
diff --git a/src/devices/bus/snes/spc7110.cpp b/src/devices/bus/snes/spc7110.cpp
index b9b0ee77cd3..03cea5805e0 100644
--- a/src/devices/bus/snes/spc7110.cpp
+++ b/src/devices/bus/snes/spc7110.cpp
@@ -24,7 +24,7 @@ const device_type SNS_HIROM_SPC7110 = &device_creator<sns_rom_spc7110_device>;
const device_type SNS_HIROM_SPC7110_RTC = &device_creator<sns_rom_spc7110rtc_device>;
-sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: sns_rom21_device(mconfig, type, name, tag, owner, clock, shortname, source), m_r4801(0), m_r4802(0), m_r4803(0), m_r4804(0), m_r4805(0), m_r4806(0), m_r4807(0),
m_r4808(0), m_r4809(0), m_r480a(0), m_r480b(0), m_r480c(0), m_decomp(nullptr), m_r4811(0), m_r4812(0), m_r4813(0), m_r4814(0), m_r4815(0), m_r4816(0), m_r4817(0), m_r4818(0),
m_r481x(0), m_r4814_latch(0), m_r4815_latch(0), m_r4820(0), m_r4821(0), m_r4822(0), m_r4823(0), m_r4824(0), m_r4825(0), m_r4826(0), m_r4827(0), m_r4828(0), m_r4829(0), m_r482a(0),
@@ -33,7 +33,7 @@ sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, de
{
}
-sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom21_device(mconfig, SNS_HIROM_SPC7110, "SNES Cart + SPC-7110", tag, owner, clock, "sns_rom_spc7110", __FILE__), m_r4801(0), m_r4802(0), m_r4803(0), m_r4804(0), m_r4805(0), m_r4806(0), m_r4807(0),
m_r4808(0), m_r4809(0), m_r480a(0), m_r480b(0), m_r480c(0), m_decomp(nullptr), m_r4811(0), m_r4812(0), m_r4813(0), m_r4814(0), m_r4815(0), m_r4816(0), m_r4817(0), m_r4818(0),
m_r481x(0), m_r4814_latch(0), m_r4815_latch(0), m_r4820(0), m_r4821(0), m_r4822(0), m_r4823(0), m_r4824(0), m_r4825(0), m_r4826(0), m_r4827(0), m_r4828(0), m_r4829(0), m_r482a(0),
@@ -42,7 +42,7 @@ sns_rom_spc7110_device::sns_rom_spc7110_device(const machine_config &mconfig, co
{
}
-sns_rom_spc7110rtc_device::sns_rom_spc7110rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_spc7110rtc_device::sns_rom_spc7110rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_spc7110_device(mconfig, SNS_HIROM_SPC7110_RTC, "SNES Cart + SPC-7110 + RTC", tag, owner, clock, "sns_rom_spc7110rtc", __FILE__)
{
}
@@ -196,7 +196,7 @@ void sns_rom_spc7110rtc_device::device_start()
#define SPC7110_DECOMP_BUFFER_SIZE 64
-static const UINT8 spc7110_evolution_table[53][4] =
+static const uint8_t spc7110_evolution_table[53][4] =
{
{ 0x5a, 1, 1, 1 },
{ 0x25, 6, 2, 0 },
@@ -257,7 +257,7 @@ static const UINT8 spc7110_evolution_table[53][4] =
{ 0x37, 51, 43, 0 },
};
-static const UINT8 spc7110_mode2_context_table[32][2] =
+static const uint8_t spc7110_mode2_context_table[32][2] =
{
{ 1, 2 },
@@ -300,7 +300,7 @@ static const UINT8 spc7110_mode2_context_table[32][2] =
SPC7110_Decomp::SPC7110_Decomp(running_machine &machine)
: m_machine(machine)
{
- m_decomp_buffer = std::make_unique<UINT8[]>(SPC7110_DECOMP_BUFFER_SIZE);
+ m_decomp_buffer = std::make_unique<uint8_t[]>(SPC7110_DECOMP_BUFFER_SIZE);
reset();
for (int i = 0; i < 256; i++)
@@ -379,7 +379,7 @@ void SPC7110_Decomp::reset()
m_decomp_buffer_length = 0;
}
-void SPC7110_Decomp::init(running_machine &machine, UINT8 *ROM, UINT32 len, UINT32 mode, UINT32 offset, UINT32 index)
+void SPC7110_Decomp::init(running_machine &machine, uint8_t *ROM, uint32_t len, uint32_t mode, uint32_t offset, uint32_t index)
{
m_decomp_mode = mode;
m_decomp_offset = offset;
@@ -409,9 +409,9 @@ void SPC7110_Decomp::init(running_machine &machine, UINT8 *ROM, UINT32 len, UINT
}
}
-UINT8 SPC7110_Decomp::read(UINT8 *ROM, UINT32 len)
+uint8_t SPC7110_Decomp::read(uint8_t *ROM, uint32_t len)
{
- UINT8 data;
+ uint8_t data;
if (m_decomp_buffer_length == 0)
{
@@ -441,16 +441,16 @@ UINT8 SPC7110_Decomp::read(UINT8 *ROM, UINT32 len)
return data;
}
-void SPC7110_Decomp::write(UINT8 data)
+void SPC7110_Decomp::write(uint8_t data)
{
m_decomp_buffer[m_decomp_buffer_wroffset++] = data;
m_decomp_buffer_wroffset &= SPC7110_DECOMP_BUFFER_SIZE - 1;
m_decomp_buffer_length++;
}
-UINT8 SPC7110_Decomp::dataread(UINT8 *ROM, UINT32 len)
+uint8_t SPC7110_Decomp::dataread(uint8_t *ROM, uint32_t len)
{
- UINT32 size = len - 0x100000;
+ uint32_t size = len - 0x100000;
while (m_decomp_offset >= size)
{
m_decomp_offset -= size;
@@ -458,7 +458,7 @@ UINT8 SPC7110_Decomp::dataread(UINT8 *ROM, UINT32 len)
return ROM[0x100000 + m_decomp_offset++];
}
-void SPC7110_Decomp::mode0(UINT8 init, UINT8 *ROM, UINT32 len)
+void SPC7110_Decomp::mode0(uint8_t init, uint8_t *ROM, uint32_t len)
{
if (init == 1)
{
@@ -475,10 +475,10 @@ void SPC7110_Decomp::mode0(UINT8 init, UINT8 *ROM, UINT32 len)
for (int bit = 0; bit < 8; bit++)
{
//get context
- UINT8 mask = (1 << (bit & 3)) - 1;
- UINT8 con = mask + ((m_m0_inverts & mask) ^ (m_m0_lps & mask));
- UINT32 prob, mps, flag_lps;
- UINT32 shift = 0;
+ uint8_t mask = (1 << (bit & 3)) - 1;
+ uint8_t con = mask + ((m_m0_inverts & mask) ^ (m_m0_lps & mask));
+ uint32_t prob, mps, flag_lps;
+ uint32_t shift = 0;
if (bit > 3)
{
con += 15;
@@ -543,7 +543,7 @@ void SPC7110_Decomp::mode0(UINT8 init, UINT8 *ROM, UINT32 len)
}
}
-void SPC7110_Decomp::mode1(UINT8 init, UINT8 *ROM, UINT32 len)
+void SPC7110_Decomp::mode1(uint8_t init, uint8_t *ROM, uint32_t len)
{
if (init == 1)
{
@@ -561,17 +561,17 @@ void SPC7110_Decomp::mode1(UINT8 init, UINT8 *ROM, UINT32 len)
while (m_decomp_buffer_length < (SPC7110_DECOMP_BUFFER_SIZE >> 1))
{
- UINT16 data;
+ uint16_t data;
for (int pixel = 0; pixel < 8; pixel++)
{
//get first symbol context
- UINT32 a = ((m_m1_out >> (1 * 2)) & 3);
- UINT32 b = ((m_m1_out >> (7 * 2)) & 3);
- UINT32 c = ((m_m1_out >> (8 * 2)) & 3);
- UINT32 con = (a == b) ? (b != c) : (b == c) ? 2 : 4 - (a == c);
+ uint32_t a = ((m_m1_out >> (1 * 2)) & 3);
+ uint32_t b = ((m_m1_out >> (7 * 2)) & 3);
+ uint32_t c = ((m_m1_out >> (8 * 2)) & 3);
+ uint32_t con = (a == b) ? (b != c) : (b == c) ? 2 : 4 - (a == c);
//update pixel order
- UINT32 m, n;
+ uint32_t m, n;
for (m = 0; m < 4; m++)
{
if (m_m1_pixelorder[m] == a)
@@ -637,11 +637,11 @@ void SPC7110_Decomp::mode1(UINT8 init, UINT8 *ROM, UINT32 len)
for (int bit = 0; bit < 2; bit++)
{
//get prob
- UINT32 prob = probability(con);
- UINT32 shift = 0;
+ uint32_t prob = probability(con);
+ uint32_t shift = 0;
//get symbol
- UINT32 flag_lps;
+ uint32_t flag_lps;
if (m_m1_val <= m_m1_span - prob) //mps
{
m_m1_span = m_m1_span - prob;
@@ -704,7 +704,7 @@ void SPC7110_Decomp::mode1(UINT8 init, UINT8 *ROM, UINT32 len)
}
}
-void SPC7110_Decomp::mode2(UINT8 init, UINT8 *ROM, UINT32 len)
+void SPC7110_Decomp::mode2(uint8_t init, uint8_t *ROM, uint32_t len)
{
if (init == 1)
{
@@ -723,18 +723,18 @@ void SPC7110_Decomp::mode2(UINT8 init, UINT8 *ROM, UINT32 len)
while (m_decomp_buffer_length < (SPC7110_DECOMP_BUFFER_SIZE >> 1))
{
- UINT32 data;
+ uint32_t data;
for (int pixel = 0; pixel < 8; pixel++)
{
//get first symbol context
- UINT32 a = ((m_m2_out0 >> (0 * 4)) & 15);
- UINT32 b = ((m_m2_out0 >> (7 * 4)) & 15);
- UINT32 c = ((m_m2_out1 >> (0 * 4)) & 15);
- UINT32 con = 0;
- UINT32 refcon = (a == b) ? (b != c) : (b == c) ? 2 : 4 - (a == c);
+ uint32_t a = ((m_m2_out0 >> (0 * 4)) & 15);
+ uint32_t b = ((m_m2_out0 >> (7 * 4)) & 15);
+ uint32_t c = ((m_m2_out1 >> (0 * 4)) & 15);
+ uint32_t con = 0;
+ uint32_t refcon = (a == b) ? (b != c) : (b == c) ? 2 : 4 - (a == c);
//update pixel order
- UINT32 m, n;
+ uint32_t m, n;
for (m = 0; m < 16; m++)
{
if (m_m2_pixelorder[m] == a)
@@ -799,13 +799,13 @@ void SPC7110_Decomp::mode2(UINT8 init, UINT8 *ROM, UINT32 len)
//get 4 symbols
for (int bit = 0; bit < 4; bit++)
{
- UINT32 invertbit, shift;
+ uint32_t invertbit, shift;
//get prob
- UINT32 prob = probability(con);
+ uint32_t prob = probability(con);
//get symbol
- UINT32 flag_lps;
+ uint32_t flag_lps;
if (m_m2_val <= m_m2_span - prob) //mps
{
m_m2_span = m_m2_span - prob;
@@ -882,27 +882,27 @@ void SPC7110_Decomp::mode2(UINT8 init, UINT8 *ROM, UINT32 len)
}
}
-UINT8 SPC7110_Decomp::probability(UINT32 n)
+uint8_t SPC7110_Decomp::probability(uint32_t n)
{
return spc7110_evolution_table[m_context[n].index][0];
}
-UINT8 SPC7110_Decomp::next_lps(UINT32 n)
+uint8_t SPC7110_Decomp::next_lps(uint32_t n)
{
return spc7110_evolution_table[m_context[n].index][1];
}
-UINT8 SPC7110_Decomp::next_mps(UINT32 n)
+uint8_t SPC7110_Decomp::next_mps(uint32_t n)
{
return spc7110_evolution_table[m_context[n].index][2];
}
-UINT8 SPC7110_Decomp::toggle_invert(UINT32 n)
+uint8_t SPC7110_Decomp::toggle_invert(uint32_t n)
{
return spc7110_evolution_table[m_context[n].index][3];
}
-UINT32 SPC7110_Decomp::morton_2x8(UINT32 data)
+uint32_t SPC7110_Decomp::morton_2x8(uint32_t data)
{
//reverse morton lookup: de-interleave two 8-bit values
//15, 13, 11, 9, 7, 5, 3, 1 -> 15- 8
@@ -910,7 +910,7 @@ UINT32 SPC7110_Decomp::morton_2x8(UINT32 data)
return m_morton16[0][(data >> 0) & 255] + m_morton16[1][(data >> 8) & 255];
}
-UINT32 SPC7110_Decomp::morton_4x8(UINT32 data)
+uint32_t SPC7110_Decomp::morton_4x8(uint32_t data)
{
//reverse morton lookup: de-interleave four 8-bit values
//31, 27, 23, 19, 15, 11, 7, 3 -> 31-24
@@ -922,11 +922,11 @@ UINT32 SPC7110_Decomp::morton_4x8(UINT32 data)
}
-static const UINT32 spc7110_months[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+static const uint32_t spc7110_months[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
-UINT32 sns_rom_spc7110_device::spc7110_datarom_addr(UINT32 addr, UINT32 rom_len)
+uint32_t sns_rom_spc7110_device::spc7110_datarom_addr(uint32_t addr, uint32_t rom_len)
{
- UINT32 size = rom_len - 0x100000;
+ uint32_t size = rom_len - 0x100000;
while (addr >= size)
{
addr -= size;
@@ -934,29 +934,29 @@ UINT32 sns_rom_spc7110_device::spc7110_datarom_addr(UINT32 addr, UINT32 rom_len)
return addr + 0x100000;
}
-UINT32 sns_rom_spc7110_device::spc7110_data_pointer(void)
+uint32_t sns_rom_spc7110_device::spc7110_data_pointer(void)
{
return m_r4811 + (m_r4812 << 8) + (m_r4813 << 16);
}
-UINT32 sns_rom_spc7110_device::spc7110_data_adjust(void)
+uint32_t sns_rom_spc7110_device::spc7110_data_adjust(void)
{
return m_r4814 + (m_r4815 << 8);
}
-UINT32 sns_rom_spc7110_device::spc7110_data_increment(void)
+uint32_t sns_rom_spc7110_device::spc7110_data_increment(void)
{
return m_r4816 + (m_r4817 << 8);
}
-void sns_rom_spc7110_device::spc7110_set_data_pointer(UINT32 addr)
+void sns_rom_spc7110_device::spc7110_set_data_pointer(uint32_t addr)
{
m_r4811 = addr;
m_r4812 = addr >> 8;
m_r4813 = addr >> 16;
}
-void sns_rom_spc7110_device::spc7110_set_data_adjust(UINT32 addr)
+void sns_rom_spc7110_device::spc7110_set_data_adjust(uint32_t addr)
{
m_r4814 = addr;
m_r4815 = addr >> 8;
@@ -966,11 +966,11 @@ void sns_rom_spc7110_device::spc7110_set_data_adjust(UINT32 addr)
// we should probably keep track internally of the time rather than updating
// to the system time at each call with a "offset" tracking as we do now...
// (and indeed current code fails to pass Tengai Makyou Zero tests)
-void sns_rom_spc7110_device::spc7110_update_time(UINT8 offset)
+void sns_rom_spc7110_device::spc7110_update_time(uint8_t offset)
{
system_time curtime;
machine().current_datetime(curtime);
- INT64 diff = curtime.time - m_rtc_basetime.time - offset;
+ int64_t diff = curtime.time - m_rtc_basetime.time - offset;
// printf("diff %llx\n", diff);
bool update = TRUE;
@@ -984,18 +984,18 @@ void sns_rom_spc7110_device::spc7110_update_time(UINT8 offset)
if (update && diff > 0)
{
/* update time with offset, assuming offset < 3600s */
- UINT32 second = m_rtc_ram[0] + m_rtc_ram[1] * 10;
- UINT8 minute = m_rtc_ram[2] + m_rtc_ram[3] * 10;
- UINT8 hour = m_rtc_ram[4] + m_rtc_ram[5] * 10;
- UINT8 day = m_rtc_ram[6] + m_rtc_ram[7] * 10;
- UINT8 month = m_rtc_ram[8] + m_rtc_ram[9] * 10;
- UINT8 year = m_rtc_ram[10] + m_rtc_ram[11] * 10;
- UINT8 weekday = m_rtc_ram[12];
+ uint32_t second = m_rtc_ram[0] + m_rtc_ram[1] * 10;
+ uint8_t minute = m_rtc_ram[2] + m_rtc_ram[3] * 10;
+ uint8_t hour = m_rtc_ram[4] + m_rtc_ram[5] * 10;
+ uint8_t day = m_rtc_ram[6] + m_rtc_ram[7] * 10;
+ uint8_t month = m_rtc_ram[8] + m_rtc_ram[9] * 10;
+ uint8_t year = m_rtc_ram[10] + m_rtc_ram[11] * 10;
+ uint8_t weekday = m_rtc_ram[12];
day--;
month--;
year += (year >= 90) ? 1900 : 2000;
- second += (UINT32)diff;
+ second += (uint32_t)diff;
while (second >= 60)
{
second -= 60;
@@ -1017,7 +1017,7 @@ void sns_rom_spc7110_device::spc7110_update_time(UINT8 offset)
weekday = (weekday + 1) % 7;
- UINT8 days = spc7110_months[month % 12];
+ uint8_t days = spc7110_months[month % 12];
// check for feb 29th
if (days == 28)
{
@@ -1069,9 +1069,9 @@ void sns_rom_spc7110_device::spc7110_update_time(UINT8 offset)
READ8_MEMBER(sns_rom_spc7110_device::chip_read)
{
- UINT8 *ROM = get_rom_base();
- UINT32 len = get_rom_size();
- UINT16 addr = offset & 0xffff;
+ uint8_t *ROM = get_rom_base();
+ uint32_t len = get_rom_size();
+ uint16_t addr = offset & 0xffff;
switch (addr)
{
@@ -1081,7 +1081,7 @@ READ8_MEMBER(sns_rom_spc7110_device::chip_read)
case 0x4800:
{
- UINT16 counter = (m_r4809 + (m_r480a << 8));
+ uint16_t counter = (m_r4809 + (m_r480a << 8));
counter--;
m_r4809 = counter;
m_r480a = counter >> 8;
@@ -1100,7 +1100,7 @@ READ8_MEMBER(sns_rom_spc7110_device::chip_read)
case 0x480b: return m_r480b;
case 0x480c:
{
- UINT8 status = m_r480c;
+ uint8_t status = m_r480c;
m_r480c &= 0x7f;
return status;
}
@@ -1111,8 +1111,8 @@ READ8_MEMBER(sns_rom_spc7110_device::chip_read)
case 0x4810:
{
- UINT8 data;
- UINT32 address, adjust, adjustaddr;
+ uint8_t data;
+ uint32_t address, adjust, adjustaddr;
if (m_r481x != 0x07) return 0x00;
@@ -1120,7 +1120,7 @@ READ8_MEMBER(sns_rom_spc7110_device::chip_read)
adjust = spc7110_data_adjust();
if (m_r4818 & 8)
{
- adjust = (INT16)adjust; //16-bit sign extend
+ adjust = (int16_t)adjust; //16-bit sign extend
}
adjustaddr = address;
@@ -1133,10 +1133,10 @@ READ8_MEMBER(sns_rom_spc7110_device::chip_read)
data = ROM[spc7110_datarom_addr(adjustaddr, len)];
if (!(m_r4818 & 2))
{
- UINT32 increment = (m_r4818 & 1) ? spc7110_data_increment() : 1;
+ uint32_t increment = (m_r4818 & 1) ? spc7110_data_increment() : 1;
if (m_r4818 & 4)
{
- increment = (INT16)increment; //16-bit sign extend
+ increment = (int16_t)increment; //16-bit sign extend
}
if ((m_r4818 & 16) == 0)
@@ -1161,8 +1161,8 @@ READ8_MEMBER(sns_rom_spc7110_device::chip_read)
case 0x4818: return m_r4818;
case 0x481a:
{
- UINT8 data;
- UINT32 address, adjust;
+ uint8_t data;
+ uint32_t address, adjust;
if (m_r481x != 0x07)
{
return 0x00;
@@ -1172,7 +1172,7 @@ READ8_MEMBER(sns_rom_spc7110_device::chip_read)
adjust = spc7110_data_adjust();
if (m_r4818 & 8)
{
- adjust = (INT16)adjust; //16-bit sign extend
+ adjust = (int16_t)adjust; //16-bit sign extend
}
data = ROM[spc7110_datarom_addr(address + adjust, len)];
@@ -1212,7 +1212,7 @@ READ8_MEMBER(sns_rom_spc7110_device::chip_read)
case 0x482e: return m_r482e;
case 0x482f:
{
- UINT8 status = m_r482f;
+ uint8_t status = m_r482f;
m_r482f &= 0x7f;
return status;
}
@@ -1233,7 +1233,7 @@ READ8_MEMBER(sns_rom_spc7110_device::chip_read)
case 0x4840: return m_r4840;
case 0x4841:
{
- UINT8 data;
+ uint8_t data;
if (m_rtc_state == RTCS_Inactive || m_rtc_state == RTCS_ModeSelect)
return 0x00;
@@ -1244,7 +1244,7 @@ READ8_MEMBER(sns_rom_spc7110_device::chip_read)
}
case 0x4842:
{
- UINT8 status = m_r4842;
+ uint8_t status = m_r4842;
m_r4842 &= 0x7f;
return status;
}
@@ -1255,9 +1255,9 @@ READ8_MEMBER(sns_rom_spc7110_device::chip_read)
WRITE8_MEMBER(sns_rom_spc7110_device::chip_write)
{
- UINT8 *ROM = get_rom_base();
- UINT32 len = get_rom_size();
- UINT16 addr = offset & 0xffff;
+ uint8_t *ROM = get_rom_base();
+ uint32_t len = get_rom_size();
+ uint16_t addr = offset & 0xffff;
switch (addr)
{
@@ -1272,7 +1272,7 @@ WRITE8_MEMBER(sns_rom_spc7110_device::chip_write)
case 0x4805: m_r4805 = data; break;
case 0x4806:
{
- UINT32 table, index, address, mode, offset;
+ uint32_t table, index, address, mode, offset;
m_r4806 = data;
table = (m_r4801 + (m_r4802 << 8) + (m_r4803 << 16));
@@ -1321,19 +1321,19 @@ WRITE8_MEMBER(sns_rom_spc7110_device::chip_write)
if ((m_r4818 & 0x60) == 0x20)
{
- UINT32 increment = spc7110_data_adjust() & 0xff;
+ uint32_t increment = spc7110_data_adjust() & 0xff;
if (m_r4818 & 8)
{
- increment = (INT8)increment; //8-bit sign extend
+ increment = (int8_t)increment; //8-bit sign extend
}
spc7110_set_data_pointer(spc7110_data_pointer() + increment);
}
else if ((m_r4818 & 0x60) == 0x40)
{
- UINT32 increment = spc7110_data_adjust();
+ uint32_t increment = spc7110_data_adjust();
if (m_r4818 & 8)
{
- increment = (INT16)increment; //16-bit sign extend
+ increment = (int16_t)increment; //16-bit sign extend
}
spc7110_set_data_pointer(spc7110_data_pointer() + increment);
}
@@ -1359,19 +1359,19 @@ WRITE8_MEMBER(sns_rom_spc7110_device::chip_write)
if ((m_r4818 & 0x60) == 0x20)
{
- UINT32 increment = spc7110_data_adjust() & 0xff;
+ uint32_t increment = spc7110_data_adjust() & 0xff;
if (m_r4818 & 8)
{
- increment = (INT8)increment; //8-bit sign extend
+ increment = (int8_t)increment; //8-bit sign extend
}
spc7110_set_data_pointer(spc7110_data_pointer() + increment);
}
else if ((m_r4818 & 0x60) == 0x40)
{
- UINT32 increment = spc7110_data_adjust();
+ uint32_t increment = spc7110_data_adjust();
if (m_r4818 & 8)
{
- increment = (INT16)increment; //16-bit sign extend
+ increment = (int16_t)increment; //16-bit sign extend
}
spc7110_set_data_pointer(spc7110_data_pointer() + increment);
}
@@ -1406,10 +1406,10 @@ WRITE8_MEMBER(sns_rom_spc7110_device::chip_write)
if (m_r482e & 1)
{
//signed 16-bit x 16-bit multiplication
- INT16 r0 = (INT16)(m_r4824 + (m_r4825 << 8));
- INT16 r1 = (INT16)(m_r4820 + (m_r4821 << 8));
+ int16_t r0 = (int16_t)(m_r4824 + (m_r4825 << 8));
+ int16_t r1 = (int16_t)(m_r4820 + (m_r4821 << 8));
- INT32 result = r0 * r1;
+ int32_t result = r0 * r1;
m_r4828 = result;
m_r4829 = result >> 8;
m_r482a = result >> 16;
@@ -1418,10 +1418,10 @@ WRITE8_MEMBER(sns_rom_spc7110_device::chip_write)
else
{
//unsigned 16-bit x 16-bit multiplication
- UINT16 r0 = (UINT16)(m_r4824 + (m_r4825 << 8));
- UINT16 r1 = (UINT16)(m_r4820 + (m_r4821 << 8));
+ uint16_t r0 = (uint16_t)(m_r4824 + (m_r4825 << 8));
+ uint16_t r1 = (uint16_t)(m_r4820 + (m_r4821 << 8));
- UINT32 result = r0 * r1;
+ uint32_t result = r0 * r1;
m_r4828 = result;
m_r4829 = result >> 8;
m_r482a = result >> 16;
@@ -1440,16 +1440,16 @@ WRITE8_MEMBER(sns_rom_spc7110_device::chip_write)
if (m_r482e & 1)
{
//signed 32-bit x 16-bit division
- INT32 dividend = (INT32)(m_r4820 + (m_r4821 << 8) + (m_r4822 << 16) + (m_r4823 << 24));
- INT16 divisor = (INT16)(m_r4826 + (m_r4827 << 8));
+ int32_t dividend = (int32_t)(m_r4820 + (m_r4821 << 8) + (m_r4822 << 16) + (m_r4823 << 24));
+ int16_t divisor = (int16_t)(m_r4826 + (m_r4827 << 8));
- INT32 quotient;
- INT16 remainder;
+ int32_t quotient;
+ int16_t remainder;
if (divisor)
{
- quotient = (INT32)(dividend / divisor);
- remainder = (INT32)(dividend % divisor);
+ quotient = (int32_t)(dividend / divisor);
+ remainder = (int32_t)(dividend % divisor);
}
else
{
@@ -1469,16 +1469,16 @@ WRITE8_MEMBER(sns_rom_spc7110_device::chip_write)
else
{
//unsigned 32-bit x 16-bit division
- UINT32 dividend = (UINT32)(m_r4820 + (m_r4821 << 8) + (m_r4822 << 16) + (m_r4823 << 24));
- UINT16 divisor = (UINT16)(m_r4826 + (m_r4827 << 8));
+ uint32_t dividend = (uint32_t)(m_r4820 + (m_r4821 << 8) + (m_r4822 << 16) + (m_r4823 << 24));
+ uint16_t divisor = (uint16_t)(m_r4826 + (m_r4827 << 8));
- UINT32 quotient;
- UINT16 remainder;
+ uint32_t quotient;
+ uint16_t remainder;
if (divisor)
{
- quotient = (UINT32)(dividend / divisor);
- remainder = (UINT16)(dividend % divisor);
+ quotient = (uint32_t)(dividend / divisor);
+ remainder = (uint16_t)(dividend % divisor);
}
else
{
@@ -1602,7 +1602,7 @@ WRITE8_MEMBER(sns_rom_spc7110_device::chip_write)
{
spc7110_update_time(0);
- UINT8 second = m_rtc_ram[0] + m_rtc_ram[1] * 10;
+ uint8_t second = m_rtc_ram[0] + m_rtc_ram[1] * 10;
//clear seconds
m_rtc_ram[0] = 0;
m_rtc_ram[1] = 0;
@@ -1649,7 +1649,7 @@ READ8_MEMBER(sns_rom_spc7110_device::read_l)
READ8_MEMBER(sns_rom_spc7110_device::read_h)
{
- UINT16 address = offset & 0xfffff;
+ uint16_t address = offset & 0xfffff;
if (offset < 0x400000)
return m_rom[rom_bank_map[offset / 0x8000] * 0x8000 + (offset & 0x7fff)];
diff --git a/src/devices/bus/snes/spc7110.h b/src/devices/bus/snes/spc7110.h
index 33d7170d02c..90274f551a9 100644
--- a/src/devices/bus/snes/spc7110.h
+++ b/src/devices/bus/snes/spc7110.h
@@ -28,59 +28,59 @@ public:
running_machine &machine() const { return m_machine; }
- void init(running_machine &machine, UINT8 *ROM, UINT32 len, UINT32 mode, UINT32 offset, UINT32 index);
+ void init(running_machine &machine, uint8_t *ROM, uint32_t len, uint32_t mode, uint32_t offset, uint32_t index);
void reset();
- UINT8 read(UINT8 *ROM, UINT32 len);
- void write(UINT8 data);
- void mode0(UINT8 init, UINT8 *ROM, UINT32 len);
- void mode1(UINT8 init, UINT8 *ROM, UINT32 len);
- void mode2(UINT8 init, UINT8 *ROM, UINT32 len);
+ uint8_t read(uint8_t *ROM, uint32_t len);
+ void write(uint8_t data);
+ void mode0(uint8_t init, uint8_t *ROM, uint32_t len);
+ void mode1(uint8_t init, uint8_t *ROM, uint32_t len);
+ void mode2(uint8_t init, uint8_t *ROM, uint32_t len);
private:
- UINT8 dataread(UINT8 *ROM, UINT32 len);
- UINT8 probability(UINT32 n);
- UINT8 next_lps(UINT32 n);
- UINT8 next_mps(UINT32 n);
- UINT8 toggle_invert(UINT32 n);
- UINT32 morton_2x8(UINT32 data);
- UINT32 morton_4x8(UINT32 data);
+ uint8_t dataread(uint8_t *ROM, uint32_t len);
+ uint8_t probability(uint32_t n);
+ uint8_t next_lps(uint32_t n);
+ uint8_t next_mps(uint32_t n);
+ uint8_t toggle_invert(uint32_t n);
+ uint32_t morton_2x8(uint32_t data);
+ uint32_t morton_4x8(uint32_t data);
- UINT32 m_decomp_mode;
- UINT32 m_decomp_offset;
+ uint32_t m_decomp_mode;
+ uint32_t m_decomp_offset;
- std::unique_ptr<UINT8[]> m_decomp_buffer;
- UINT32 m_decomp_buffer_rdoffset;
- UINT32 m_decomp_buffer_wroffset;
- UINT32 m_decomp_buffer_length;
+ std::unique_ptr<uint8_t[]> m_decomp_buffer;
+ uint32_t m_decomp_buffer_rdoffset;
+ uint32_t m_decomp_buffer_wroffset;
+ uint32_t m_decomp_buffer_length;
struct ContextState
{
- UINT8 index;
- UINT8 invert;
+ uint8_t index;
+ uint8_t invert;
} m_context[32];
- UINT32 m_morton16[2][256];
- UINT32 m_morton32[4][256];
+ uint32_t m_morton16[2][256];
+ uint32_t m_morton32[4][256];
// mode 0 vars
- UINT8 m_m0_val, m_m0_in, m_m0_span;
- INT32 m_m0_out, m_m0_inverts, m_m0_lps, m_m0_in_count;
+ uint8_t m_m0_val, m_m0_in, m_m0_span;
+ int32_t m_m0_out, m_m0_inverts, m_m0_lps, m_m0_in_count;
// mode 1 vars
- INT32 m_m1_pixelorder[4], m_m1_realorder[4];
- UINT8 m_m1_in, m_m1_val, m_m1_span;
- INT32 m_m1_out, m_m1_inverts, m_m1_lps, m_m1_in_count;
+ int32_t m_m1_pixelorder[4], m_m1_realorder[4];
+ uint8_t m_m1_in, m_m1_val, m_m1_span;
+ int32_t m_m1_out, m_m1_inverts, m_m1_lps, m_m1_in_count;
// mode 2 vars
- INT32 m_m2_pixelorder[16], m_m2_realorder[16];
- UINT8 m_m2_bitplanebuffer[16], m_m2_buffer_index;
- UINT8 m_m2_in, m_m2_val, m_m2_span;
- INT32 m_m2_out0, m_m2_out1, m_m2_inverts, m_m2_lps, m_m2_in_count;
+ int32_t m_m2_pixelorder[16], m_m2_realorder[16];
+ uint8_t m_m2_bitplanebuffer[16], m_m2_buffer_index;
+ uint8_t m_m2_in, m_m2_val, m_m2_span;
+ int32_t m_m2_out0, m_m2_out1, m_m2_inverts, m_m2_lps, m_m2_in_count;
running_machine& m_machine;
- //UINT32 m_rom_size;
+ //uint32_t m_rom_size;
};
// ======================> sns_rom_spc7110_device
@@ -89,8 +89,8 @@ class sns_rom_spc7110_device : public sns_rom21_device
{
public:
// construction/destruction
- sns_rom_spc7110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- sns_rom_spc7110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_spc7110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ sns_rom_spc7110_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -105,97 +105,97 @@ public:
virtual DECLARE_WRITE8_MEMBER(chip_write) override;
void spc7110_start();
- UINT32 spc7110_datarom_addr(UINT32 addr, UINT32 len);
- UINT32 spc7110_data_pointer();
- UINT32 spc7110_data_adjust();
- UINT32 spc7110_data_increment();
- void spc7110_set_data_pointer(UINT32 addr);
- void spc7110_set_data_adjust(UINT32 addr);
- void spc7110_update_time(UINT8 offset);
+ uint32_t spc7110_datarom_addr(uint32_t addr, uint32_t len);
+ uint32_t spc7110_data_pointer();
+ uint32_t spc7110_data_adjust();
+ uint32_t spc7110_data_increment();
+ void spc7110_set_data_pointer(uint32_t addr);
+ void spc7110_set_data_adjust(uint32_t addr);
+ void spc7110_update_time(uint8_t offset);
//==================
//decompression unit
//==================
- UINT8 m_r4801; // compression table low
- UINT8 m_r4802; // compression table high
- UINT8 m_r4803; // compression table bank
- UINT8 m_r4804; // compression table index
- UINT8 m_r4805; // decompression buffer index low
- UINT8 m_r4806; // decompression buffer index high
- UINT8 m_r4807; // ???
- UINT8 m_r4808; // ???
- UINT8 m_r4809; // compression length low
- UINT8 m_r480a; // compression length high
- UINT8 m_r480b; // decompression control register
- UINT8 m_r480c; // decompression status
+ uint8_t m_r4801; // compression table low
+ uint8_t m_r4802; // compression table high
+ uint8_t m_r4803; // compression table bank
+ uint8_t m_r4804; // compression table index
+ uint8_t m_r4805; // decompression buffer index low
+ uint8_t m_r4806; // decompression buffer index high
+ uint8_t m_r4807; // ???
+ uint8_t m_r4808; // ???
+ uint8_t m_r4809; // compression length low
+ uint8_t m_r480a; // compression length high
+ uint8_t m_r480b; // decompression control register
+ uint8_t m_r480c; // decompression status
std::unique_ptr<SPC7110_Decomp> m_decomp;
- UINT8 m_r4811; // data pointer low
- UINT8 m_r4812; // data pointer high
- UINT8 m_r4813; // data pointer bank
- UINT8 m_r4814; // data adjust low
- UINT8 m_r4815; // data adjust high
- UINT8 m_r4816; // data increment low
- UINT8 m_r4817; // data increment high
- UINT8 m_r4818; // data port control register
+ uint8_t m_r4811; // data pointer low
+ uint8_t m_r4812; // data pointer high
+ uint8_t m_r4813; // data pointer bank
+ uint8_t m_r4814; // data adjust low
+ uint8_t m_r4815; // data adjust high
+ uint8_t m_r4816; // data increment low
+ uint8_t m_r4817; // data increment high
+ uint8_t m_r4818; // data port control register
- UINT8 m_r481x;
+ uint8_t m_r481x;
- UINT8 m_r4814_latch;
- UINT8 m_r4815_latch;
+ uint8_t m_r4814_latch;
+ uint8_t m_r4815_latch;
//=========
//math unit
//=========
- UINT8 m_r4820; // 16-bit multiplicand B0, 32-bit dividend B0
- UINT8 m_r4821; // 16-bit multiplicand B1, 32-bit dividend B1
- UINT8 m_r4822; // 32-bit dividend B2
- UINT8 m_r4823; // 32-bit dividend B3
- UINT8 m_r4824; // 16-bit multiplier B0
- UINT8 m_r4825; // 16-bit multiplier B1
- UINT8 m_r4826; // 16-bit divisor B0
- UINT8 m_r4827; // 16-bit divisor B1
- UINT8 m_r4828; // 32-bit product B0, 32-bit quotient B0
- UINT8 m_r4829; // 32-bit product B1, 32-bit quotient B1
- UINT8 m_r482a; // 32-bit product B2, 32-bit quotient B2
- UINT8 m_r482b; // 32-bit product B3, 32-bit quotient B3
- UINT8 m_r482c; // 16-bit remainder B0
- UINT8 m_r482d; // 16-bit remainder B1
- UINT8 m_r482e; // math control register
- UINT8 m_r482f; // math status
+ uint8_t m_r4820; // 16-bit multiplicand B0, 32-bit dividend B0
+ uint8_t m_r4821; // 16-bit multiplicand B1, 32-bit dividend B1
+ uint8_t m_r4822; // 32-bit dividend B2
+ uint8_t m_r4823; // 32-bit dividend B3
+ uint8_t m_r4824; // 16-bit multiplier B0
+ uint8_t m_r4825; // 16-bit multiplier B1
+ uint8_t m_r4826; // 16-bit divisor B0
+ uint8_t m_r4827; // 16-bit divisor B1
+ uint8_t m_r4828; // 32-bit product B0, 32-bit quotient B0
+ uint8_t m_r4829; // 32-bit product B1, 32-bit quotient B1
+ uint8_t m_r482a; // 32-bit product B2, 32-bit quotient B2
+ uint8_t m_r482b; // 32-bit product B3, 32-bit quotient B3
+ uint8_t m_r482c; // 16-bit remainder B0
+ uint8_t m_r482d; // 16-bit remainder B1
+ uint8_t m_r482e; // math control register
+ uint8_t m_r482f; // math status
//===================
//memory mapping unit
//===================
- UINT8 m_r4830; // SRAM write enable
- UINT8 m_r4831; // $[d0-df]:[0000-ffff] mapping
- UINT8 m_r4832; // $[e0-ef]:[0000-ffff] mapping
- UINT8 m_r4833; // $[f0-ff]:[0000-ffff] mapping
- UINT8 m_r4834; // ???
+ uint8_t m_r4830; // SRAM write enable
+ uint8_t m_r4831; // $[d0-df]:[0000-ffff] mapping
+ uint8_t m_r4832; // $[e0-ef]:[0000-ffff] mapping
+ uint8_t m_r4833; // $[f0-ff]:[0000-ffff] mapping
+ uint8_t m_r4834; // ???
- UINT32 m_dx_offset;
- UINT32 m_ex_offset;
- UINT32 m_fx_offset;
+ uint32_t m_dx_offset;
+ uint32_t m_ex_offset;
+ uint32_t m_fx_offset;
//====================
//real-time clock unit
//====================
- UINT8 m_r4840; // RTC latch
- UINT8 m_r4841; // RTC index/data port
- UINT8 m_r4842; // RTC status
+ uint8_t m_r4840; // RTC latch
+ uint8_t m_r4841; // RTC index/data port
+ uint8_t m_r4842; // RTC status
- UINT32 m_rtc_state;
- UINT32 m_rtc_mode;
- UINT32 m_rtc_index;
+ uint32_t m_rtc_state;
+ uint32_t m_rtc_mode;
+ uint32_t m_rtc_index;
- UINT64 m_rtc_offset;
+ uint64_t m_rtc_offset;
system_time m_rtc_basetime;
//this is now allocated in the main snes cart class, to allow saving to nvram
- //UINT8 m_rtc_ram[16]; // 0-12 secs, min, hrs, etc.; 13-14-15 control registers
+ //uint8_t m_rtc_ram[16]; // 0-12 secs, min, hrs, etc.; 13-14-15 control registers
};
// ======================> sns_rom_spc7110_device
@@ -204,7 +204,7 @@ class sns_rom_spc7110rtc_device : public sns_rom_spc7110_device
{
public:
// construction/destruction
- sns_rom_spc7110rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_spc7110rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/snes/sufami.cpp b/src/devices/bus/snes/sufami.cpp
index b6ac1b376d2..c181c5cde95 100644
--- a/src/devices/bus/snes/sufami.cpp
+++ b/src/devices/bus/snes/sufami.cpp
@@ -24,14 +24,14 @@ const device_type SNS_LOROM_SUFAMI = &device_creator<sns_rom_sufami_device>;
const device_type SNS_STROM = &device_creator<sns_rom_strom_device>;
-sns_rom_sufami_device::sns_rom_sufami_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_sufami_device::sns_rom_sufami_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_device(mconfig, SNS_LOROM_SUFAMI, "SNES Sufami Turbo Cart", tag, owner, clock, "sns_rom_sufami", __FILE__),
m_slot1(*this, "st_slot1"),
m_slot2(*this, "st_slot2")
{
}
-sns_rom_strom_device::sns_rom_strom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_strom_device::sns_rom_strom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_device(mconfig, SNS_STROM, "SNES Sufami Turbo Minicart", tag, owner, clock, "sns_strom", __FILE__)
{
}
diff --git a/src/devices/bus/snes/sufami.h b/src/devices/bus/snes/sufami.h
index 7881a6f6d58..b00c8c8ed07 100644
--- a/src/devices/bus/snes/sufami.h
+++ b/src/devices/bus/snes/sufami.h
@@ -13,7 +13,7 @@ class sns_rom_sufami_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_sufami_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_sufami_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -36,7 +36,7 @@ class sns_rom_strom_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_strom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_strom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/snes/upd.cpp b/src/devices/bus/snes/upd.cpp
index 611b84f6610..f87e41194fa 100644
--- a/src/devices/bus/snes/upd.cpp
+++ b/src/devices/bus/snes/upd.cpp
@@ -13,11 +13,11 @@
// helpers
-inline UINT32 get_prg(UINT8 *CPU, UINT32 addr)
+inline uint32_t get_prg(uint8_t *CPU, uint32_t addr)
{
return ((CPU[addr * 4] << 24) | (CPU[addr * 4 + 1] << 16) | (CPU[addr * 4 + 2] << 8) | 0x00);
}
-inline UINT16 get_data(UINT8 *CPU, UINT32 addr)
+inline uint16_t get_data(uint8_t *CPU, uint32_t addr)
{
return ((CPU[addr * 2] << 8) | CPU[addr * 2 + 1]);
}
@@ -32,42 +32,42 @@ const device_type SNS_LOROM_SETA10 = &device_creator<sns_rom_seta10dsp_device>;
const device_type SNS_LOROM_SETA11 = &device_creator<sns_rom_seta11dsp_device>;
-sns_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+sns_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_upd7725(*this, "dsp")
{
}
-sns_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom20_necdsp_device::sns_rom20_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_device(mconfig, SNS_LOROM_NECDSP, "SNES Cart (LoROM) + NEC DSP", tag, owner, clock, "sns_rom_necdsp", __FILE__),
m_upd7725(*this, "dsp")
{
}
-sns_rom21_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+sns_rom21_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: sns_rom21_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_upd7725(*this, "dsp")
{
}
-sns_rom21_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom21_necdsp_device::sns_rom21_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom21_device(mconfig, SNS_HIROM_NECDSP, "SNES Cart (HiROM) + NEC DSP", tag, owner, clock, "sns_rom21_necdsp", __FILE__),
m_upd7725(*this, "dsp")
{
}
-sns_rom_setadsp_device::sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+sns_rom_setadsp_device::sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: sns_rom_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_upd96050(*this, "dsp")
{
}
-sns_rom_seta10dsp_device::sns_rom_seta10dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_seta10dsp_device::sns_rom_seta10dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA10, "SNES Cart (LoROM) + Seta ST010 DSP", tag, owner, clock, "sns_rom_seta10", __FILE__)
{
}
-sns_rom_seta11dsp_device::sns_rom_seta11dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_seta11dsp_device::sns_rom_seta11dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA11, "SNES Cart (LoROM) + Seta ST011 DSP", tag, owner, clock, "sns_rom_seta11", __FILE__)
{
}
@@ -75,20 +75,20 @@ sns_rom_seta11dsp_device::sns_rom_seta11dsp_device(const machine_config &mconfig
void sns_rom20_necdsp_device::device_start()
{
- m_dsp_prg.resize(0x2000/sizeof(UINT32));
- m_dsp_data.resize(0x800/sizeof(UINT16));
+ m_dsp_prg.resize(0x2000/sizeof(uint32_t));
+ m_dsp_data.resize(0x800/sizeof(uint16_t));
}
void sns_rom21_necdsp_device::device_start()
{
- m_dsp_prg.resize(0x2000/sizeof(UINT32));
- m_dsp_data.resize(0x800/sizeof(UINT16));
+ m_dsp_prg.resize(0x2000/sizeof(uint32_t));
+ m_dsp_data.resize(0x800/sizeof(uint16_t));
}
void sns_rom_setadsp_device::device_start()
{
- m_dsp_prg.resize(0x10000/sizeof(UINT32));
- m_dsp_data.resize(0x1000/sizeof(UINT16));
+ m_dsp_prg.resize(0x10000/sizeof(uint32_t));
+ m_dsp_data.resize(0x1000/sizeof(uint16_t));
}
/*-------------------------------------------------
@@ -244,8 +244,8 @@ READ8_MEMBER( sns_rom_setadsp_device::chip_read )
if (offset >= 0x680000 && offset < 0x700000 && (offset & 0xffff) < 0x8000)
{
- UINT16 address = offset & 0xffff;
- UINT16 temp = m_upd96050->dataram_r(address/2);
+ uint16_t address = offset & 0xffff;
+ uint16_t temp = m_upd96050->dataram_r(address/2);
if (offset & 1)
return temp >> 8;
else
@@ -266,8 +266,8 @@ WRITE8_MEMBER( sns_rom_setadsp_device::chip_write )
if (offset >= 0x680000 && offset < 0x700000 && (offset & 0xffff) < 0x8000)
{
- UINT16 address = offset & 0xffff;
- UINT16 temp = m_upd96050->dataram_r(address/2);
+ uint16_t address = offset & 0xffff;
+ uint16_t temp = m_upd96050->dataram_r(address/2);
if (offset & 1)
{
@@ -408,42 +408,42 @@ const device_type SNS_LOROM_SETA10_LEG = &device_creator<sns_rom_seta10dsp_legac
const device_type SNS_LOROM_SETA11_LEG = &device_creator<sns_rom_seta11dsp_legacy_device>;
-sns_rom20_necdsp1_legacy_device::sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom20_necdsp1_legacy_device::sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP1_LEG, "SNES Cart (LoROM) + NEC DSP1 Legacy", tag, owner, clock, "dsp1leg", __FILE__)
{
}
-sns_rom20_necdsp1b_legacy_device::sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom20_necdsp1b_legacy_device::sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP1B_LEG, "SNES Cart (LoROM) + NEC DSP1B Legacy", tag, owner, clock, "dsp1bleg", __FILE__)
{
}
-sns_rom20_necdsp2_legacy_device::sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom20_necdsp2_legacy_device::sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP2_LEG, "SNES Cart (LoROM) + NEC DSP2 Legacy", tag, owner, clock, "dsp2leg", __FILE__)
{
}
-sns_rom20_necdsp3_legacy_device::sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom20_necdsp3_legacy_device::sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP3_LEG, "SNES Cart (LoROM) + NEC DSP3 Legacy", tag, owner, clock, "dsp3leg", __FILE__)
{
}
-sns_rom20_necdsp4_legacy_device::sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom20_necdsp4_legacy_device::sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom20_necdsp_device(mconfig, SNS_LOROM_NECDSP4_LEG, "SNES Cart (LoROM) + NEC DSP4 Legacy", tag, owner, clock, "dsp4leg", __FILE__)
{
}
-sns_rom21_necdsp1_legacy_device::sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom21_necdsp1_legacy_device::sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom21_necdsp_device(mconfig, SNS_HIROM_NECDSP1_LEG, "SNES Cart (HiROM) + NEC DSP1 Legacy", tag, owner, clock, "dsp1leg_hi", __FILE__)
{
}
-sns_rom_seta10dsp_legacy_device::sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_seta10dsp_legacy_device::sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA10_LEG, "SNES Cart (LoROM) + Seta ST010 DSP Legacy", tag, owner, clock, "seta10leg", __FILE__)
{
}
-sns_rom_seta11dsp_legacy_device::sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sns_rom_seta11dsp_legacy_device::sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sns_rom_setadsp_device(mconfig, SNS_LOROM_SETA11_LEG, "SNES Cart (LoROM) + Seta ST011 DSP Legacy", tag, owner, clock, "seta11leg", __FILE__)
{
}
diff --git a/src/devices/bus/snes/upd.h b/src/devices/bus/snes/upd.h
index 653ee71d9e4..fa0d4dcb2ff 100644
--- a/src/devices/bus/snes/upd.h
+++ b/src/devices/bus/snes/upd.h
@@ -14,8 +14,8 @@ class sns_rom20_necdsp_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- sns_rom20_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ sns_rom20_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -31,8 +31,8 @@ public:
virtual DECLARE_READ32_MEMBER(necdsp_prg_r);
virtual DECLARE_READ16_MEMBER(necdsp_data_r);
- std::vector<UINT32> m_dsp_prg;
- std::vector<UINT16> m_dsp_data;
+ std::vector<uint32_t> m_dsp_prg;
+ std::vector<uint16_t> m_dsp_data;
};
// ======================> sns_rom21_necdsp_device
@@ -41,8 +41,8 @@ class sns_rom21_necdsp_device : public sns_rom21_device
{
public:
// construction/destruction
- sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- sns_rom21_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom21_necdsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ sns_rom21_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -58,8 +58,8 @@ public:
virtual DECLARE_READ32_MEMBER(necdsp_prg_r);
virtual DECLARE_READ16_MEMBER(necdsp_data_r);
- std::vector<UINT32> m_dsp_prg;
- std::vector<UINT16> m_dsp_data;
+ std::vector<uint32_t> m_dsp_prg;
+ std::vector<uint16_t> m_dsp_data;
};
// ======================> sns_rom_setadsp_device
@@ -68,7 +68,7 @@ class sns_rom_setadsp_device : public sns_rom_device
{
public:
// construction/destruction
- sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// device-level overrides
virtual void device_start() override;
@@ -83,8 +83,8 @@ public:
virtual DECLARE_READ32_MEMBER(setadsp_prg_r);
virtual DECLARE_READ16_MEMBER(setadsp_data_r);
- std::vector<UINT32> m_dsp_prg;
- std::vector<UINT16> m_dsp_data;
+ std::vector<uint32_t> m_dsp_prg;
+ std::vector<uint16_t> m_dsp_data;
};
// ======================> sns_rom_seta10dsp_device
@@ -93,7 +93,7 @@ class sns_rom_seta10dsp_device : public sns_rom_setadsp_device
{
public:
// construction/destruction
- sns_rom_seta10dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_seta10dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -105,7 +105,7 @@ class sns_rom_seta11dsp_device : public sns_rom_setadsp_device
{
public:
// construction/destruction
- sns_rom_seta11dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_seta11dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -127,7 +127,7 @@ class sns_rom20_necdsp1_legacy_device : public sns_rom20_necdsp_device
{
public:
// construction/destruction
- sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -138,7 +138,7 @@ class sns_rom20_necdsp1b_legacy_device : public sns_rom20_necdsp_device
{
public:
// construction/destruction
- sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -149,7 +149,7 @@ class sns_rom20_necdsp2_legacy_device : public sns_rom20_necdsp_device
{
public:
// construction/destruction
- sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -160,7 +160,7 @@ class sns_rom20_necdsp3_legacy_device : public sns_rom20_necdsp_device
{
public:
// construction/destruction
- sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -171,7 +171,7 @@ class sns_rom20_necdsp4_legacy_device : public sns_rom20_necdsp_device
{
public:
// construction/destruction
- sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -182,7 +182,7 @@ class sns_rom21_necdsp1_legacy_device : public sns_rom21_necdsp_device
{
public:
// construction/destruction
- sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -193,7 +193,7 @@ class sns_rom_seta10dsp_legacy_device : public sns_rom_setadsp_device
{
public:
// construction/destruction
- sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -204,7 +204,7 @@ class sns_rom_seta11dsp_legacy_device : public sns_rom_setadsp_device
{
public:
// construction/destruction
- sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/snes_ctrl/bcbattle.cpp b/src/devices/bus/snes_ctrl/bcbattle.cpp
index dddda96de46..53f63236e31 100644
--- a/src/devices/bus/snes_ctrl/bcbattle.cpp
+++ b/src/devices/bus/snes_ctrl/bcbattle.cpp
@@ -81,7 +81,7 @@ void snes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, in
// snes_bcbattle_device - constructor
//-------------------------------------------------
-snes_bcbattle_device::snes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_bcbattle_device::snes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SNES_BARCODE_BATTLER, "Epoch Barcode Battler (SFC)", tag, owner, clock, "snes_bcbattle", __FILE__),
device_snes_control_port_interface(mconfig, *this),
m_reader(*this, "battler"), m_pending_code(0), m_new_code(0), m_transmitting(0), m_cur_bit(0), m_cur_byte(0), battler_timer(nullptr), m_strobe(0), m_idx(0)
@@ -171,9 +171,9 @@ void snes_bcbattle_device::port_poll()
// read
//-------------------------------------------------
-UINT8 snes_bcbattle_device::read_pin4()
+uint8_t snes_bcbattle_device::read_pin4()
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (m_idx >= 80)
ret |= 0x00;
@@ -202,7 +202,7 @@ UINT8 snes_bcbattle_device::read_pin4()
// write
//-------------------------------------------------
-void snes_bcbattle_device::write_strobe(UINT8 data)
+void snes_bcbattle_device::write_strobe(uint8_t data)
{
int old = m_strobe;
m_strobe = data & 0x01;
diff --git a/src/devices/bus/snes_ctrl/bcbattle.h b/src/devices/bus/snes_ctrl/bcbattle.h
index d336c31b6a7..fffdeb1e3f3 100644
--- a/src/devices/bus/snes_ctrl/bcbattle.h
+++ b/src/devices/bus/snes_ctrl/bcbattle.h
@@ -27,7 +27,7 @@ class snes_bcbattle_device : public device_t,
{
public:
// construction/destruction
- snes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -37,8 +37,8 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual UINT8 read_pin4() override;
- virtual void write_strobe(UINT8 data) override;
+ virtual uint8_t read_pin4() override;
+ virtual void write_strobe(uint8_t data) override;
virtual void port_poll() override;
int read_current_bit();
@@ -47,7 +47,7 @@ private:
static const device_timer_id TIMER_BATTLER = 1;
required_device<barcode_reader_device> m_reader;
- UINT8 m_current_barcode[20];
+ uint8_t m_current_barcode[20];
int m_pending_code, m_new_code, m_transmitting, m_cur_bit, m_cur_byte;
emu_timer *battler_timer;
diff --git a/src/devices/bus/snes_ctrl/ctrl.cpp b/src/devices/bus/snes_ctrl/ctrl.cpp
index af8ed67db02..33d342e3d7f 100644
--- a/src/devices/bus/snes_ctrl/ctrl.cpp
+++ b/src/devices/bus/snes_ctrl/ctrl.cpp
@@ -57,7 +57,7 @@ device_snes_control_port_interface::~device_snes_control_port_interface()
// snes_control_port_device - constructor
//-------------------------------------------------
-snes_control_port_device::snes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_control_port_device::snes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SNES_CONTROL_PORT, "Nintendo SNES / SFC control port", tag, owner, clock, "snes_control_port", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr)
{
@@ -85,29 +85,29 @@ void snes_control_port_device::device_start()
}
-UINT8 snes_control_port_device::read_pin4()
+uint8_t snes_control_port_device::read_pin4()
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_device)
data |= m_device->read_pin4();
return data;
}
-UINT8 snes_control_port_device::read_pin5()
+uint8_t snes_control_port_device::read_pin5()
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_device)
data |= m_device->read_pin5();
return data;
}
-void snes_control_port_device::write_strobe(UINT8 data)
+void snes_control_port_device::write_strobe(uint8_t data)
{
if (m_device)
m_device->write_strobe(data);
}
-void snes_control_port_device::write_pin6(UINT8 data)
+void snes_control_port_device::write_pin6(uint8_t data)
{
if (m_device)
m_device->write_pin6(data);
diff --git a/src/devices/bus/snes_ctrl/ctrl.h b/src/devices/bus/snes_ctrl/ctrl.h
index 94a6a7b8ce8..5777cc4bc04 100644
--- a/src/devices/bus/snes_ctrl/ctrl.h
+++ b/src/devices/bus/snes_ctrl/ctrl.h
@@ -29,21 +29,21 @@ public:
device_snes_control_port_interface(const machine_config &mconfig, device_t &device);
virtual ~device_snes_control_port_interface();
- virtual UINT8 read_pin4() { return 0; };
- virtual UINT8 read_pin5() { return 0; };
- virtual void write_pin6(UINT8 data) { };
- virtual void write_strobe(UINT8 data) { };
+ virtual uint8_t read_pin4() { return 0; };
+ virtual uint8_t read_pin5() { return 0; };
+ virtual void write_pin6(uint8_t data) { };
+ virtual void write_strobe(uint8_t data) { };
virtual void port_poll() { };
protected:
snes_control_port_device *m_port;
};
-typedef device_delegate<bool (INT16 x, INT16 y)> snesctrl_onscreen_delegate;
-#define SNESCTRL_ONSCREEN_CB(name) bool name(INT16 x, INT16 y)
+typedef device_delegate<bool (int16_t x, int16_t y)> snesctrl_onscreen_delegate;
+#define SNESCTRL_ONSCREEN_CB(name) bool name(int16_t x, int16_t y)
-typedef device_delegate<void (INT16 x, INT16 y)> snesctrl_gunlatch_delegate;
-#define SNESCTRL_GUNLATCH_CB(name) void name(INT16 x, INT16 y)
+typedef device_delegate<void (int16_t x, int16_t y)> snesctrl_gunlatch_delegate;
+#define SNESCTRL_GUNLATCH_CB(name) void name(int16_t x, int16_t y)
// ======================> snes_control_port_device
@@ -52,16 +52,16 @@ class snes_control_port_device : public device_t,
{
public:
// construction/destruction
- snes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~snes_control_port_device();
static void set_onscreen_callback(device_t &device, snesctrl_onscreen_delegate callback) { downcast<snes_control_port_device &>(device).m_onscreen_cb = callback; }
static void set_gunlatch_callback(device_t &device, snesctrl_gunlatch_delegate callback) { downcast<snes_control_port_device &>(device).m_gunlatch_cb = callback; }
- UINT8 read_pin4();
- UINT8 read_pin5();
- void write_pin6(UINT8 data);
- void write_strobe(UINT8 data);
+ uint8_t read_pin4();
+ uint8_t read_pin5();
+ void write_pin6(uint8_t data);
+ void write_strobe(uint8_t data);
void port_poll();
snesctrl_onscreen_delegate m_onscreen_cb;
diff --git a/src/devices/bus/snes_ctrl/joypad.cpp b/src/devices/bus/snes_ctrl/joypad.cpp
index 0edea6be148..b9af5f32161 100644
--- a/src/devices/bus/snes_ctrl/joypad.cpp
+++ b/src/devices/bus/snes_ctrl/joypad.cpp
@@ -52,7 +52,7 @@ ioport_constructor snes_joypad_device::device_input_ports() const
// snes_joypad_device - constructor
//-------------------------------------------------
-snes_joypad_device::snes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_joypad_device::snes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SNES_JOYPAD, "Nintendo SNES / SFC Control Pad", tag, owner, clock, "snes_joypad", __FILE__),
device_snes_control_port_interface(mconfig, *this),
m_joypad(*this, "JOYPAD"), m_strobe(0), m_latch(0)
@@ -88,7 +88,7 @@ void snes_joypad_device::device_reset()
void snes_joypad_device::port_poll()
{
- UINT16 temp = m_joypad->read();
+ uint16_t temp = m_joypad->read();
// avoid sending signals that could crash games
// if left, no right
if (temp & 0x40)
@@ -104,9 +104,9 @@ void snes_joypad_device::port_poll()
// read
//-------------------------------------------------
-UINT8 snes_joypad_device::read_pin4()
+uint8_t snes_joypad_device::read_pin4()
{
- UINT8 ret = m_latch & 1;
+ uint8_t ret = m_latch & 1;
m_latch >>= 1;
return ret;
}
@@ -115,7 +115,7 @@ UINT8 snes_joypad_device::read_pin4()
// write
//-------------------------------------------------
-void snes_joypad_device::write_strobe(UINT8 data)
+void snes_joypad_device::write_strobe(uint8_t data)
{
int old = m_strobe;
m_strobe = data & 0x01;
diff --git a/src/devices/bus/snes_ctrl/joypad.h b/src/devices/bus/snes_ctrl/joypad.h
index 7ba3ea3e514..b1b549c2106 100644
--- a/src/devices/bus/snes_ctrl/joypad.h
+++ b/src/devices/bus/snes_ctrl/joypad.h
@@ -26,7 +26,7 @@ class snes_joypad_device : public device_t,
{
public:
// construction/destruction
- snes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,14 +37,14 @@ protected:
virtual void device_reset() override;
// device_snes_control_port_interface overrides
- virtual UINT8 read_pin4() override;
- virtual void write_strobe(UINT8 data) override;
+ virtual uint8_t read_pin4() override;
+ virtual void write_strobe(uint8_t data) override;
virtual void port_poll() override;
private:
required_ioport m_joypad;
int m_strobe;
- UINT32 m_latch;
+ uint32_t m_latch;
};
diff --git a/src/devices/bus/snes_ctrl/miracle.cpp b/src/devices/bus/snes_ctrl/miracle.cpp
index 7ec640047de..3c5b01daa2b 100644
--- a/src/devices/bus/snes_ctrl/miracle.cpp
+++ b/src/devices/bus/snes_ctrl/miracle.cpp
@@ -59,7 +59,7 @@ void snes_miracle_device::device_timer(emu_timer &timer, device_timer_id id, int
// snes_miracle_device - constructor
//-------------------------------------------------
-snes_miracle_device::snes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_miracle_device::snes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SNES_MIRACLE, "Miracle Piano SNES Cable", tag, owner, clock, "snes_miracle", __FILE__),
device_serial_interface(mconfig, *this),
device_snes_control_port_interface(mconfig, *this),
@@ -107,9 +107,9 @@ void snes_miracle_device::device_reset()
m_tx_busy = false;
}
-UINT8 snes_miracle_device::read_pin4()
+uint8_t snes_miracle_device::read_pin4()
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (m_midi_mode == MIRACLE_MIDI_RECEIVE)
{
@@ -128,12 +128,12 @@ UINT8 snes_miracle_device::read_pin4()
return ret;
}
-void snes_miracle_device::write_pin6(UINT8 data)
+void snes_miracle_device::write_pin6(uint8_t data)
{
// printf("%02x to pin6\n", data);
}
-void snes_miracle_device::write_strobe(UINT8 data)
+void snes_miracle_device::write_strobe(uint8_t data)
{
// printf("%02x to strobe\n", data);
@@ -223,7 +223,7 @@ void snes_miracle_device::write_strobe(UINT8 data)
void snes_miracle_device::rcv_complete() // Rx completed receiving byte
{
receive_register_extract();
- UINT8 rcv = get_received_char();
+ uint8_t rcv = get_received_char();
// printf("Got %02x -> [%d]\n", rcv, m_recv_write);
m_recvring[m_recv_write++] = rcv;
@@ -252,13 +252,13 @@ void snes_miracle_device::tra_complete() // Tx completed sending byte
void snes_miracle_device::tra_callback() // Tx send bit
{
- UINT8 bit = transmit_register_get_data_bit();
+ uint8_t bit = transmit_register_get_data_bit();
// send this to midi out
m_midiout->write_txd(bit);
}
-void snes_miracle_device::xmit_char(UINT8 data)
+void snes_miracle_device::xmit_char(uint8_t data)
{
// if tx is busy it'll pick this up automatically when it completes
// if not, send now!
diff --git a/src/devices/bus/snes_ctrl/miracle.h b/src/devices/bus/snes_ctrl/miracle.h
index a89b41accaf..6155511eee3 100644
--- a/src/devices/bus/snes_ctrl/miracle.h
+++ b/src/devices/bus/snes_ctrl/miracle.h
@@ -31,7 +31,7 @@ public:
static const int RECV_RING_SIZE = 64;
// construction/destruction
- snes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,7 +41,7 @@ public:
virtual void tra_complete() override; // Tx completed sending byte
virtual void tra_callback() override; // Tx send bit
- void xmit_char(UINT8 data);
+ void xmit_char(uint8_t data);
required_device<midi_port_device> m_midiin, m_midiout;
@@ -50,17 +50,17 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- UINT8 read_pin4() override;
- void write_pin6(UINT8 data) override;
- void write_strobe(UINT8 data) override;
+ uint8_t read_pin4() override;
+ void write_pin6(uint8_t data) override;
+ void write_strobe(uint8_t data) override;
static const device_timer_id TIMER_STROBE_ON = 0;
emu_timer *strobe_timer;
int m_strobe_on, m_midi_mode, m_sent_bits;
- UINT32 m_strobe_clock;
- UINT8 m_data_sent;
- UINT8 m_xmitring[XMIT_RING_SIZE], m_recvring[RECV_RING_SIZE];
+ uint32_t m_strobe_clock;
+ uint8_t m_data_sent;
+ uint8_t m_xmitring[XMIT_RING_SIZE], m_recvring[RECV_RING_SIZE];
int m_xmit_read, m_xmit_write;
int m_recv_read, m_recv_write;
bool m_tx_busy, m_read_status, m_status_bit;
diff --git a/src/devices/bus/snes_ctrl/mouse.cpp b/src/devices/bus/snes_ctrl/mouse.cpp
index fc851dc33f6..ad7e9ba3008 100644
--- a/src/devices/bus/snes_ctrl/mouse.cpp
+++ b/src/devices/bus/snes_ctrl/mouse.cpp
@@ -58,7 +58,7 @@ ioport_constructor snes_mouse_device::device_input_ports() const
// snes_mouse_device - constructor
//-------------------------------------------------
-snes_mouse_device::snes_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_mouse_device::snes_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SNES_MOUSE, "Nintendo SNES / SFC Mouse Controller", tag, owner, clock, "snes_mouse", __FILE__),
device_snes_control_port_interface(mconfig, *this),
m_buttons(*this, "BUTTONS"),
@@ -117,7 +117,7 @@ void snes_mouse_device::device_reset()
void snes_mouse_device::port_poll()
{
- INT16 var;
+ int16_t var;
int new_dir;
m_idx = 0;
m_latch = m_buttons->read();
@@ -193,9 +193,9 @@ void snes_mouse_device::port_poll()
// read
//-------------------------------------------------
-UINT8 snes_mouse_device::read_pin4()
+uint8_t snes_mouse_device::read_pin4()
{
- UINT8 res = 0;
+ uint8_t res = 0;
if (m_strobe == 1)
{
@@ -230,7 +230,7 @@ UINT8 snes_mouse_device::read_pin4()
// write
//-------------------------------------------------
-void snes_mouse_device::write_strobe(UINT8 data)
+void snes_mouse_device::write_strobe(uint8_t data)
{
int old = m_strobe;
m_strobe = data & 0x01;
diff --git a/src/devices/bus/snes_ctrl/mouse.h b/src/devices/bus/snes_ctrl/mouse.h
index 39daae165d2..94907fc6306 100644
--- a/src/devices/bus/snes_ctrl/mouse.h
+++ b/src/devices/bus/snes_ctrl/mouse.h
@@ -26,7 +26,7 @@ class snes_mouse_device : public device_t,
{
public:
// construction/destruction
- snes_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,8 +37,8 @@ protected:
virtual void device_reset() override;
// device_snes_control_port_interface overrides
- virtual UINT8 read_pin4() override;
- virtual void write_strobe(UINT8 data) override;
+ virtual uint8_t read_pin4() override;
+ virtual void write_strobe(uint8_t data) override;
virtual void port_poll() override;
private:
@@ -47,10 +47,10 @@ private:
required_ioport m_yaxis;
int m_strobe;
int m_idx;
- UINT32 m_latch;
+ uint32_t m_latch;
- INT16 m_x, m_y, m_oldx, m_oldy;
- UINT8 m_deltax, m_deltay;
+ int16_t m_x, m_y, m_oldx, m_oldy;
+ uint8_t m_deltax, m_deltay;
int m_speed;
int m_dirx, m_diry;
};
diff --git a/src/devices/bus/snes_ctrl/multitap.cpp b/src/devices/bus/snes_ctrl/multitap.cpp
index 2eba8914bcb..d88f687f547 100644
--- a/src/devices/bus/snes_ctrl/multitap.cpp
+++ b/src/devices/bus/snes_ctrl/multitap.cpp
@@ -67,7 +67,7 @@ machine_config_constructor snes_multitap_device::device_mconfig_additions() cons
// snes_multitap_device - constructor
//-------------------------------------------------
-snes_multitap_device::snes_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_multitap_device::snes_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SNES_MULTITAP, "Nintendo SNES / SFC Multitap Adapter", tag, owner, clock, "snes_multitap", __FILE__),
device_snes_control_port_interface(mconfig, *this),
m_port1(*this, "port1"),
@@ -112,9 +112,9 @@ void snes_multitap_device::port_poll()
// read
//-------------------------------------------------
-UINT8 snes_multitap_device::read_pin4()
+uint8_t snes_multitap_device::read_pin4()
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (m_cfg->read() == 0) // 4P
ret |= m_select ? m_port1->read_pin4() : m_port3->read_pin4();
@@ -124,9 +124,9 @@ UINT8 snes_multitap_device::read_pin4()
return ret;
}
-UINT8 snes_multitap_device::read_pin5()
+uint8_t snes_multitap_device::read_pin5()
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
if (m_cfg->read() == 0) // 4P
ret |= m_select ? m_port2->read_pin4() : m_port4->read_pin4();
@@ -137,7 +137,7 @@ UINT8 snes_multitap_device::read_pin5()
// write
//-------------------------------------------------
-void snes_multitap_device::write_strobe(UINT8 data)
+void snes_multitap_device::write_strobe(uint8_t data)
{
m_port1->write_strobe(data);
if (m_cfg->read() == 0) // 4P
@@ -148,7 +148,7 @@ void snes_multitap_device::write_strobe(UINT8 data)
}
}
-void snes_multitap_device::write_pin6(UINT8 data)
+void snes_multitap_device::write_pin6(uint8_t data)
{
m_select = data & 1;
}
diff --git a/src/devices/bus/snes_ctrl/multitap.h b/src/devices/bus/snes_ctrl/multitap.h
index edc6ee110dc..e9256ba7dbd 100644
--- a/src/devices/bus/snes_ctrl/multitap.h
+++ b/src/devices/bus/snes_ctrl/multitap.h
@@ -26,7 +26,7 @@ class snes_multitap_device : public device_t,
{
public:
// construction/destruction
- snes_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -38,10 +38,10 @@ protected:
virtual void device_reset() override;
// device_snes_control_port_interface overrides
- virtual UINT8 read_pin4() override;
- virtual UINT8 read_pin5() override;
- virtual void write_strobe(UINT8 data) override;
- virtual void write_pin6(UINT8 data) override;
+ virtual uint8_t read_pin4() override;
+ virtual uint8_t read_pin5() override;
+ virtual void write_strobe(uint8_t data) override;
+ virtual void write_pin6(uint8_t data) override;
virtual void port_poll() override;
private:
diff --git a/src/devices/bus/snes_ctrl/pachinko.cpp b/src/devices/bus/snes_ctrl/pachinko.cpp
index ecdc1b21fe5..10ddda50d52 100644
--- a/src/devices/bus/snes_ctrl/pachinko.cpp
+++ b/src/devices/bus/snes_ctrl/pachinko.cpp
@@ -44,7 +44,7 @@ ioport_constructor snes_pachinko_device::device_input_ports() const
// snes_pachinko_device - constructor
//-------------------------------------------------
-snes_pachinko_device::snes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_pachinko_device::snes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SNES_PACHINKO, "Sunsoft Pachinko Controller", tag, owner, clock, "snes_pachinko", __FILE__),
device_snes_control_port_interface(mconfig, *this),
m_dial(*this, "DIAL"),
@@ -81,7 +81,7 @@ void snes_pachinko_device::device_reset()
void snes_pachinko_device::port_poll()
{
- UINT8 dial = BITSWAP8(m_dial->read() ^ 0xff,7,6,5,4,3,2,1,0);
+ uint8_t dial = BITSWAP8(m_dial->read() ^ 0xff,7,6,5,4,3,2,1,0);
m_latch = m_button->read() | (dial << 25) | 0xee7000; // add ID
}
@@ -89,9 +89,9 @@ void snes_pachinko_device::port_poll()
// read
//-------------------------------------------------
-UINT8 snes_pachinko_device::read_pin4()
+uint8_t snes_pachinko_device::read_pin4()
{
- UINT8 ret = m_latch & 1;
+ uint8_t ret = m_latch & 1;
m_latch >>= 1;
return ret;
}
@@ -100,7 +100,7 @@ UINT8 snes_pachinko_device::read_pin4()
// write
//-------------------------------------------------
-void snes_pachinko_device::write_strobe(UINT8 data)
+void snes_pachinko_device::write_strobe(uint8_t data)
{
int old = m_strobe;
m_strobe = data & 0x01;
diff --git a/src/devices/bus/snes_ctrl/pachinko.h b/src/devices/bus/snes_ctrl/pachinko.h
index d340a1c8689..ba41a168e25 100644
--- a/src/devices/bus/snes_ctrl/pachinko.h
+++ b/src/devices/bus/snes_ctrl/pachinko.h
@@ -26,7 +26,7 @@ class snes_pachinko_device : public device_t,
{
public:
// construction/destruction
- snes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,15 +37,15 @@ protected:
virtual void device_reset() override;
// device_snes_control_port_interface overrides
- virtual UINT8 read_pin4() override;
- virtual void write_strobe(UINT8 data) override;
+ virtual uint8_t read_pin4() override;
+ virtual void write_strobe(uint8_t data) override;
virtual void port_poll() override;
private:
required_ioport m_dial;
required_ioport m_button;
int m_strobe;
- UINT32 m_latch;
+ uint32_t m_latch;
};
diff --git a/src/devices/bus/snes_ctrl/sscope.cpp b/src/devices/bus/snes_ctrl/sscope.cpp
index 3f26fe562c4..58243314935 100644
--- a/src/devices/bus/snes_ctrl/sscope.cpp
+++ b/src/devices/bus/snes_ctrl/sscope.cpp
@@ -53,7 +53,7 @@ ioport_constructor snes_sscope_device::device_input_ports() const
// snes_sscope_device - constructor
//-------------------------------------------------
-snes_sscope_device::snes_sscope_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_sscope_device::snes_sscope_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SNES_SUPERSCOPE, "Nintendo SNES / SFC SuperScope", tag, owner, clock, "snes_sscope", __FILE__),
device_snes_control_port_interface(mconfig, *this),
m_buttons(*this, "BUTTONS"),
@@ -103,7 +103,7 @@ void snes_sscope_device::device_reset()
void snes_sscope_device::port_poll()
{
// first read input bits
- UINT8 input = m_buttons->read();
+ uint8_t input = m_buttons->read();
m_x = m_xaxis->read();
m_y = m_yaxis->read();
m_idx = 0;
@@ -159,9 +159,9 @@ void snes_sscope_device::port_poll()
// read
//-------------------------------------------------
-UINT8 snes_sscope_device::read_pin4()
+uint8_t snes_sscope_device::read_pin4()
{
- UINT8 res = 0;
+ uint8_t res = 0;
if (m_idx >= 8) // bits 8-15 = ID = all 1s; bits >= 16 all 1s
res |= 0x01;
@@ -175,7 +175,7 @@ UINT8 snes_sscope_device::read_pin4()
// write
//-------------------------------------------------
-void snes_sscope_device::write_strobe(UINT8 data)
+void snes_sscope_device::write_strobe(uint8_t data)
{
int old = m_strobe;
m_strobe = data & 0x01;
diff --git a/src/devices/bus/snes_ctrl/sscope.h b/src/devices/bus/snes_ctrl/sscope.h
index d625bc237ea..e060b228759 100644
--- a/src/devices/bus/snes_ctrl/sscope.h
+++ b/src/devices/bus/snes_ctrl/sscope.h
@@ -26,7 +26,7 @@ class snes_sscope_device : public device_t,
{
public:
// construction/destruction
- snes_sscope_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_sscope_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,8 +37,8 @@ protected:
virtual void device_reset() override;
// device_snes_control_port_interface overrides
- virtual UINT8 read_pin4() override;
- virtual void write_strobe(UINT8 data) override;
+ virtual uint8_t read_pin4() override;
+ virtual void write_strobe(uint8_t data) override;
virtual void port_poll() override;
private:
@@ -46,9 +46,9 @@ private:
required_ioport m_xaxis;
required_ioport m_yaxis;
int m_strobe, m_idx;
- UINT32 m_latch;
+ uint32_t m_latch;
- INT16 m_x, m_y;
+ int16_t m_x, m_y;
int m_turbo_lock, m_pause_lock, m_fire_lock;
};
diff --git a/src/devices/bus/snes_ctrl/twintap.cpp b/src/devices/bus/snes_ctrl/twintap.cpp
index 29db7df0029..5377ca8fb4f 100644
--- a/src/devices/bus/snes_ctrl/twintap.cpp
+++ b/src/devices/bus/snes_ctrl/twintap.cpp
@@ -49,7 +49,7 @@ ioport_constructor snes_twintap_device::device_input_ports() const
// snes_twintap_device - constructor
//-------------------------------------------------
-snes_twintap_device::snes_twintap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+snes_twintap_device::snes_twintap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SNES_TWINTAP, "Yonezawa Twin Tap Controller", tag, owner, clock, "snes_twintap", __FILE__),
device_snes_control_port_interface(mconfig, *this),
m_inputs(*this, "INPUTS"), m_strobe(0), m_latch(0)
@@ -92,9 +92,9 @@ void snes_twintap_device::port_poll()
// read
//-------------------------------------------------
-UINT8 snes_twintap_device::read_pin4()
+uint8_t snes_twintap_device::read_pin4()
{
- UINT8 ret = m_latch & 1;
+ uint8_t ret = m_latch & 1;
m_latch >>= 1;
return ret;
}
@@ -103,7 +103,7 @@ UINT8 snes_twintap_device::read_pin4()
// write
//-------------------------------------------------
-void snes_twintap_device::write_strobe(UINT8 data)
+void snes_twintap_device::write_strobe(uint8_t data)
{
int old = m_strobe;
m_strobe = data & 0x01;
diff --git a/src/devices/bus/snes_ctrl/twintap.h b/src/devices/bus/snes_ctrl/twintap.h
index 085a9ead09c..cf8934901bc 100644
--- a/src/devices/bus/snes_ctrl/twintap.h
+++ b/src/devices/bus/snes_ctrl/twintap.h
@@ -26,7 +26,7 @@ class snes_twintap_device : public device_t,
{
public:
// construction/destruction
- snes_twintap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snes_twintap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,14 +37,14 @@ protected:
virtual void device_reset() override;
// device_snes_control_port_interface overrides
- virtual UINT8 read_pin4() override;
- virtual void write_strobe(UINT8 data) override;
+ virtual uint8_t read_pin4() override;
+ virtual void write_strobe(uint8_t data) override;
virtual void port_poll() override;
private:
required_ioport m_inputs;
int m_strobe;
- UINT32 m_latch;
+ uint32_t m_latch;
};
diff --git a/src/devices/bus/spc1000/exp.cpp b/src/devices/bus/spc1000/exp.cpp
index 83d919215a1..b90c59ecc93 100644
--- a/src/devices/bus/spc1000/exp.cpp
+++ b/src/devices/bus/spc1000/exp.cpp
@@ -35,7 +35,7 @@ device_spc1000_card_interface::~device_spc1000_card_interface()
//-------------------------------------------------
// spc1000_exp_device - constructor
//-------------------------------------------------
-spc1000_exp_device::spc1000_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+spc1000_exp_device::spc1000_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SPC1000_EXP_SLOT, "Samsung SPC-1000 expansion", tag, owner, clock, "spc1000_exp", __FILE__),
device_slot_interface(mconfig, *this), m_card(nullptr)
{
diff --git a/src/devices/bus/spc1000/exp.h b/src/devices/bus/spc1000/exp.h
index e48e9efe3c8..1e63ff4a57d 100644
--- a/src/devices/bus/spc1000/exp.h
+++ b/src/devices/bus/spc1000/exp.h
@@ -25,7 +25,7 @@ class spc1000_exp_device : public device_t,
{
public:
// construction/destruction
- spc1000_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ spc1000_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~spc1000_exp_device();
// device-level overrides
diff --git a/src/devices/bus/spc1000/fdd.cpp b/src/devices/bus/spc1000/fdd.cpp
index 5e624862e23..13a32cfb808 100644
--- a/src/devices/bus/spc1000/fdd.cpp
+++ b/src/devices/bus/spc1000/fdd.cpp
@@ -134,7 +134,7 @@ const device_type SPC1000_FDD_EXP = &device_creator<spc1000_fdd_exp_device>;
// spc1000_fdd_exp_device - constructor
//-------------------------------------------------
-spc1000_fdd_exp_device::spc1000_fdd_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+spc1000_fdd_exp_device::spc1000_fdd_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SPC1000_FDD_EXP, "SPC1000 FDD expansion", tag, owner, clock, "spc1000_fdd_exp", __FILE__),
device_spc1000_card_interface(mconfig, *this),
m_cpu(*this, "fdccpu"),
@@ -190,7 +190,7 @@ READ8_MEMBER(spc1000_fdd_exp_device::read)
return 0xff;
else
{
- UINT8 data = 0;
+ uint8_t data = 0;
switch (offset)
{
case 1:
diff --git a/src/devices/bus/spc1000/fdd.h b/src/devices/bus/spc1000/fdd.h
index 51c53d74f1f..b52d6091cba 100644
--- a/src/devices/bus/spc1000/fdd.h
+++ b/src/devices/bus/spc1000/fdd.h
@@ -19,7 +19,7 @@ class spc1000_fdd_exp_device : public device_t,
{
public:
// construction/destruction
- spc1000_fdd_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ spc1000_fdd_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -50,9 +50,9 @@ private:
emu_timer *m_timer_tc;
- UINT8 m_i8255_0_pc;
- UINT8 m_i8255_1_pc;
- UINT8 m_i8255_portb;
+ uint8_t m_i8255_0_pc;
+ uint8_t m_i8255_1_pc;
+ uint8_t m_i8255_portb;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
static const device_timer_id TIMER_TC = 0;
diff --git a/src/devices/bus/spc1000/vdp.cpp b/src/devices/bus/spc1000/vdp.cpp
index 7824e9fccb4..0f055ef6382 100644
--- a/src/devices/bus/spc1000/vdp.cpp
+++ b/src/devices/bus/spc1000/vdp.cpp
@@ -52,7 +52,7 @@ const device_type SPC1000_VDP_EXP = &device_creator<spc1000_vdp_exp_device>;
// spc1000_vdp_exp_device - constructor
//-------------------------------------------------
-spc1000_vdp_exp_device::spc1000_vdp_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+spc1000_vdp_exp_device::spc1000_vdp_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SPC1000_VDP_EXP, "SPC1000 VDP expansion", tag, owner, clock, "spc1000_vdp_exp", __FILE__),
device_spc1000_card_interface(mconfig, *this),
m_vdp(*this, "tms")
diff --git a/src/devices/bus/spc1000/vdp.h b/src/devices/bus/spc1000/vdp.h
index 20a0e23acd7..0c22dcbcfc0 100644
--- a/src/devices/bus/spc1000/vdp.h
+++ b/src/devices/bus/spc1000/vdp.h
@@ -18,7 +18,7 @@ class spc1000_vdp_exp_device : public device_t,
{
public:
// construction/destruction
- spc1000_vdp_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ spc1000_vdp_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/sunkbd/hlekbd.cpp b/src/devices/bus/sunkbd/hlekbd.cpp
index 8696a97d704..e2a38d0f358 100644
--- a/src/devices/bus/sunkbd/hlekbd.cpp
+++ b/src/devices/bus/sunkbd/hlekbd.cpp
@@ -755,7 +755,7 @@ hle_device_base::hle_device_base(
char const *name,
char const *tag,
device_t *owner,
- UINT32 clock,
+ uint32_t clock,
char const *shortname,
char const *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
@@ -880,7 +880,7 @@ void hle_device_base::device_timer(emu_timer &timer, device_timer_id id, int par
switch (id)
{
case CLICK_TIMER_ID:
- m_beeper_state &= ~UINT8(BEEPER_CLICK);
+ m_beeper_state &= ~uint8_t(BEEPER_CLICK);
m_beeper->set_state(m_beeper_state ? 1 : 0);
break;
@@ -922,7 +922,7 @@ void hle_device_base::tra_complete()
handle a key being pressed
--------------------------------------------------*/
-void hle_device_base::key_make(UINT8 row, UINT8 column)
+void hle_device_base::key_make(uint8_t row, uint8_t column)
{
// we should have stopped processing if we filled the FIFO
assert(!fifo_full());
@@ -931,7 +931,7 @@ void hle_device_base::key_make(UINT8 row, UINT8 column)
transmit_byte((row << 4) | column);
if (m_keyclick)
{
- m_beeper_state |= UINT8(BEEPER_CLICK);
+ m_beeper_state |= uint8_t(BEEPER_CLICK);
m_beeper->set_state(m_beeper_state ? 1 : 0);
m_click_timer->reset(attotime::from_msec(5));
}
@@ -947,7 +947,7 @@ void hle_device_base::key_make(UINT8 row, UINT8 column)
handle a key being released
--------------------------------------------------*/
-void hle_device_base::key_break(UINT8 row, UINT8 column)
+void hle_device_base::key_break(uint8_t row, uint8_t column)
{
// we should have stopped processing if we filled the FIFO
assert(!fifo_full());
@@ -968,7 +968,7 @@ void hle_device_base::key_break(UINT8 row, UINT8 column)
send a byte or queue it to send later
--------------------------------------------------*/
-void hle_device_base::transmit_byte(UINT8 byte)
+void hle_device_base::transmit_byte(uint8_t byte)
{
device_buffered_serial_interface::transmit_byte(byte);
if (fifo_full())
@@ -981,7 +981,7 @@ void hle_device_base::transmit_byte(UINT8 byte)
handle received byte frame
--------------------------------------------------*/
-void hle_device_base::received_byte(UINT8 byte)
+void hle_device_base::received_byte(uint8_t byte)
{
switch (m_rx_state)
{
@@ -1004,13 +1004,13 @@ void hle_device_base::received_byte(UINT8 byte)
break;
case COMMAND_BELL_ON:
- m_beeper_state |= UINT8(BEEPER_BELL);
+ m_beeper_state |= uint8_t(BEEPER_BELL);
m_beeper->set_state(m_beeper_state ? 1 : 0);
m_rx_state = RX_IDLE;
break;
case COMMAND_BELL_OFF:
- m_beeper_state &= ~UINT8(BEEPER_BELL);
+ m_beeper_state &= ~uint8_t(BEEPER_BELL);
m_beeper->set_state(m_beeper_state ? 1 : 0);
m_rx_state = RX_IDLE;
break;
@@ -1023,7 +1023,7 @@ void hle_device_base::received_byte(UINT8 byte)
case COMMAND_CLICK_OFF:
m_keyclick = 0U;
m_click_timer->reset();
- m_beeper_state &= ~UINT8(BEEPER_CLICK);
+ m_beeper_state &= ~uint8_t(BEEPER_CLICK);
m_beeper->set_state(m_beeper_state ? 1 : 0);
m_rx_state = RX_IDLE;
break;
@@ -1034,7 +1034,7 @@ void hle_device_base::received_byte(UINT8 byte)
case COMMAND_LAYOUT:
transmit_byte(0xfeU);
- transmit_byte(UINT8(m_dips->read() & 0x3fU));
+ transmit_byte(uint8_t(m_dips->read() & 0x3fU));
m_rx_state = RX_IDLE;
break;
@@ -1057,7 +1057,7 @@ void hle_device_base::received_byte(UINT8 byte)
response
--------------------------------------------------*/
-UINT8 hle_type4_device_base::ident_byte()
+uint8_t hle_type4_device_base::ident_byte()
{
return (m_dips->read() & 0x80U) ? 0x03U : 0x04U;
}
@@ -1077,7 +1077,7 @@ hle_type3_device::hle_type3_device(
machine_config const &mconfig,
char const *tag,
device_t *owner,
- UINT32 clock)
+ uint32_t clock)
: hle_device_base(
mconfig,
SUN_TYPE3_HLE_KEYBOARD,
@@ -1108,7 +1108,7 @@ ioport_constructor hle_type3_device::device_input_ports() const
response
--------------------------------------------------*/
-UINT8 hle_type3_device::ident_byte()
+uint8_t hle_type3_device::ident_byte()
{
return 0x03U;
}
@@ -1128,7 +1128,7 @@ hle_type4_device::hle_type4_device(
machine_config const &mconfig,
char const *tag,
device_t *owner,
- UINT32 clock)
+ uint32_t clock)
: hle_type4_device_base(
mconfig,
SUN_TYPE4_HLE_KEYBOARD,
@@ -1167,7 +1167,7 @@ hle_type5_device::hle_type5_device(
machine_config const &mconfig,
char const *tag,
device_t *owner,
- UINT32 clock)
+ uint32_t clock)
: hle_type4_device_base(
mconfig,
SUN_TYPE5_HLE_KEYBOARD,
@@ -1206,7 +1206,7 @@ hle_type5_gb_device::hle_type5_gb_device(
machine_config const &mconfig,
char const *tag,
device_t *owner,
- UINT32 clock)
+ uint32_t clock)
: hle_type4_device_base(
mconfig,
SUN_TYPE5_HLE_KEYBOARD,
@@ -1245,7 +1245,7 @@ hle_type5_se_device::hle_type5_se_device(
machine_config const &mconfig,
char const *tag,
device_t *owner,
- UINT32 clock)
+ uint32_t clock)
: hle_type4_device_base(
mconfig,
SUN_TYPE5_HLE_KEYBOARD,
@@ -1284,7 +1284,7 @@ hle_type5_jp_device::hle_type5_jp_device(
machine_config const &mconfig,
char const *tag,
device_t *owner,
- UINT32 clock)
+ uint32_t clock)
: hle_type4_device_base(
mconfig,
SUN_TYPE5_HLE_KEYBOARD,
diff --git a/src/devices/bus/sunkbd/hlekbd.h b/src/devices/bus/sunkbd/hlekbd.h
index c34e438a53a..059c18caf06 100644
--- a/src/devices/bus/sunkbd/hlekbd.h
+++ b/src/devices/bus/sunkbd/hlekbd.h
@@ -37,7 +37,7 @@ protected:
device_type type, char const *name,
char const *tag,
device_t *owner,
- UINT32 clock,
+ uint32_t clock,
char const *shortname,
char const *source);
virtual ~hle_device_base() override;
@@ -52,11 +52,11 @@ protected:
virtual void tra_complete() override;
// device_matrix_keyboard_interface overrides
- virtual void key_make(UINT8 row, UINT8 column) override;
- virtual void key_break(UINT8 row, UINT8 column) override;
+ virtual void key_make(uint8_t row, uint8_t column) override;
+ virtual void key_break(uint8_t row, uint8_t column) override;
// customised transmit_byte method
- void transmit_byte(UINT8 byte);
+ void transmit_byte(uint8_t byte);
required_ioport m_dips;
@@ -76,17 +76,17 @@ private:
LED_KANA
};
- enum : UINT8 {
+ enum : uint8_t {
BEEPER_BELL = 0x01U,
BEEPER_CLICK = 0x02U
};
- enum : UINT8 {
+ enum : uint8_t {
RX_IDLE,
RX_LED
};
- enum : UINT8 {
+ enum : uint8_t {
COMMAND_RESET = 0x01U,
COMMAND_BELL_ON = 0x02U,
COMMAND_BELL_OFF = 0x03U,
@@ -97,18 +97,18 @@ private:
};
// device_buffered_serial_interface overrides
- virtual void received_byte(UINT8 byte) override;
+ virtual void received_byte(uint8_t byte) override;
- virtual UINT8 ident_byte() = 0;
+ virtual uint8_t ident_byte() = 0;
emu_timer *m_click_timer;
required_device<beep_device> m_beeper;
- UINT8 m_make_count;
- UINT8 m_rx_state;
+ uint8_t m_make_count;
+ uint8_t m_rx_state;
- UINT8 m_keyclick;
- UINT8 m_beeper_state;
+ uint8_t m_keyclick;
+ uint8_t m_beeper_state;
};
@@ -118,7 +118,7 @@ protected:
using hle_device_base::hle_device_base;
private:
- virtual UINT8 ident_byte() override;
+ virtual uint8_t ident_byte() override;
};
@@ -129,12 +129,12 @@ public:
machine_config const &mconfig,
char const *tag,
device_t *owner,
- UINT32 clock);
+ uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
private:
- virtual UINT8 ident_byte() override;
+ virtual uint8_t ident_byte() override;
};
@@ -145,7 +145,7 @@ public:
machine_config const &mconfig,
char const *tag,
device_t *owner,
- UINT32 clock);
+ uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
};
@@ -158,7 +158,7 @@ public:
machine_config const &mconfig,
char const *tag,
device_t *owner,
- UINT32 clock);
+ uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
};
@@ -171,7 +171,7 @@ public:
machine_config const &mconfig,
char const *tag,
device_t *owner,
- UINT32 clock);
+ uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
};
@@ -184,7 +184,7 @@ public:
machine_config const &mconfig,
char const *tag,
device_t *owner,
- UINT32 clock);
+ uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
};
@@ -197,7 +197,7 @@ public:
machine_config const &mconfig,
char const *tag,
device_t *owner,
- UINT32 clock);
+ uint32_t clock);
virtual ioport_constructor device_input_ports() const override;
};
diff --git a/src/devices/bus/sunkbd/sunkbd.cpp b/src/devices/bus/sunkbd/sunkbd.cpp
index 23037d82904..ed0225c2785 100644
--- a/src/devices/bus/sunkbd/sunkbd.cpp
+++ b/src/devices/bus/sunkbd/sunkbd.cpp
@@ -19,7 +19,7 @@ sun_keyboard_port_device::sun_keyboard_port_device(
machine_config const &mconfig,
char const *tag,
device_t *owner,
- UINT32 clock)
+ uint32_t clock)
: sun_keyboard_port_device(mconfig, SUNKBD_PORT, "Sun Keyboard Port", tag, owner, clock, "sunkbd", __FILE__)
{
}
@@ -31,7 +31,7 @@ sun_keyboard_port_device::sun_keyboard_port_device(
char const *name,
char const *tag,
device_t *owner,
- UINT32 clock,
+ uint32_t clock,
char const *shortname,
char const *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
diff --git a/src/devices/bus/sunkbd/sunkbd.h b/src/devices/bus/sunkbd/sunkbd.h
index 006d914dff0..9d840854029 100644
--- a/src/devices/bus/sunkbd/sunkbd.h
+++ b/src/devices/bus/sunkbd/sunkbd.h
@@ -24,8 +24,8 @@ class sun_keyboard_port_device : public device_t, public device_slot_interface
friend class device_sun_keyboard_port_interface;
public:
- sun_keyboard_port_device(machine_config const &mconfig, char const *tag, device_t *owner, UINT32 clock);
- sun_keyboard_port_device(machine_config const &mconfig, device_type type, char const *name, char const *tag, device_t *owner, UINT32 clock, char const *shortname, char const *source);
+ sun_keyboard_port_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
+ sun_keyboard_port_device(machine_config const &mconfig, device_type type, char const *name, char const *tag, device_t *owner, uint32_t clock, char const *shortname, char const *source);
virtual ~sun_keyboard_port_device();
// static configuration helpers
diff --git a/src/devices/bus/svi3x8/expander/expander.cpp b/src/devices/bus/svi3x8/expander/expander.cpp
index 4ce0145f667..176b697a634 100644
--- a/src/devices/bus/svi3x8/expander/expander.cpp
+++ b/src/devices/bus/svi3x8/expander/expander.cpp
@@ -26,7 +26,7 @@ const device_type SVI_EXPANDER = &device_creator<svi_expander_device>;
// svi_expander_device - constructor
//-------------------------------------------------
-svi_expander_device::svi_expander_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+svi_expander_device::svi_expander_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SVI_EXPANDER, "SVI 318/328 Expander Bus", tag, owner, clock, "svi_expander", __FILE__),
device_slot_interface(mconfig, *this),
m_module(nullptr),
diff --git a/src/devices/bus/svi3x8/expander/expander.h b/src/devices/bus/svi3x8/expander/expander.h
index 98c2b8af348..9dc4a76422b 100644
--- a/src/devices/bus/svi3x8/expander/expander.h
+++ b/src/devices/bus/svi3x8/expander/expander.h
@@ -83,7 +83,7 @@ class svi_expander_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- svi_expander_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ svi_expander_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~svi_expander_device();
// callbacks
diff --git a/src/devices/bus/svi3x8/expander/sv601.cpp b/src/devices/bus/svi3x8/expander/sv601.cpp
index 6f29b12b6e2..60b116e0a72 100644
--- a/src/devices/bus/svi3x8/expander/sv601.cpp
+++ b/src/devices/bus/svi3x8/expander/sv601.cpp
@@ -48,7 +48,7 @@ machine_config_constructor sv601_device::device_mconfig_additions() const
// sv601_device - constructor
//-------------------------------------------------
-sv601_device::sv601_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sv601_device::sv601_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SV601, "SV-601 Super Expander", tag, owner, clock, "sv601", __FILE__),
device_svi_expander_interface(mconfig, *this),
m_slotbus(*this, "slotbus")
diff --git a/src/devices/bus/svi3x8/expander/sv601.h b/src/devices/bus/svi3x8/expander/sv601.h
index 1e0eb86c507..3db3719b884 100644
--- a/src/devices/bus/svi3x8/expander/sv601.h
+++ b/src/devices/bus/svi3x8/expander/sv601.h
@@ -26,7 +26,7 @@ class sv601_device : public device_t, public device_svi_expander_interface
{
public:
// construction/destruction
- sv601_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sv601_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// from slots
WRITE_LINE_MEMBER( int_w );
diff --git a/src/devices/bus/svi3x8/expander/sv602.cpp b/src/devices/bus/svi3x8/expander/sv602.cpp
index aef20a8e464..1a05777cb8e 100644
--- a/src/devices/bus/svi3x8/expander/sv602.cpp
+++ b/src/devices/bus/svi3x8/expander/sv602.cpp
@@ -42,7 +42,7 @@ machine_config_constructor sv602_device::device_mconfig_additions() const
// sv602_device - constructor
//-------------------------------------------------
-sv602_device::sv602_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sv602_device::sv602_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SV602, "SV-602 Single Slot Expander", tag, owner, clock, "sv602", __FILE__),
device_svi_expander_interface(mconfig, *this),
m_slotbus(*this, "slotbus")
diff --git a/src/devices/bus/svi3x8/expander/sv602.h b/src/devices/bus/svi3x8/expander/sv602.h
index 2026302d293..0abaccd6d4d 100644
--- a/src/devices/bus/svi3x8/expander/sv602.h
+++ b/src/devices/bus/svi3x8/expander/sv602.h
@@ -26,7 +26,7 @@ class sv602_device : public device_t, public device_svi_expander_interface
{
public:
// construction/destruction
- sv602_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sv602_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// from slots
WRITE_LINE_MEMBER( int_w );
diff --git a/src/devices/bus/svi3x8/expander/sv603.cpp b/src/devices/bus/svi3x8/expander/sv603.cpp
index f6baca7d2ac..1adc323377e 100644
--- a/src/devices/bus/svi3x8/expander/sv603.cpp
+++ b/src/devices/bus/svi3x8/expander/sv603.cpp
@@ -59,7 +59,7 @@ machine_config_constructor sv603_device::device_mconfig_additions() const
DEVICE_IMAGE_LOAD_MEMBER( sv603_device, cartridge )
{
- UINT32 size = m_cart_rom->common_get_size("rom");
+ uint32_t size = m_cart_rom->common_get_size("rom");
m_cart_rom->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
m_cart_rom->common_load_rom(m_cart_rom->get_rom_base(), size, "rom");
@@ -76,7 +76,7 @@ DEVICE_IMAGE_LOAD_MEMBER( sv603_device, cartridge )
// sv603_device - constructor
//-------------------------------------------------
-sv603_device::sv603_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sv603_device::sv603_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SV603, "SV-603 Coleco Game Adapter", tag, owner, clock, "sv603", __FILE__),
device_svi_expander_interface(mconfig, *this),
m_bios(*this, "bios"),
diff --git a/src/devices/bus/svi3x8/expander/sv603.h b/src/devices/bus/svi3x8/expander/sv603.h
index eb58a51b003..aec93de11a0 100644
--- a/src/devices/bus/svi3x8/expander/sv603.h
+++ b/src/devices/bus/svi3x8/expander/sv603.h
@@ -28,7 +28,7 @@ class sv603_device : public device_t, public device_svi_expander_interface
{
public:
// construction/destruction
- sv603_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sv603_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// from host
virtual DECLARE_READ8_MEMBER( mreq_r ) override;
diff --git a/src/devices/bus/svi3x8/slot/slot.cpp b/src/devices/bus/svi3x8/slot/slot.cpp
index d713f2d3322..87564889d82 100644
--- a/src/devices/bus/svi3x8/slot/slot.cpp
+++ b/src/devices/bus/svi3x8/slot/slot.cpp
@@ -19,7 +19,7 @@ const device_type SVI_SLOT_BUS = &device_creator<svi_slot_bus_device>;
// svi_slot_bus_device - constructor
//-------------------------------------------------
-svi_slot_bus_device::svi_slot_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+svi_slot_bus_device::svi_slot_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SVI_SLOT_BUS, "SVI Slot Bus", tag, owner, clock, "svislotbus", __FILE__),
m_int_handler(*this),
m_romdis_handler(*this),
@@ -73,7 +73,7 @@ void svi_slot_bus_device::add_card(device_svi_slot_interface *card)
READ8_MEMBER( svi_slot_bus_device::mreq_r )
{
device_svi_slot_interface *entry = m_dev.first();
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
while (entry)
{
@@ -106,7 +106,7 @@ WRITE8_MEMBER( svi_slot_bus_device::mreq_w )
READ8_MEMBER( svi_slot_bus_device::iorq_r )
{
device_svi_slot_interface *entry = m_dev.first();
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
while (entry)
{
@@ -203,7 +203,7 @@ const device_type SVI_SLOT = &device_creator<svi_slot_device>;
// svi_slot_device - constructor
//-------------------------------------------------
-svi_slot_device::svi_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+svi_slot_device::svi_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SVI_SLOT, "SVI Slot", tag, owner, clock, "svislot", __FILE__),
device_slot_interface(mconfig, *this),
m_bus_tag(nullptr)
diff --git a/src/devices/bus/svi3x8/slot/slot.h b/src/devices/bus/svi3x8/slot/slot.h
index f7f2be940ef..ba636d0e9cc 100644
--- a/src/devices/bus/svi3x8/slot/slot.h
+++ b/src/devices/bus/svi3x8/slot/slot.h
@@ -76,7 +76,7 @@ class svi_slot_bus_device : public device_t
{
public:
// construction/destruction
- svi_slot_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ svi_slot_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~svi_slot_bus_device();
// callbacks
@@ -128,7 +128,7 @@ class svi_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- svi_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ svi_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// inline configuration
static void set_bus(device_t &device, device_t *owner, const char *bus_tag);
diff --git a/src/devices/bus/svi3x8/slot/sv801.cpp b/src/devices/bus/svi3x8/slot/sv801.cpp
index bccfd1539eb..892d8047ad5 100644
--- a/src/devices/bus/svi3x8/slot/sv801.cpp
+++ b/src/devices/bus/svi3x8/slot/sv801.cpp
@@ -55,7 +55,7 @@ machine_config_constructor sv801_device::device_mconfig_additions() const
// sv801_device - constructor
//-------------------------------------------------
-sv801_device::sv801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sv801_device::sv801_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SV801, "SV-801 Disk Controller", tag, owner, clock, "sv801", __FILE__),
device_svi_slot_interface(mconfig, *this),
m_fdc(*this, "fdc"),
diff --git a/src/devices/bus/svi3x8/slot/sv801.h b/src/devices/bus/svi3x8/slot/sv801.h
index 2f670f05ad1..e3354faeff6 100644
--- a/src/devices/bus/svi3x8/slot/sv801.h
+++ b/src/devices/bus/svi3x8/slot/sv801.h
@@ -27,7 +27,7 @@ class sv801_device : public device_t, public device_svi_slot_interface
{
public:
// construction/destruction
- sv801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sv801_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_FLOPPY_FORMATS(floppy_formats);
diff --git a/src/devices/bus/svi3x8/slot/sv802.cpp b/src/devices/bus/svi3x8/slot/sv802.cpp
index adeed63588b..710d17e4971 100644
--- a/src/devices/bus/svi3x8/slot/sv802.cpp
+++ b/src/devices/bus/svi3x8/slot/sv802.cpp
@@ -41,7 +41,7 @@ machine_config_constructor sv802_device::device_mconfig_additions() const
// sv802_device - constructor
//-------------------------------------------------
-sv802_device::sv802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sv802_device::sv802_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SV805, "SV-802 Centronics Printer Interface", tag, owner, clock, "sv802", __FILE__),
device_svi_slot_interface(mconfig, *this),
m_centronics(*this, "centronics"),
diff --git a/src/devices/bus/svi3x8/slot/sv802.h b/src/devices/bus/svi3x8/slot/sv802.h
index 0b363c035ed..3950ce05274 100644
--- a/src/devices/bus/svi3x8/slot/sv802.h
+++ b/src/devices/bus/svi3x8/slot/sv802.h
@@ -27,7 +27,7 @@ class sv802_device : public device_t, public device_svi_slot_interface
{
public:
// construction/destruction
- sv802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sv802_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_READ8_MEMBER( iorq_r ) override;
virtual DECLARE_WRITE8_MEMBER( iorq_w ) override;
diff --git a/src/devices/bus/svi3x8/slot/sv803.cpp b/src/devices/bus/svi3x8/slot/sv803.cpp
index 8db3cf1f601..a8665b04ab8 100644
--- a/src/devices/bus/svi3x8/slot/sv803.cpp
+++ b/src/devices/bus/svi3x8/slot/sv803.cpp
@@ -24,11 +24,11 @@ const device_type SV803 = &device_creator<sv803_device>;
// sv803_device - constructor
//-------------------------------------------------
-sv803_device::sv803_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sv803_device::sv803_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SV803, "SV-803 16k RAM Cartridge", tag, owner, clock, "sv803", __FILE__),
device_svi_slot_interface(mconfig, *this)
{
- m_ram = std::make_unique<UINT8[]>(0x4000);
+ m_ram = std::make_unique<uint8_t[]>(0x4000);
memset(m_ram.get(), 0xff, 0x4000);
}
diff --git a/src/devices/bus/svi3x8/slot/sv803.h b/src/devices/bus/svi3x8/slot/sv803.h
index 9dea0ea9180..b930e647cdc 100644
--- a/src/devices/bus/svi3x8/slot/sv803.h
+++ b/src/devices/bus/svi3x8/slot/sv803.h
@@ -25,7 +25,7 @@ class sv803_device : public device_t, public device_svi_slot_interface
{
public:
// construction/destruction
- sv803_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sv803_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_READ8_MEMBER( mreq_r ) override;
virtual DECLARE_WRITE8_MEMBER( mreq_w ) override;
@@ -35,7 +35,7 @@ protected:
virtual void device_reset() override;
private:
- std::unique_ptr<UINT8[]> m_ram;
+ std::unique_ptr<uint8_t[]> m_ram;
};
// device type definition
diff --git a/src/devices/bus/svi3x8/slot/sv805.cpp b/src/devices/bus/svi3x8/slot/sv805.cpp
index 71ba5b69820..2eb1e217671 100644
--- a/src/devices/bus/svi3x8/slot/sv805.cpp
+++ b/src/devices/bus/svi3x8/slot/sv805.cpp
@@ -48,7 +48,7 @@ machine_config_constructor sv805_device::device_mconfig_additions() const
// sv805_device - constructor
//-------------------------------------------------
-sv805_device::sv805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sv805_device::sv805_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SV805, "SV-805 RS-232 Interface", tag, owner, clock, "sv805", __FILE__),
device_svi_slot_interface(mconfig, *this),
m_uart(*this, "uart"),
diff --git a/src/devices/bus/svi3x8/slot/sv805.h b/src/devices/bus/svi3x8/slot/sv805.h
index 6d64ef54256..fda554f901c 100644
--- a/src/devices/bus/svi3x8/slot/sv805.h
+++ b/src/devices/bus/svi3x8/slot/sv805.h
@@ -27,7 +27,7 @@ class sv805_device : public device_t, public device_svi_slot_interface
{
public:
// construction/destruction
- sv805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sv805_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_READ8_MEMBER( iorq_r ) override;
virtual DECLARE_WRITE8_MEMBER( iorq_w ) override;
diff --git a/src/devices/bus/svi3x8/slot/sv806.cpp b/src/devices/bus/svi3x8/slot/sv806.cpp
index 87f35b268f7..13b0ebd105d 100644
--- a/src/devices/bus/svi3x8/slot/sv806.cpp
+++ b/src/devices/bus/svi3x8/slot/sv806.cpp
@@ -64,7 +64,7 @@ machine_config_constructor sv806_device::device_mconfig_additions() const
// sv806_device - constructor
//-------------------------------------------------
-sv806_device::sv806_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sv806_device::sv806_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SV806, "SV-806 80 Column Cartridge", tag, owner, clock, "sv806", __FILE__),
device_svi_slot_interface(mconfig, *this),
m_crtc(*this, "crtc"),
@@ -72,7 +72,7 @@ sv806_device::sv806_device(const machine_config &mconfig, const char *tag, devic
m_gfx(*this, "gfx"),
m_ram_enabled(0)
{
- m_ram = std::make_unique<UINT8[]>(0x800);
+ m_ram = std::make_unique<uint8_t[]>(0x800);
memset(m_ram.get(), 0xff, 0x800);
}
@@ -98,7 +98,7 @@ MC6845_UPDATE_ROW( sv806_device::crtc_update_row )
for (int i = 0; i < x_count; i++)
{
- UINT8 data = m_gfx->u8((m_ram[(ma + i) & 0x7ff] << 4) | ra);
+ uint8_t data = m_gfx->u8((m_ram[(ma + i) & 0x7ff] << 4) | ra);
if (i == cursor_x)
data = 0xff;
diff --git a/src/devices/bus/svi3x8/slot/sv806.h b/src/devices/bus/svi3x8/slot/sv806.h
index 2a3071ed8ec..336a2ea99d7 100644
--- a/src/devices/bus/svi3x8/slot/sv806.h
+++ b/src/devices/bus/svi3x8/slot/sv806.h
@@ -26,7 +26,7 @@ class sv806_device : public device_t, public device_svi_slot_interface
{
public:
// construction/destruction
- sv806_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sv806_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual DECLARE_READ8_MEMBER( mreq_r ) override;
virtual DECLARE_WRITE8_MEMBER( mreq_w ) override;
@@ -45,7 +45,7 @@ private:
required_device<palette_device> m_palette;
required_memory_region m_gfx;
- std::unique_ptr<UINT8[]> m_ram;
+ std::unique_ptr<uint8_t[]> m_ram;
int m_ram_enabled;
};
diff --git a/src/devices/bus/svi3x8/slot/sv807.cpp b/src/devices/bus/svi3x8/slot/sv807.cpp
index 4f55f6c8e30..17cd09f603f 100644
--- a/src/devices/bus/svi3x8/slot/sv807.cpp
+++ b/src/devices/bus/svi3x8/slot/sv807.cpp
@@ -75,14 +75,14 @@ ioport_constructor sv807_device::device_input_ports() const
// sv807_device - constructor
//-------------------------------------------------
-sv807_device::sv807_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+sv807_device::sv807_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SV803, "SV-807 64k RAM Cartridge", tag, owner, clock, "sv807", __FILE__),
device_svi_slot_interface(mconfig, *this),
m_switch(*this, "S"),
m_bk21(1), m_bk22(1), m_bk31(1), m_bk32(1)
{
- m_ram_bank1 = std::make_unique<UINT8[]>(0x8000);
- m_ram_bank2 = std::make_unique<UINT8[]>(0x8000);
+ m_ram_bank1 = std::make_unique<uint8_t[]>(0x8000);
+ m_ram_bank2 = std::make_unique<uint8_t[]>(0x8000);
memset(m_ram_bank1.get(), 0xff, 0x8000);
memset(m_ram_bank2.get(), 0xff, 0x8000);
}
diff --git a/src/devices/bus/svi3x8/slot/sv807.h b/src/devices/bus/svi3x8/slot/sv807.h
index deebb9bf79e..1e2139372d5 100644
--- a/src/devices/bus/svi3x8/slot/sv807.h
+++ b/src/devices/bus/svi3x8/slot/sv807.h
@@ -25,7 +25,7 @@ class sv807_device : public device_t, public device_svi_slot_interface
{
public:
// construction/destruction
- sv807_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sv807_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -45,8 +45,8 @@ protected:
private:
required_ioport m_switch;
- std::unique_ptr<UINT8[]> m_ram_bank1;
- std::unique_ptr<UINT8[]> m_ram_bank2;
+ std::unique_ptr<uint8_t[]> m_ram_bank1;
+ std::unique_ptr<uint8_t[]> m_ram_bank2;
int m_bk21;
int m_bk22;
diff --git a/src/devices/bus/ti99_peb/bwg.cpp b/src/devices/bus/ti99_peb/bwg.cpp
index d54c6ae7060..d2a04e0c6d0 100644
--- a/src/devices/bus/ti99_peb/bwg.cpp
+++ b/src/devices/bus/ti99_peb/bwg.cpp
@@ -84,7 +84,7 @@
Modern implementation
*/
-snug_bwg_device::snug_bwg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+snug_bwg_device::snug_bwg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti_expansion_card_device(mconfig, TI99_BWG, "SNUG BwG Floppy Controller", tag, owner, clock, "ti99_bwg", __FILE__),
m_DRQ(), m_IRQ(), m_dip1(0), m_dip2(0), m_dip34(0), m_ram_page(0),
m_rom_page(0), m_WAITena(false), m_inDsrArea(false), m_WDsel(false),
@@ -187,7 +187,7 @@ SETADDRESS_DBIN_MEMBER( snug_bwg_device::setaddress_dbin )
Access for debugger. This is a stripped-down version of the
main methods below. We only allow ROM and RAM access.
*/
-void snug_bwg_device::debug_read(offs_t offset, UINT8* value)
+void snug_bwg_device::debug_read(offs_t offset, uint8_t* value)
{
if (((offset & m_select_mask)==m_select_value) && m_selected)
{
@@ -201,7 +201,7 @@ void snug_bwg_device::debug_read(offs_t offset, UINT8* value)
}
}
-void snug_bwg_device::debug_write(offs_t offset, UINT8 data)
+void snug_bwg_device::debug_write(offs_t offset, uint8_t data)
{
if (((offset & m_select_mask)==m_select_value) && m_selected)
{
@@ -343,7 +343,7 @@ WRITE8_MEMBER(snug_bwg_device::write)
*/
READ8Z_MEMBER(snug_bwg_device::crureadz)
{
- UINT8 reply;
+ uint8_t reply;
if ((offset & 0xff00)==m_cru_base)
{
diff --git a/src/devices/bus/ti99_peb/bwg.h b/src/devices/bus/ti99_peb/bwg.h
index e61b4769dea..47955637ea7 100644
--- a/src/devices/bus/ti99_peb/bwg.h
+++ b/src/devices/bus/ti99_peb/bwg.h
@@ -24,7 +24,7 @@ extern const device_type TI99_BWG;
class snug_bwg_device : public ti_expansion_card_device
{
public:
- snug_bwg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snug_bwg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override;
@@ -50,8 +50,8 @@ private:
void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
// Debugger accessors
- void debug_read(offs_t offset, UINT8* value);
- void debug_write(offs_t offset, UINT8 data);
+ void debug_read(offs_t offset, uint8_t* value);
+ void debug_write(offs_t offset, uint8_t data);
// Wait state logic
void operate_ready_line();
@@ -98,7 +98,7 @@ private:
int m_MOTOR_ON;
// Needed for triggering the motor monoflop
- UINT8 m_lastval;
+ uint8_t m_lastval;
// Recent address
int m_address;
@@ -117,7 +117,7 @@ private:
emu_timer* m_motor_on_timer;
// DSR ROM
- UINT8* m_dsrrom;
+ uint8_t* m_dsrrom;
// Buffer RAM
required_device<ram_device> m_buffer_ram;
diff --git a/src/devices/bus/ti99_peb/evpc.cpp b/src/devices/bus/ti99_peb/evpc.cpp
index 14671574e20..aedabb6e172 100644
--- a/src/devices/bus/ti99_peb/evpc.cpp
+++ b/src/devices/bus/ti99_peb/evpc.cpp
@@ -45,7 +45,7 @@
#define NOVRAM_SIZE 256
-snug_enhanced_video_device::snug_enhanced_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+snug_enhanced_video_device::snug_enhanced_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti_expansion_card_device(mconfig, TI99_EVPC, "SNUG Enhanced Video Processor Card", tag, owner, clock, "ti99_evpc", __FILE__),
device_nvram_interface(mconfig, *this),
m_dsr_page(0),
@@ -380,7 +380,7 @@ WRITE_LINE_MEMBER( snug_enhanced_video_device::ready_line )
void snug_enhanced_video_device::device_start()
{
m_dsrrom = memregion(DSRROM)->base();
- m_novram = std::make_unique<UINT8[]>(NOVRAM_SIZE);
+ m_novram = std::make_unique<uint8_t[]>(NOVRAM_SIZE);
m_console_conn = downcast<evpc_clock_connector*>(machine().device(EVPC_CONN_TAG));
save_item(NAME(m_address));
save_item(NAME(m_dsr_page));
diff --git a/src/devices/bus/ti99_peb/evpc.h b/src/devices/bus/ti99_peb/evpc.h
index 0556c17bf64..32ecaa5a7d6 100644
--- a/src/devices/bus/ti99_peb/evpc.h
+++ b/src/devices/bus/ti99_peb/evpc.h
@@ -25,17 +25,17 @@ extern const device_type TI99_EVPC;
struct evpc_palette
{
- UINT8 read_index, write_index, mask;
+ uint8_t read_index, write_index, mask;
int read;
int state;
- struct { UINT8 red, green, blue; } color[0x100];
+ struct { uint8_t red, green, blue; } color[0x100];
//int dirty;
};
class snug_enhanced_video_device : public ti_expansion_card_device, public device_nvram_interface
{
public:
- snug_enhanced_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snug_enhanced_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override;
@@ -69,9 +69,9 @@ private:
bool m_sound_accessed;
bool m_video_accessed;
- UINT8* m_dsrrom;
+ uint8_t* m_dsrrom;
- std::unique_ptr<UINT8[]> m_novram; // NOVRAM area
+ std::unique_ptr<uint8_t[]> m_novram; // NOVRAM area
evpc_palette m_palette;
required_device<v9938_device> m_video;
diff --git a/src/devices/bus/ti99_peb/hfdc.cpp b/src/devices/bus/ti99_peb/hfdc.cpp
index 2dd1868b6ef..6554f687f25 100644
--- a/src/devices/bus/ti99_peb/hfdc.cpp
+++ b/src/devices/bus/ti99_peb/hfdc.cpp
@@ -87,7 +87,7 @@
/*
Constructor for the HFDC card.
*/
-myarc_hfdc_device::myarc_hfdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+myarc_hfdc_device::myarc_hfdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti_expansion_card_device(mconfig, TI99_HFDC, "Myarc Hard and Floppy Disk Controller", tag, owner, clock, "ti99_hfdc", __FILE__), m_motor_on_timer(nullptr),
m_hdc9234(*this, FDC_TAG),
m_clock(*this, CLOCK_TAG), m_current_floppy(nullptr),
@@ -149,7 +149,7 @@ SETADDRESS_DBIN_MEMBER( myarc_hfdc_device::setaddress_dbin )
Access for debugger. This is a stripped-down version of the
main methods below. We only allow ROM and RAM access.
*/
-void myarc_hfdc_device::debug_read(offs_t offset, UINT8* value)
+void myarc_hfdc_device::debug_read(offs_t offset, uint8_t* value)
{
if (((offset & m_select_mask)==m_select_value) && m_selected)
{
@@ -168,7 +168,7 @@ void myarc_hfdc_device::debug_read(offs_t offset, UINT8* value)
}
}
-void myarc_hfdc_device::debug_write(offs_t offset, UINT8 data)
+void myarc_hfdc_device::debug_write(offs_t offset, uint8_t data)
{
if (((offset & m_select_mask)==m_select_value) && m_selected)
{
@@ -369,7 +369,7 @@ WRITE8_MEMBER( myarc_hfdc_device::write )
*/
READ8Z_MEMBER(myarc_hfdc_device::crureadz)
{
- UINT8 reply;
+ uint8_t reply;
if ((offset & 0xff00)==m_cru_base)
{
if ((offset & 0x00ff)==0) // CRU bits 0-7
@@ -546,7 +546,7 @@ void myarc_hfdc_device::harddisk_skcom_callback(mfm_harddisk_device *harddisk, i
signal_drive_status();
}
-void myarc_hfdc_device::set_bits(UINT8& byte, int mask, bool set)
+void myarc_hfdc_device::set_bits(uint8_t& byte, int mask, bool set)
{
if (set) byte |= mask;
else byte &= ~mask;
@@ -570,7 +570,7 @@ int myarc_hfdc_device::bit_to_index(int value)
*/
void myarc_hfdc_device::signal_drive_status()
{
- UINT8 reply = 0;
+ uint8_t reply = 0;
// Status byte as defined by HDC9234
// +------+------+------+------+------+------+------+------+
// | ECC |Index | SeekC| Tr00 | User | WrPrt| Ready|Fault |
@@ -853,7 +853,7 @@ READ8_MEMBER( myarc_hfdc_device::read_buffer )
{
if (TRACE_DMA) logerror("Read access to onboard SRAM at %04x\n", m_dma_address);
if (m_dma_address > 0x8000) logerror("Read access beyond RAM size: %06x\n", m_dma_address);
- UINT8 value = m_buffer_ram->pointer()[m_dma_address & 0x7fff];
+ uint8_t value = m_buffer_ram->pointer()[m_dma_address & 0x7fff];
m_dma_address = (m_dma_address+1) & 0x7fff;
return value;
}
diff --git a/src/devices/bus/ti99_peb/hfdc.h b/src/devices/bus/ti99_peb/hfdc.h
index 2897fc16740..38a95c787a1 100644
--- a/src/devices/bus/ti99_peb/hfdc.h
+++ b/src/devices/bus/ti99_peb/hfdc.h
@@ -31,7 +31,7 @@ extern const device_type TI99_HFDC;
class myarc_hfdc_device : public ti_expansion_card_device
{
public:
- myarc_hfdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ myarc_hfdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -61,8 +61,8 @@ private:
ioport_constructor device_input_ports() const override;
// Debug accessors
- void debug_read(offs_t offset, UINT8* value);
- void debug_write(offs_t offset, UINT8 data);
+ void debug_read(offs_t offset, uint8_t* value);
+ void debug_write(offs_t offset, uint8_t data);
// Callbacks for the index hole and seek complete
void floppy_index_callback(floppy_image_device *floppy, int state);
@@ -144,7 +144,7 @@ private:
bool m_wait_for_hd1;
// Device Service Routine ROM (firmware)
- UINT8* m_dsrrom;
+ uint8_t* m_dsrrom;
// ROM banks.
int m_rom_page;
@@ -156,19 +156,19 @@ private:
int m_ram_page[4];
// Drive status latch (STB0)
- UINT8 m_status_latch;
+ uint8_t m_status_latch;
// DMA address latch (in Gate Array) (STB1)
- UINT32 m_dma_address;
+ uint32_t m_dma_address;
// Output 1 latch (STB2)
- UINT8 m_output1_latch;
+ uint8_t m_output1_latch;
// Output 2 latch (STB3)
- UINT8 m_output2_latch;
+ uint8_t m_output2_latch;
// Needed for triggering the motor monoflop
- UINT8 m_lastval;
+ uint8_t m_lastval;
// Signal motor_on. When TRUE, makes all drives turning.
int m_MOTOR_ON;
@@ -177,7 +177,7 @@ private:
int bit_to_index(int value);
// Utility function to set or unset bits in a byte
- void set_bits(UINT8& byte, int mask, bool set);
+ void set_bits(uint8_t& byte, int mask, bool set);
// Joined ready line towards the controller
int m_readyflags;
diff --git a/src/devices/bus/ti99_peb/horizon.cpp b/src/devices/bus/ti99_peb/horizon.cpp
index f97f0447302..09117a905a7 100644
--- a/src/devices/bus/ti99_peb/horizon.cpp
+++ b/src/devices/bus/ti99_peb/horizon.cpp
@@ -64,7 +64,7 @@
#define TRACE_WRITE 0
#define TRACE_CRU 0
-horizon_ramdisk_device::horizon_ramdisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+horizon_ramdisk_device::horizon_ramdisk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti_expansion_card_device(mconfig, TI99_HORIZON, "Horizon 4000 Ramdisk", tag, owner, clock,"ti99_horizon",__FILE__),
device_nvram_interface(mconfig, *this),
m_ram(*this, RAMREGION),
@@ -106,7 +106,7 @@ void horizon_ramdisk_device::nvram_read(emu_file &file)
int size = 2097152*(1 << ioport("HORIZONSIZE")->read());
// NVRAM plus ROS
- UINT8* buffer = global_alloc_array_clear<UINT8>(MAXSIZE + ROSSIZE);
+ uint8_t* buffer = global_alloc_array_clear<uint8_t>(MAXSIZE + ROSSIZE);
memset(m_nvram->pointer(), 0, size);
memset(m_ros->pointer(), 0, ROSSIZE);
@@ -135,7 +135,7 @@ void horizon_ramdisk_device::nvram_write(emu_file &file)
{
int nvramsize = 2097152*(1 << ioport("HORIZONSIZE")->read());
- UINT8* buffer = global_alloc_array_clear<UINT8>(nvramsize + ROSSIZE);
+ uint8_t* buffer = global_alloc_array_clear<uint8_t>(nvramsize + ROSSIZE);
memcpy(buffer, m_nvram->pointer(), nvramsize);
memcpy(buffer + nvramsize, m_ros->pointer(), ROSSIZE);
diff --git a/src/devices/bus/ti99_peb/horizon.h b/src/devices/bus/ti99_peb/horizon.h
index 078d987b369..1469bca8c30 100644
--- a/src/devices/bus/ti99_peb/horizon.h
+++ b/src/devices/bus/ti99_peb/horizon.h
@@ -23,7 +23,7 @@ extern const device_type TI99_HORIZON;
class horizon_ramdisk_device : public ti_expansion_card_device, public device_nvram_interface
{
public:
- horizon_ramdisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ horizon_ramdisk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
diff --git a/src/devices/bus/ti99_peb/hsgpl.cpp b/src/devices/bus/ti99_peb/hsgpl.cpp
index 966f7aed727..2602df19f36 100644
--- a/src/devices/bus/ti99_peb/hsgpl.cpp
+++ b/src/devices/bus/ti99_peb/hsgpl.cpp
@@ -140,7 +140,7 @@
#define GROM_A_EEPROM "u1_grom"
#define ROM6_EEPROM "u6_rom6"
-snug_high_speed_gpl_device::snug_high_speed_gpl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+snug_high_speed_gpl_device::snug_high_speed_gpl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti_expansion_card_device(mconfig, TI99_HSGPL, "SNUG High-speed GPL card", tag, owner, clock, "ti99_hsgpl", __FILE__),
m_dsr_eeprom(*this, DSR_EEPROM),
m_rom6_eeprom(*this, ROM6_EEPROM),
@@ -295,7 +295,7 @@ WRITE8_MEMBER(snug_high_speed_gpl_device::write)
/*
Specific read access: dsrspace
*/
-void snug_high_speed_gpl_device::dsrspace_readz(address_space& space, offs_t offset, UINT8* value, UINT8 mem_mask)
+void snug_high_speed_gpl_device::dsrspace_readz(address_space& space, offs_t offset, uint8_t* value, uint8_t mem_mask)
{
if (m_dsr_enabled)
{
@@ -307,7 +307,7 @@ void snug_high_speed_gpl_device::dsrspace_readz(address_space& space, offs_t off
/*
Specific read access: cartspace
*/
-void snug_high_speed_gpl_device::cartspace_readz(address_space& space, offs_t offset, UINT8* value, UINT8 mem_mask)
+void snug_high_speed_gpl_device::cartspace_readz(address_space& space, offs_t offset, uint8_t* value, uint8_t mem_mask)
{
if (!m_card_enabled || m_flash_mode)
{
@@ -339,7 +339,7 @@ void snug_high_speed_gpl_device::cartspace_readz(address_space& space, offs_t of
it here - which is indeed closer to reality, since the real HSGPL also
emulates GROM instead of using proper ones.
*/
-void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset, UINT8* value, UINT8 mem_mask)
+void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset, uint8_t* value, uint8_t mem_mask)
{
if (space.debugger_access()) return;
@@ -457,7 +457,7 @@ void snug_high_speed_gpl_device::grom_readz(address_space& space, offs_t offset,
/*
Specific write access: cartspace
*/
-void snug_high_speed_gpl_device::cartspace_write(address_space& space, offs_t offset, UINT8 data, UINT8 mem_mask)
+void snug_high_speed_gpl_device::cartspace_write(address_space& space, offs_t offset, uint8_t data, uint8_t mem_mask)
{
if (!m_card_enabled || m_flash_mode)
{
@@ -525,7 +525,7 @@ void snug_high_speed_gpl_device::cartspace_write(address_space& space, offs_t of
/*
Specific write access: grom_write
*/
-void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset, UINT8 data, UINT8 mem_mask)
+void snug_high_speed_gpl_device::grom_write(address_space& space, offs_t offset, uint8_t data, uint8_t mem_mask)
{
if (space.debugger_access()) return;
diff --git a/src/devices/bus/ti99_peb/hsgpl.h b/src/devices/bus/ti99_peb/hsgpl.h
index 04ea2b99e8e..09e2e46ff7b 100644
--- a/src/devices/bus/ti99_peb/hsgpl.h
+++ b/src/devices/bus/ti99_peb/hsgpl.h
@@ -26,7 +26,7 @@ extern const device_type TI99_HSGPL;
class snug_high_speed_gpl_device : public ti_expansion_card_device
{
public:
- snug_high_speed_gpl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ snug_high_speed_gpl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -50,12 +50,12 @@ private:
required_device<ram_device> m_ram6_memory;
required_device<ram_device> m_gram_memory;
- void dsrspace_readz(address_space& space, offs_t offset, UINT8* value, UINT8 mem_mask);
- void cartspace_readz(address_space& space, offs_t offset, UINT8* value, UINT8 mem_mask);
- void grom_readz(address_space& space, offs_t offset, UINT8* value, UINT8 mem_mask);
+ void dsrspace_readz(address_space& space, offs_t offset, uint8_t* value, uint8_t mem_mask);
+ void cartspace_readz(address_space& space, offs_t offset, uint8_t* value, uint8_t mem_mask);
+ void grom_readz(address_space& space, offs_t offset, uint8_t* value, uint8_t mem_mask);
- void cartspace_write(address_space& space, offs_t offset, UINT8 data, UINT8 mem_mask);
- void grom_write(address_space& space, offs_t offset, UINT8 data, UINT8 mem_mask);
+ void cartspace_write(address_space& space, offs_t offset, uint8_t data, uint8_t mem_mask);
+ void grom_write(address_space& space, offs_t offset, uint8_t data, uint8_t mem_mask);
bool m_dsr_enabled;
bool m_gram_enabled;
diff --git a/src/devices/bus/ti99_peb/memex.cpp b/src/devices/bus/ti99_peb/memex.cpp
index 021fb19b96e..2a9b596d0c8 100644
--- a/src/devices/bus/ti99_peb/memex.cpp
+++ b/src/devices/bus/ti99_peb/memex.cpp
@@ -29,7 +29,7 @@ enum
MDIP8 = 0x80
};
-geneve_memex_device::geneve_memex_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+geneve_memex_device::geneve_memex_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti_expansion_card_device(mconfig, TI99_MEMEX, "Geneve memory expansion card", tag, owner, clock, "ti99_memex", __FILE__),
m_ram(*this, RAMREGION)
{
diff --git a/src/devices/bus/ti99_peb/memex.h b/src/devices/bus/ti99_peb/memex.h
index b457fb78c95..f63f1b62044 100644
--- a/src/devices/bus/ti99_peb/memex.h
+++ b/src/devices/bus/ti99_peb/memex.h
@@ -22,7 +22,7 @@ extern const device_type TI99_MEMEX;
class geneve_memex_device : public ti_expansion_card_device
{
public:
- geneve_memex_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ geneve_memex_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -38,7 +38,7 @@ protected:
private:
bool access_enabled(offs_t offset);
required_device<ram_device> m_ram;
- UINT8 m_switches;
+ uint8_t m_switches;
};
#endif
diff --git a/src/devices/bus/ti99_peb/myarcmem.cpp b/src/devices/bus/ti99_peb/myarcmem.cpp
index 51e5655d40a..7d8c7be5fd3 100644
--- a/src/devices/bus/ti99_peb/myarcmem.cpp
+++ b/src/devices/bus/ti99_peb/myarcmem.cpp
@@ -39,7 +39,7 @@ enum
SIZE_512
};
-myarc_memory_expansion_device::myarc_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+myarc_memory_expansion_device::myarc_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti_expansion_card_device(mconfig, TI99_MYARCMEM, "Myarc Memory expansion card MEXP-1", tag, owner, clock, "ti99_myarcmem", __FILE__),
m_ram(*this, RAM_TAG),
m_dsrrom(nullptr), m_bank(0), m_size(0)
diff --git a/src/devices/bus/ti99_peb/myarcmem.h b/src/devices/bus/ti99_peb/myarcmem.h
index 19a8f1fd95a..5a82bc83cac 100644
--- a/src/devices/bus/ti99_peb/myarcmem.h
+++ b/src/devices/bus/ti99_peb/myarcmem.h
@@ -22,7 +22,7 @@ extern const device_type TI99_MYARCMEM;
class myarc_memory_expansion_device : public ti_expansion_card_device
{
public:
- myarc_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ myarc_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -39,7 +39,7 @@ protected:
private:
int get_base(int offset);
required_device<ram_device> m_ram;
- UINT8* m_dsrrom;
+ uint8_t* m_dsrrom;
int m_bank;
int m_size;
};
diff --git a/src/devices/bus/ti99_peb/pcode.cpp b/src/devices/bus/ti99_peb/pcode.cpp
index 5e8a4bf2e1c..3b18f9a41b7 100644
--- a/src/devices/bus/ti99_peb/pcode.cpp
+++ b/src/devices/bus/ti99_peb/pcode.cpp
@@ -94,7 +94,7 @@
#define TRACE_CRU 0
#define TRACE_SWITCH 0
-ti_pcode_card_device::ti_pcode_card_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti_pcode_card_device::ti_pcode_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti_expansion_card_device(mconfig, TI99_P_CODE, "TI-99 P-Code Card", tag, owner, clock, "ti99_pcode", __FILE__),
m_rom(nullptr),
m_bank_select(0),
@@ -137,7 +137,7 @@ SETADDRESS_DBIN_MEMBER( ti_pcode_card_device::setaddress_dbin )
}
}
-void ti_pcode_card_device::debugger_read(address_space& space, UINT16 offset, UINT8& value)
+void ti_pcode_card_device::debugger_read(address_space& space, uint16_t offset, uint8_t& value)
{
// The debuger does not call setaddress
if (m_active && ((offset & m_select_mask)==m_select_value))
diff --git a/src/devices/bus/ti99_peb/pcode.h b/src/devices/bus/ti99_peb/pcode.h
index dfb2fb1a371..4b9662ebffa 100644
--- a/src/devices/bus/ti99_peb/pcode.h
+++ b/src/devices/bus/ti99_peb/pcode.h
@@ -24,7 +24,7 @@ extern const device_type TI99_P_CODE;
class ti_pcode_card_device : public ti_expansion_card_device
{
public:
- ti_pcode_card_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_pcode_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
DECLARE_READ8Z_MEMBER(crureadz) override;
@@ -45,9 +45,9 @@ protected:
virtual ioport_constructor device_input_ports() const override;
private:
- void debugger_read(address_space& space, UINT16 addr, UINT8& value);
+ void debugger_read(address_space& space, uint16_t addr, uint8_t& value);
tmc0430_device* m_grom[8];
- UINT8* m_rom;
+ uint8_t* m_rom;
int m_bank_select;
bool m_active;
int m_clock_count;
diff --git a/src/devices/bus/ti99_peb/peribox.cpp b/src/devices/bus/ti99_peb/peribox.cpp
index 3a576b33490..34190757fb4 100644
--- a/src/devices/bus/ti99_peb/peribox.cpp
+++ b/src/devices/bus/ti99_peb/peribox.cpp
@@ -216,7 +216,7 @@ CRUCLK* 51||52 DBIN
#define PEBSLOT7 "slot7"
#define PEBSLOT8 "slot8"
-peribox_device::peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_device::peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: bus8z_device(mconfig, PERIBOX, "Peripheral expansion box", tag, owner, clock, "peribox", __FILE__),
m_console_inta(*this),
m_console_intb(*this),
@@ -233,7 +233,7 @@ peribox_device::peribox_device(const machine_config &mconfig, const char *tag, d
/*
Constructor called from subclasses.
*/
-peribox_device::peribox_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+peribox_device::peribox_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_console_inta(*this),
m_console_intb(*this),
@@ -482,7 +482,7 @@ machine_config_constructor peribox_device::device_mconfig_additions() const
A variant of the box used for the Geneve.
*****************************************************************************/
-peribox_gen_device::peribox_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_gen_device::peribox_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: peribox_device(mconfig, PERIBOX_GEN, "Peripheral expansion box Geneve", tag, owner, clock, "peribox_gen", __FILE__)
{
// The Geneve sits in slot 1; there is no prefix here - it can control
@@ -524,7 +524,7 @@ machine_config_constructor peribox_gen_device::device_mconfig_additions() const
A variant of the box used for the TI-99/8
*****************************************************************************/
-peribox_998_device::peribox_998_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_998_device::peribox_998_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: peribox_device(mconfig, PERIBOX_998, "Peripheral expansion box 99/8", tag, owner, clock, "peribox_998", __FILE__)
{
m_address_prefix = 0x70000;
@@ -562,7 +562,7 @@ machine_config_constructor peribox_998_device::device_mconfig_additions() const
A variant of the box used for the SGCPU (aka TI-99/4P).
*****************************************************************************/
-peribox_sg_device::peribox_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_sg_device::peribox_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: peribox_device(mconfig, PERIBOX_SG, "Peripheral expansion box SGCPU", tag, owner, clock, "peribox_sg", __FILE__)
{
m_address_prefix = 0x70000;
@@ -610,7 +610,7 @@ machine_config_constructor peribox_sg_device::device_mconfig_additions() const
obviously required.
*****************************************************************************/
-peribox_ev_device::peribox_ev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_ev_device::peribox_ev_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: peribox_device(mconfig, PERIBOX_EV, "Peripheral expansion box EVPC", tag, owner, clock, "peribox_ev", __FILE__)
{
m_address_prefix = 0x70000;
@@ -646,7 +646,7 @@ int peribox_slot_device::get_index_from_tagname()
return atoi(mytag+i+1);
}
-peribox_slot_device::peribox_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+peribox_slot_device::peribox_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: bus8z_device(mconfig, PERIBOX_SLOT, "TI P-Box slot", tag, owner, clock, "peribox_slot", __FILE__), device_slot_interface(mconfig, *this), m_card(nullptr), m_slotnumber(0)
{
}
diff --git a/src/devices/bus/ti99_peb/peribox.h b/src/devices/bus/ti99_peb/peribox.h
index b5a4c55e074..51aa007497c 100644
--- a/src/devices/bus/ti99_peb/peribox.h
+++ b/src/devices/bus/ti99_peb/peribox.h
@@ -36,8 +36,8 @@ class peribox_device : public bus8z_device
{
friend class peribox_slot_device;
public:
- peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- peribox_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ peribox_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
template<class _Object> static devcb_base &static_set_inta_callback(device_t &device, _Object object) { return downcast<peribox_device &>(device).m_console_inta.set_callback(object); }
template<class _Object> static devcb_base &static_set_intb_callback(device_t &device, _Object object) { return downcast<peribox_device &>(device).m_console_intb.set_callback(object); }
@@ -113,7 +113,7 @@ protected:
class peribox_ev_device : public peribox_device
{
public:
- peribox_ev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ peribox_ev_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -125,7 +125,7 @@ protected:
class peribox_sg_device : public peribox_device
{
public:
- peribox_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ peribox_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -137,7 +137,7 @@ protected:
class peribox_gen_device : public peribox_device
{
public:
- peribox_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ peribox_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -149,7 +149,7 @@ protected:
class peribox_998_device : public peribox_device
{
public:
- peribox_998_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ peribox_998_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -163,7 +163,7 @@ class peribox_slot_device : public bus8z_device, public device_slot_interface
{
friend class peribox_device;
public:
- peribox_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ peribox_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// Called from the box (direction to card)
DECLARE_READ8Z_MEMBER(readz) override;
@@ -208,7 +208,7 @@ class ti_expansion_card_device : public bus8z_device, public device_slot_card_in
friend class peribox_slot_device;
public:
- ti_expansion_card_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ ti_expansion_card_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_card_interface(mconfig, *this), m_selected(false), m_cru_base(0), m_select_mask(0), m_select_value(0)
{
diff --git a/src/devices/bus/ti99_peb/samsmem.cpp b/src/devices/bus/ti99_peb/samsmem.cpp
index 1261ac32ffc..9906e664b76 100644
--- a/src/devices/bus/ti99_peb/samsmem.cpp
+++ b/src/devices/bus/ti99_peb/samsmem.cpp
@@ -27,7 +27,7 @@
#define SAMS_CRU_BASE 0x1e00
-sams_memory_expansion_device::sams_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+sams_memory_expansion_device::sams_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti_expansion_card_device(mconfig, TI99_SAMSMEM, "SuperAMS memory expansion card", tag, owner, clock, "ti99_sams", __FILE__),
m_ram(*this, RAM_TAG),
m_map_mode(false), m_access_mapper(false)
diff --git a/src/devices/bus/ti99_peb/samsmem.h b/src/devices/bus/ti99_peb/samsmem.h
index 10c69c1d655..b7943270f4d 100644
--- a/src/devices/bus/ti99_peb/samsmem.h
+++ b/src/devices/bus/ti99_peb/samsmem.h
@@ -24,7 +24,7 @@ extern const device_type TI99_SAMSMEM;
class sams_memory_expansion_device : public ti_expansion_card_device
{
public:
- sams_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ sams_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
diff --git a/src/devices/bus/ti99_peb/spchsyn.cpp b/src/devices/bus/ti99_peb/spchsyn.cpp
index e4971ed0763..9a3ad050c75 100644
--- a/src/devices/bus/ti99_peb/spchsyn.cpp
+++ b/src/devices/bus/ti99_peb/spchsyn.cpp
@@ -31,7 +31,7 @@
/****************************************************************************/
-ti_speech_synthesizer_device::ti_speech_synthesizer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti_speech_synthesizer_device::ti_speech_synthesizer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti_expansion_card_device(mconfig, TI99_SPEECH, "TI-99 Speech synthesizer (on adapter card)", tag, owner, clock, "ti99_speech", __FILE__),
m_vsp(nullptr), m_reading(false), m_sbe(false)
{
diff --git a/src/devices/bus/ti99_peb/spchsyn.h b/src/devices/bus/ti99_peb/spchsyn.h
index 6841e397793..e6d0bd1ad02 100644
--- a/src/devices/bus/ti99_peb/spchsyn.h
+++ b/src/devices/bus/ti99_peb/spchsyn.h
@@ -22,7 +22,7 @@ extern const device_type TI99_SPEECH;
class ti_speech_synthesizer_device : public ti_expansion_card_device
{
public:
- ti_speech_synthesizer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_speech_synthesizer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override;
diff --git a/src/devices/bus/ti99_peb/ti_32kmem.cpp b/src/devices/bus/ti99_peb/ti_32kmem.cpp
index 02e147e33df..16f2d0ccef2 100644
--- a/src/devices/bus/ti99_peb/ti_32kmem.cpp
+++ b/src/devices/bus/ti99_peb/ti_32kmem.cpp
@@ -34,7 +34,7 @@
#define RAMREGION "ram32k"
-ti_32k_expcard_device::ti_32k_expcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti_32k_expcard_device::ti_32k_expcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti_expansion_card_device(mconfig, TI_32KMEM, "TI-99 32KiB memory expansion card", tag, owner, clock, "ti99_32k", __FILE__),
m_ram(*this, RAMREGION)
{
@@ -42,7 +42,7 @@ ti_32k_expcard_device::ti_32k_expcard_device(const machine_config &mconfig, cons
READ8Z_MEMBER(ti_32k_expcard_device::readz)
{
- UINT8 val = 0;
+ uint8_t val = 0;
/*
The problem for mapping the memory into the address space is that
we have a block at 2000-3FFF and another one at A000-FFFF. The trick
diff --git a/src/devices/bus/ti99_peb/ti_32kmem.h b/src/devices/bus/ti99_peb/ti_32kmem.h
index 37bafe0524b..791a1e01ef6 100644
--- a/src/devices/bus/ti99_peb/ti_32kmem.h
+++ b/src/devices/bus/ti99_peb/ti_32kmem.h
@@ -23,7 +23,7 @@ extern const device_type TI_32KMEM;
class ti_32k_expcard_device : public ti_expansion_card_device
{
public:
- ti_32k_expcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_32k_expcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
diff --git a/src/devices/bus/ti99_peb/ti_fdc.cpp b/src/devices/bus/ti99_peb/ti_fdc.cpp
index 4cf7fe9ee4e..3fef602c3fb 100644
--- a/src/devices/bus/ti99_peb/ti_fdc.cpp
+++ b/src/devices/bus/ti99_peb/ti_fdc.cpp
@@ -48,7 +48,7 @@
#define TI_FDC_TAG "ti_dssd_controller"
-ti_fdc_device::ti_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti_fdc_device::ti_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti_expansion_card_device(mconfig, TI99_FDC, "TI-99 Standard DSSD Floppy Controller", tag, owner, clock, "ti99_fdc", __FILE__),
m_address(0),
m_DRQ(0),
@@ -131,7 +131,7 @@ SETADDRESS_DBIN_MEMBER( ti_fdc_device::setaddress_dbin )
Access for debugger. This is a stripped-down version of the
main methods below. We only allow ROM access.
*/
-void ti_fdc_device::debug_read(offs_t offset, UINT8* value)
+void ti_fdc_device::debug_read(offs_t offset, uint8_t* value)
{
if (((offset & m_select_mask)==m_select_value) && m_selected)
{
@@ -152,7 +152,7 @@ READ8Z_MEMBER(ti_fdc_device::readz)
{
// Read ports of 1771 are mapped to 5FF0,2,4,6: 0101 1111 1111 0xx0
// Note that incoming/outgoing data are inverted for FD1771
- UINT8 reply = 0;
+ uint8_t reply = 0;
if (m_WDsel && ((m_address & 9)==0))
{
@@ -221,7 +221,7 @@ READ8Z_MEMBER(ti_fdc_device::crureadz)
{
if ((offset & 0xff00)==m_cru_base)
{
- UINT8 reply = 0;
+ uint8_t reply = 0;
if ((offset & 0x07) == 0)
{
// Selected drive
diff --git a/src/devices/bus/ti99_peb/ti_fdc.h b/src/devices/bus/ti99_peb/ti_fdc.h
index e0446c0c1a1..aeba6d6fdc2 100644
--- a/src/devices/bus/ti99_peb/ti_fdc.h
+++ b/src/devices/bus/ti99_peb/ti_fdc.h
@@ -22,7 +22,7 @@ extern const device_type TI99_FDC;
class ti_fdc_device : public ti_expansion_card_device
{
public:
- ti_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override;
@@ -48,7 +48,7 @@ protected:
private:
// For debugger access
- void debug_read(offs_t offset, UINT8* value);
+ void debug_read(offs_t offset, uint8_t* value);
// Wait state logic
void operate_ready_line();
@@ -66,7 +66,7 @@ private:
int m_DRQ, m_IRQ;
// Needed for triggering the motor monoflop
- UINT8 m_lastval;
+ uint8_t m_lastval;
// Signal DVENA. When TRUE, makes some drive turning.
int m_DVENA;
@@ -97,7 +97,7 @@ private:
required_device<fd1771_t> m_fd1771;
// DSR ROM
- UINT8* m_dsrrom;
+ uint8_t* m_dsrrom;
// Link to the attached floppy drives
floppy_image_device* m_floppy[3];
diff --git a/src/devices/bus/ti99_peb/ti_rs232.cpp b/src/devices/bus/ti99_peb/ti_rs232.cpp
index 2fde3f4c07a..d89d1dc354f 100644
--- a/src/devices/bus/ti99_peb/ti_rs232.cpp
+++ b/src/devices/bus/ti99_peb/ti_rs232.cpp
@@ -121,7 +121,7 @@
#define ESC 0x1b
-ti_rs232_pio_device::ti_rs232_pio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti_rs232_pio_device::ti_rs232_pio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti_expansion_card_device(mconfig, TI99_RS232, "TI-99 RS232/PIO interface", tag, owner, clock, "ti99_rs232", __FILE__), m_piodev(nullptr), m_dsrrom(nullptr), m_pio_direction_in(false), m_pio_handshakeout(false), m_pio_handshakein(false), m_pio_spareout(false), m_pio_sparein(false), m_flag0(false), m_led(false), m_pio_out_buffer(0), m_pio_in_buffer(0), m_pio_readable(false), m_pio_writable(false), m_pio_write(false), m_ila(0)
{
}
@@ -130,13 +130,13 @@ ti_rs232_pio_device::ti_rs232_pio_device(const machine_config &mconfig, const ch
/**************************************************************************/
/* Ports */
-ti_rs232_attached_device::ti_rs232_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti_rs232_attached_device::ti_rs232_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TI99_RS232_DEV, "Serial attached device", tag, owner, clock, "ti_rs232_attached", __FILE__),
device_image_interface(mconfig, *this)
{
}
-ti_pio_attached_device::ti_pio_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti_pio_attached_device::ti_pio_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TI99_PIO_DEV, "Parallel attached device", tag, owner, clock, "ti_pio_attached", __FILE__),
device_image_interface(mconfig, *this)
{
@@ -270,7 +270,7 @@ READ8Z_MEMBER(ti_rs232_pio_device::crureadz)
{
if ((offset & 0x00c0)==0x0000)
{
- UINT8 reply = 0x00;
+ uint8_t reply = 0x00;
if (m_pio_direction_in) reply |= 0x02;
if (m_pio_handshakein) reply |= 0x04;
if (m_pio_sparein) reply |= 0x08;
@@ -336,7 +336,7 @@ WRITE8_MEMBER(ti_rs232_pio_device::cruwrite)
if (!m_pio_handshakeout)
{ /* write data strobe */
/* write data and acknowledge */
- UINT8 buf = m_pio_out_buffer;
+ uint8_t buf = m_pio_out_buffer;
int ret = image->fwrite(&buf, 1);
if (ret)
m_pio_handshakein = 1;
@@ -353,7 +353,7 @@ WRITE8_MEMBER(ti_rs232_pio_device::cruwrite)
if (!m_pio_handshakeout)
{ /* receiver ready */
/* send data and strobe */
- UINT8 buf;
+ uint8_t buf;
if (image->fread(&buf, 1))
m_pio_in_buffer = buf;
m_pio_handshakein = 0;
@@ -456,9 +456,9 @@ void ti_rs232_pio_device::incoming_dtr(int uartind, line_state value)
/*
Data transmission
*/
-void ti_rs232_pio_device::transmit_data(int uartind, UINT8 value)
+void ti_rs232_pio_device::transmit_data(int uartind, uint8_t value)
{
- UINT8 buf = value;
+ uint8_t buf = value;
device_image_interface *serial;
serial = dynamic_cast<device_image_interface *>(m_serdev[uartind]);
@@ -523,9 +523,9 @@ void ti_rs232_pio_device::transmit_data(int uartind, UINT8 value)
|-( 8) <--- DCD
*/
-UINT8 ti_rs232_pio_device::map_lines_out(int uartind, UINT8 value)
+uint8_t ti_rs232_pio_device::map_lines_out(int uartind, uint8_t value)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
int mapping = ioport("SERIALMAP")->read();
// 00ab cdef = setting line RTS=a, CTS=b, DSR=c, DCD=d, DTR=e, RI=f
@@ -595,9 +595,9 @@ UINT8 ti_rs232_pio_device::map_lines_out(int uartind, UINT8 value)
return ret;
}
-UINT8 ti_rs232_pio_device::map_lines_in(int uartind, UINT8 value)
+uint8_t ti_rs232_pio_device::map_lines_in(int uartind, uint8_t value)
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
int mapping = ioport("SERIALMAP")->read();
// 00ab cdef = setting line RTS=a, CTS=b, DSR=c, DCD=d, DTR=e, RI=f
@@ -692,7 +692,7 @@ UINT8 ti_rs232_pio_device::map_lines_in(int uartind, UINT8 value)
void ti_rs232_pio_device::receive_data_or_line_state(int uartind)
{
device_image_interface *serial;
- UINT8 buffer;
+ uint8_t buffer;
serial = dynamic_cast<device_image_interface *>(m_serdev[uartind]);
@@ -801,9 +801,9 @@ void ti_rs232_pio_device::receive_data_or_line_state(int uartind)
*/
void ti_rs232_pio_device::configure_interface(int uartind, int type, int value)
{
- UINT8 bufctrl[4];
+ uint8_t bufctrl[4];
device_image_interface *serial;
- UINT8 esc = ESC;
+ uint8_t esc = ESC;
serial = dynamic_cast<device_image_interface *>(m_serdev[uartind]);
@@ -877,11 +877,11 @@ void ti_rs232_pio_device::set_bit(int uartind, int line, int value)
/*
Line changes
*/
-void ti_rs232_pio_device::output_exception(int uartind, int param, UINT8 value)
+void ti_rs232_pio_device::output_exception(int uartind, int param, uint8_t value)
{
device_image_interface *serial;
- UINT8 bufctrl[2];
- UINT8 esc = ESC;
+ uint8_t bufctrl[2];
+ uint8_t esc = ESC;
serial = dynamic_cast<device_image_interface *>(m_serdev[uartind]);
@@ -903,11 +903,11 @@ void ti_rs232_pio_device::output_exception(int uartind, int param, UINT8 value)
/*
Line changes
*/
-void ti_rs232_pio_device::output_line_state(int uartind, int mask, UINT8 value)
+void ti_rs232_pio_device::output_line_state(int uartind, int mask, uint8_t value)
{
device_image_interface *serial;
- UINT8 bufctrl[2];
- UINT8 esc = ESC;
+ uint8_t bufctrl[2];
+ uint8_t esc = ESC;
serial = dynamic_cast<device_image_interface *>(m_serdev[uartind]);
@@ -996,7 +996,7 @@ WRITE8_MEMBER( ti_rs232_pio_device::xmit1_callback )
transmit_data(1, data);
}
-void ti_rs232_pio_device::ctrl_callback(int uartind, int offset, UINT8 data)
+void ti_rs232_pio_device::ctrl_callback(int uartind, int offset, uint8_t data)
{
if ((offset & CONFIG)!=0)
{
@@ -1036,8 +1036,8 @@ void ti_rs232_pio_device::device_start()
m_serdev[1] = subdevice<ti_rs232_attached_device>("serdev1");
m_piodev = subdevice<ti_pio_attached_device>("piodev");
// Prepare the receive buffers
- m_recvbuf[0] = std::make_unique<UINT8[]>(512);
- m_recvbuf[1] = std::make_unique<UINT8[]>(512);
+ m_recvbuf[0] = std::make_unique<uint8_t[]>(512);
+ m_recvbuf[1] = std::make_unique<uint8_t[]>(512);
m_pio_write = true; // required for call_load of pio_attached_device
m_pio_writable = false;
m_pio_handshakein = false;
diff --git a/src/devices/bus/ti99_peb/ti_rs232.h b/src/devices/bus/ti99_peb/ti_rs232.h
index 371eefccdf9..255127c63ea 100644
--- a/src/devices/bus/ti99_peb/ti_rs232.h
+++ b/src/devices/bus/ti99_peb/ti_rs232.h
@@ -30,7 +30,7 @@ class ti_rs232_pio_device : public ti_expansion_card_device
friend class ti_rs232_attached_device;
public:
- ti_rs232_pio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_rs232_pio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -56,16 +56,16 @@ protected:
private:
void incoming_dtr(int uartind, line_state value);
- void transmit_data(int uartind, UINT8 value);
- UINT8 map_lines_out(int uartind, UINT8 value);
- UINT8 map_lines_in(int uartind, UINT8 value);
+ void transmit_data(int uartind, uint8_t value);
+ uint8_t map_lines_out(int uartind, uint8_t value);
+ uint8_t map_lines_in(int uartind, uint8_t value);
void receive_data_or_line_state(int uartind);
void set_bit(int uartind, int line, int value);
void configure_interface(int uartind, int type, int value);
- void output_line_state(int uartind, int mask, UINT8 value);
- void output_exception(int uartind, int param, UINT8 value);
- void ctrl_callback(int uartind, int type, UINT8 data);
+ void output_line_state(int uartind, int mask, uint8_t value);
+ void output_exception(int uartind, int param, uint8_t value);
+ void ctrl_callback(int uartind, int type, uint8_t data);
// UART chips
tms9902_device* m_uart[2];
@@ -75,15 +75,15 @@ private:
// Connected image (file) that represents the device connected to the
// parallel interface
ti_pio_attached_device* m_piodev;
- UINT8* m_dsrrom;
+ uint8_t* m_dsrrom;
// Input buffer for each UART. We have to copy the contents of sdlsocket here
// because the buffer in corefile will be lost on the next write operation
- std::unique_ptr<UINT8[]> m_recvbuf[2];
+ std::unique_ptr<uint8_t[]> m_recvbuf[2];
int m_bufpos[2], m_buflen[2];
// Latches the state of the output lines for UART0/UART1
- UINT8 m_signals[2];
+ uint8_t m_signals[2];
int m_recv_mode[2]; // May be NORMAL or ESC
// Baud rate management
@@ -106,7 +106,7 @@ private:
bool m_pio_write; // true if image is to be written to
/* Keeps the value put on the bus when SENILA becomes active. */
- UINT8 m_ila;
+ uint8_t m_ila;
};
/****************************************************************************/
@@ -117,7 +117,7 @@ private:
class ti_rs232_attached_device : public device_t, public device_image_interface
{
public:
- ti_rs232_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_rs232_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
iodevice_t image_type() const override { return IO_SERIAL; }
bool is_readable() const override { return true; }
@@ -144,7 +144,7 @@ private:
class ti_pio_attached_device : public device_t, public device_image_interface
{
public:
- ti_pio_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti_pio_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
iodevice_t image_type() const override { return IO_PARALLEL; }
bool is_readable() const override { return true; }
diff --git a/src/devices/bus/ti99_peb/tn_ide.cpp b/src/devices/bus/ti99_peb/tn_ide.cpp
index e7bbbc06a3f..371802d4d99 100644
--- a/src/devices/bus/ti99_peb/tn_ide.cpp
+++ b/src/devices/bus/ti99_peb/tn_ide.cpp
@@ -49,7 +49,7 @@ enum
cru_reg_reset = 0x80
};
-nouspikel_ide_interface_device::nouspikel_ide_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nouspikel_ide_interface_device::nouspikel_ide_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti_expansion_card_device(mconfig, TI99_IDE, "Nouspikel IDE interface card", tag, owner, clock, "ti99_ide", __FILE__), m_ata_irq(false),
m_cru_register(0), m_rtc(nullptr),
m_ata(*this, "ata"), m_clk_irq(false), m_sram_enable(false),
@@ -63,7 +63,7 @@ nouspikel_ide_interface_device::nouspikel_ide_interface_device(const machine_con
*/
READ8Z_MEMBER(nouspikel_ide_interface_device::crureadz)
{
- UINT8 reply = 0;
+ uint8_t reply = 0;
if ((offset & 0xff00)==m_cru_base)
{
int bit = (offset >> 4) & 7;
@@ -127,7 +127,7 @@ WRITE8_MEMBER(nouspikel_ide_interface_device::cruwrite)
*/
READ8Z_MEMBER(nouspikel_ide_interface_device::readz)
{
- UINT8 reply = 0;
+ uint8_t reply = 0;
if (space.debugger_access()) return;
if (((offset & m_select_mask)==m_select_value) && m_selected)
diff --git a/src/devices/bus/ti99_peb/tn_ide.h b/src/devices/bus/ti99_peb/tn_ide.h
index e4bb41e2642..08a1a20f609 100644
--- a/src/devices/bus/ti99_peb/tn_ide.h
+++ b/src/devices/bus/ti99_peb/tn_ide.h
@@ -24,7 +24,7 @@ extern const device_type TI99_IDE;
class nouspikel_ide_interface_device : public ti_expansion_card_device
{
public:
- nouspikel_ide_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nouspikel_ide_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -55,8 +55,8 @@ private:
bool m_tms9995_mode;
- UINT16 m_input_latch;
- UINT16 m_output_latch;
+ uint16_t m_input_latch;
+ uint16_t m_output_latch;
required_device<ram_device> m_ram;
};
diff --git a/src/devices/bus/ti99_peb/tn_usbsm.cpp b/src/devices/bus/ti99_peb/tn_usbsm.cpp
index b59fbdffe7d..22978be8625 100644
--- a/src/devices/bus/ti99_peb/tn_usbsm.cpp
+++ b/src/devices/bus/ti99_peb/tn_usbsm.cpp
@@ -54,7 +54,7 @@ enum
FEEPROM_WRITE_ENABLE = 0x10
};
-nouspikel_usb_smartmedia_device::nouspikel_usb_smartmedia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+nouspikel_usb_smartmedia_device::nouspikel_usb_smartmedia_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti_expansion_card_device(mconfig, TI99_USBSM, "Nouspikel USB/Smartmedia card", tag, owner, clock, "ti99_usbsm", __FILE__),
m_feeprom_page(0),
m_sram_page(0),
@@ -80,7 +80,7 @@ READ8Z_MEMBER(nouspikel_usb_smartmedia_device::crureadz)
{
if ((offset & 0xff00)==m_cru_base)
{
- UINT8 reply = 0;
+ uint8_t reply = 0;
offset &= 3;
if (offset == 0)
diff --git a/src/devices/bus/ti99_peb/tn_usbsm.h b/src/devices/bus/ti99_peb/tn_usbsm.h
index 6769783cd5a..b974f08511e 100644
--- a/src/devices/bus/ti99_peb/tn_usbsm.h
+++ b/src/devices/bus/ti99_peb/tn_usbsm.h
@@ -25,7 +25,7 @@ extern const device_type TI99_USBSM;
class nouspikel_usb_smartmedia_device : public ti_expansion_card_device
{
public:
- nouspikel_usb_smartmedia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ nouspikel_usb_smartmedia_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -50,8 +50,8 @@ private:
bool m_enable_sm;
bool m_write_flash;
- UINT16 m_input_latch;
- UINT16 m_output_latch;
+ uint16_t m_input_latch;
+ uint16_t m_output_latch;
required_device<ram_device> m_ram_lb;
required_device<ram_device> m_ram_hb;
diff --git a/src/devices/bus/ti99x/990_dk.cpp b/src/devices/bus/ti99x/990_dk.cpp
index 7b6c8e9e36e..f36e93a963e 100644
--- a/src/devices/bus/ti99x/990_dk.cpp
+++ b/src/devices/bus/ti99x/990_dk.cpp
@@ -42,7 +42,7 @@ enum
const device_type FD800 = &device_creator<fd800_legacy_device>;
-fd800_legacy_device::fd800_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+fd800_legacy_device::fd800_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, FD800, "TI FD800 Diablo floppy disk controller", tag, owner, clock, "fd800", __FILE__),
m_recv_buf(0), m_stat_reg(0), m_xmit_buf(0), m_cmd_reg(0), m_interrupt_f_f(0),
m_int_line(*this), m_buf_pos(0), m_buf_mode(), m_unit(0), m_sector(0)
@@ -104,7 +104,7 @@ void fd800_machine_init(void (*interrupt_callback)(running_machine &machine, int
*/
int fd800_legacy_device::read_id(int unit, int head, int *cylinder_id, int *sector_id)
{
- //UINT8 revolution_count;*/
+ //uint8_t revolution_count;*/
// chrn_id id;
//revolution_count = 0;*/
@@ -136,7 +136,7 @@ int fd800_legacy_device::read_id(int unit, int head, int *cylinder_id, int *sect
*/
int fd800_legacy_device::find_sector(int unit, int head, int sector, int *data_id)
{
-/* UINT8 revolution_count;
+/* uint8_t revolution_count;
chrn_id id;
revolution_count = 0;
diff --git a/src/devices/bus/ti99x/990_dk.h b/src/devices/bus/ti99x/990_dk.h
index ffb7f79784a..e7cbed7b985 100644
--- a/src/devices/bus/ti99x/990_dk.h
+++ b/src/devices/bus/ti99x/990_dk.h
@@ -14,7 +14,7 @@ extern const device_type FD800;
class fd800_legacy_device : public device_t
{
public:
- fd800_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ fd800_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER( cru_r );
DECLARE_WRITE8_MEMBER( cru_w );
@@ -36,10 +36,10 @@ private:
void do_write(void);
void do_cmd(void);
- UINT16 m_recv_buf;
- UINT16 m_stat_reg;
- UINT16 m_xmit_buf;
- UINT16 m_cmd_reg;
+ uint16_t m_recv_buf;
+ uint16_t m_stat_reg;
+ uint16_t m_xmit_buf;
+ uint16_t m_cmd_reg;
int m_interrupt_f_f;
devcb_write_line m_int_line;
@@ -48,7 +48,7 @@ private:
bm_off, bm_read, bm_write
};
- UINT8 m_buf[128];
+ uint8_t m_buf[128];
int m_buf_pos;
buf_mode_t m_buf_mode;
int m_unit;
diff --git a/src/devices/bus/ti99x/990_hd.cpp b/src/devices/bus/ti99x/990_hd.cpp
index 6c6fdda6c5d..7882a8f37e3 100644
--- a/src/devices/bus/ti99x/990_hd.cpp
+++ b/src/devices/bus/ti99x/990_hd.cpp
@@ -38,16 +38,16 @@ for TI990. */
/* machine-independent big-endian 32-bit integer */
struct UINT32BE
{
- UINT8 bytes[4];
+ uint8_t bytes[4];
};
-static inline UINT32 get_UINT32BE(UINT32BE word)
+static inline uint32_t get_UINT32BE(UINT32BE word)
{
return (word.bytes[0] << 24) | (word.bytes[1] << 16) | (word.bytes[2] << 8) | word.bytes[3];
}
#ifdef UNUSED_FUNCTION
-static inline void set_UINT32BE(UINT32BE *word, UINT32 data)
+static inline void set_UINT32BE(UINT32BE *word, uint32_t data)
{
word->bytes[0] = (data >> 24) & 0xff;
word->bytes[1] = (data >> 16) & 0xff;
@@ -119,7 +119,7 @@ enum
};
/* masks for computer-controlled bit in each controller register */
-static const UINT16 w_mask[8] =
+static const uint16_t w_mask[8] =
{
0x000f, /* Controllers should prevent overwriting of w0 status bits, and I know
that some controllers do so. */
@@ -422,7 +422,7 @@ void ti990_hdc_device::store_registers()
int dma_address;
int byte_count;
- UINT16 buffer[3];
+ uint16_t buffer[3];
int i, real_word_count;
int dsk_sel = cur_disk_unit();
@@ -481,7 +481,7 @@ void ti990_hdc_device::write_format()
unsigned int cylinder, head, sector;
unsigned int lba;
- UINT8 buffer[MAX_SECTOR_SIZE];
+ uint8_t buffer[MAX_SECTOR_SIZE];
int bytes_written;
int dsk_sel = cur_disk_unit();
@@ -554,7 +554,7 @@ void ti990_hdc_device::read_data()
unsigned int cylinder, head, sector;
unsigned int lba;
- UINT8 buffer[MAX_SECTOR_SIZE];
+ uint8_t buffer[MAX_SECTOR_SIZE];
int bytes_to_read;
int bytes_read;
int i;
@@ -654,8 +654,8 @@ void ti990_hdc_device::write_data()
unsigned int cylinder, head, sector;
unsigned int lba;
- UINT8 buffer[MAX_SECTOR_SIZE];
- UINT16 word;
+ uint8_t buffer[MAX_SECTOR_SIZE];
+ uint16_t word;
int bytes_written;
int i;
@@ -765,7 +765,7 @@ void ti990_hdc_device::unformatted_read()
unsigned int cylinder, head, sector;
- UINT16 buffer[3];
+ uint16_t buffer[3];
int i, real_word_count;
int dsk_sel = cur_disk_unit();
@@ -942,7 +942,7 @@ WRITE16_MEMBER(ti990_hdc_device::write)
/* write protect if a command is in progress */
if (m_w[7] & w7_idle)
{
- UINT16 old_data = m_w[offset];
+ uint16_t old_data = m_w[offset];
/* Only write writable bits AND honor byte accesses (ha!) */
m_w[offset] = (m_w[offset] & ((~w_mask[offset]) | mem_mask)) | (data & w_mask[offset] & ~mem_mask);
@@ -976,7 +976,7 @@ MACHINE_CONFIG_END
const device_type TI990_HDC = &device_creator<ti990_hdc_device>;
-ti990_hdc_device::ti990_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti990_hdc_device::ti990_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TI990_HDC, "Generic TI-990 Hard Disk Controller", tag, owner, clock, "hdc_990", __FILE__),
m_interrupt_callback(*this)
{
diff --git a/src/devices/bus/ti99x/990_hd.h b/src/devices/bus/ti99x/990_hd.h
index f6468a807f9..8c1435d0eb5 100644
--- a/src/devices/bus/ti99x/990_hd.h
+++ b/src/devices/bus/ti99x/990_hd.h
@@ -15,7 +15,7 @@ overriden if more than one controller is used */
class ti990_hdc_device : public device_t
{
public:
- ti990_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti990_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &static_set_int_callback(device_t &device, _Object object) { return downcast<ti990_hdc_device &>(device).m_interrupt_callback.set_callback(object); }
@@ -65,7 +65,7 @@ private:
unsigned int cylinders, heads, sectors_per_track, bytes_per_sector;
};
- UINT16 m_w[8];
+ uint16_t m_w[8];
devcb_write_line m_interrupt_callback;
diff --git a/src/devices/bus/ti99x/990_tap.cpp b/src/devices/bus/ti99x/990_tap.cpp
index dc2a927673a..7ab14725f19 100644
--- a/src/devices/bus/ti99x/990_tap.cpp
+++ b/src/devices/bus/ti99x/990_tap.cpp
@@ -69,7 +69,7 @@ enum
w7_tape_error = 0x0001
};
-static const UINT16 w_mask[8] =
+static const uint16_t w_mask[8] =
{
0x000f, /* Controllers should prevent overwriting of w0 status bits, and I know
that some controllers do so. */
@@ -123,7 +123,7 @@ void tap_990_device::update_interrupt()
*/
void tap_990_device::cmd_read_binary_forward()
{
- UINT8 buffer[256];
+ uint8_t buffer[256];
int reclen;
int dma_address;
@@ -349,7 +349,7 @@ update_registers:
*/
void tap_990_device::cmd_record_skip_forward()
{
- UINT8 buffer[4];
+ uint8_t buffer[4];
int reclen;
int record_count;
@@ -485,7 +485,7 @@ update_registers:
*/
void tap_990_device::cmd_record_skip_reverse()
{
- UINT8 buffer[4];
+ uint8_t buffer[4];
int reclen;
int record_count;
@@ -871,7 +871,7 @@ WRITE16_MEMBER( tap_990_device::write )
/* write protect if a command is in progress */
if (m_w[7] & w7_idle)
{
- UINT16 old_data = m_w[offset];
+ uint16_t old_data = m_w[offset];
/* Only write writable bits AND honor byte accesses (ha!) */
m_w[offset] = (m_w[offset] & ((~w_mask[offset]) | mem_mask)) | (data & w_mask[offset] & ~mem_mask);
@@ -892,7 +892,7 @@ class ti990_tape_image_device : public device_t,
{
public:
// construction/destruction
- ti990_tape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti990_tape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// image-level overrides
virtual iodevice_t image_type() const override { return IO_MAGTAPE; }
@@ -916,7 +916,7 @@ private:
const device_type TI990_TAPE = &device_creator<ti990_tape_image_device>;
-ti990_tape_image_device::ti990_tape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti990_tape_image_device::ti990_tape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TI990_TAPE, "TI-990 Magnetic Tape", tag, owner, clock, "ti990_tape_image", __FILE__),
device_image_interface(mconfig, *this)
{
@@ -976,7 +976,7 @@ MACHINE_CONFIG_END
const device_type TI990_TAPE_CTRL = &device_creator<tap_990_device>;
-tap_990_device::tap_990_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tap_990_device::tap_990_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TI990_TAPE_CTRL, "Generic TI-990 Tape Controller", tag, owner, clock, "tap_990", __FILE__),
m_int_line(*this)
{
diff --git a/src/devices/bus/ti99x/990_tap.h b/src/devices/bus/ti99x/990_tap.h
index 6622e2af587..b4599837aa5 100644
--- a/src/devices/bus/ti99x/990_tap.h
+++ b/src/devices/bus/ti99x/990_tap.h
@@ -18,7 +18,7 @@ struct tape_unit_t
class tap_990_device : public device_t
{
public:
- tap_990_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tap_990_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &static_set_int_callback(device_t &device, _Object object)
{
return downcast<tap_990_device &>(device).m_int_line.set_callback(object);
@@ -54,7 +54,7 @@ private:
devcb_write_line m_int_line;
- UINT16 m_w[8];
+ uint16_t m_w[8];
tape_unit_t m_tape[MAX_TAPE_UNIT];
};
diff --git a/src/devices/bus/ti99x/998board.cpp b/src/devices/bus/ti99x/998board.cpp
index 290ca12e10f..074336f3441 100644
--- a/src/devices/bus/ti99x/998board.cpp
+++ b/src/devices/bus/ti99x/998board.cpp
@@ -121,7 +121,7 @@
#define TRACE_GROM 0
#define TRACE_PUNMAP 0
-mainboard8_device::mainboard8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mainboard8_device::mainboard8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MAINBOARD8, "TI-99/8 Mainboard", tag, owner, clock, "ti998_mainboard", __FILE__),
m_A14_set(false),
m_pending_write(false),
@@ -457,7 +457,7 @@ WRITE_LINE_MEMBER( mainboard8_device::msast_in )
READ8_MEMBER( mainboard8_device::read )
{
- UINT8 value = 0;
+ uint8_t value = 0;
const char* what;
// =================================================
@@ -917,7 +917,7 @@ const device_type MAINBOARD8 = &device_creator<mainboard8_device>;
***************************************************************************/
-vaquerro_device::vaquerro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vaquerro_device::vaquerro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VAQUERRO, "Logical Address Space Decoder", tag, owner, clock, "ti998_vaquerro", __FILE__),
m_crus(ASSERT_LINE),
m_crugl(ASSERT_LINE),
@@ -1366,7 +1366,7 @@ enum
INTERNAL
};
-mofetta_device::mofetta_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mofetta_device::mofetta_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, MOFETTA, "Physical Address Space Decoder", tag, owner, clock, "ti998_mofetta", __FILE__),
m_gotfirstword(false)
{
@@ -1652,7 +1652,7 @@ const device_type MOFETTA = &device_creator<mofetta_device>;
***************************************************************************/
-amigo_device::amigo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+amigo_device::amigo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, AMIGO, "Address space mapper", tag, owner, clock, "ti998_amigo", __FILE__),
m_logical_space(true),
m_crus(ASSERT_LINE)
@@ -1798,7 +1798,7 @@ SETOFFSET_MEMBER( amigo_device::set_address )
READ8_MEMBER( amigo_device::read )
{
// Read the protection status bits and reset them
- UINT8 value = m_protflag;
+ uint8_t value = m_protflag;
m_protflag = 0;
return value;
}
@@ -2002,7 +2002,7 @@ enum
SHSK = 0x01
};
-oso_device::oso_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+oso_device::oso_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, OSO, "Hexbus interface", tag, owner, clock, "oso", __FILE__), m_data(0), m_status(0), m_control(0), m_xmit(0)
{
}
diff --git a/src/devices/bus/ti99x/998board.h b/src/devices/bus/ti99x/998board.h
index ab0682b6b38..3d974d87e73 100644
--- a/src/devices/bus/ti99x/998board.h
+++ b/src/devices/bus/ti99x/998board.h
@@ -112,7 +112,7 @@ public:
class vaquerro_device : public device_t
{
public:
- vaquerro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vaquerro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void device_start() override;
void device_reset() override;
@@ -202,7 +202,7 @@ private:
class mofetta_device : public device_t
{
public:
- mofetta_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mofetta_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void device_start() override;
void device_reset() override;
@@ -286,7 +286,7 @@ private:
class amigo_device : public device_t
{
public:
- amigo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ amigo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void device_start() override;
void device_reset() override;
@@ -306,7 +306,7 @@ public:
DECLARE_READ_LINE_MEMBER( sramcs_out );
DECLARE_READ_LINE_MEMBER( skdrcs_out );
- void connect_sram(UINT8* sram) { m_sram = sram; }
+ void connect_sram(uint8_t* sram) { m_sram = sram; }
bool mapper_accessed() { return m_mapper_accessed; }
private:
@@ -319,16 +319,16 @@ private:
// Address mapper registers. Each offset is selected by the first 4 bits
// of the logical address.
- UINT32 m_base_register[16];
+ uint32_t m_base_register[16];
// Indicates a logical space access
bool m_logical_space;
// Physical address
- UINT32 m_physical_address;
+ uint32_t m_physical_address;
// Pointer to SRAM where AMIGO needs to upload/download its map values
- UINT8* m_sram;
+ uint8_t* m_sram;
// Pointer to mainboard
mainboard8_device* m_mainboard;
@@ -361,13 +361,13 @@ private:
bool m_hold_acknowledged;
// Address in SRAM during DMA
- UINT32 m_sram_address;
+ uint32_t m_sram_address;
// Number of the currently loaded/save base register
int m_basereg;
// Latched value for mapper DMA transfer
- UINT32 m_mapvalue;
+ uint32_t m_mapvalue;
};
/*
@@ -376,22 +376,22 @@ private:
class oso_device : public device_t
{
public:
- oso_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ oso_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
void device_start() override;
private:
- UINT8 m_data;
- UINT8 m_status;
- UINT8 m_control;
- UINT8 m_xmit;
+ uint8_t m_data;
+ uint8_t m_status;
+ uint8_t m_control;
+ uint8_t m_xmit;
};
class mainboard8_device : public device_t
{
public:
- mainboard8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mainboard8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// Memory space
DECLARE_READ8_MEMBER( read );
@@ -469,7 +469,7 @@ private:
// Hold the value of the data bus. In a real machine, the data bus continues
// to show that value, but in this emulation we have a push mechanism.
- UINT8 m_latched_data;
+ uint8_t m_latched_data;
// Hold the level of the GROMCLK line
int m_gromclk;
@@ -534,9 +534,9 @@ private:
bool m_p3grom_idle;
// ROM area of the system.
- UINT8* m_rom0;
- UINT8* m_rom1;
- UINT8* m_pascalrom;
+ uint8_t* m_rom0;
+ uint8_t* m_rom1;
+ uint8_t* m_pascalrom;
};
#define MCFG_MAINBOARD8_READY_CALLBACK(_write) \
diff --git a/src/devices/bus/ti99x/datamux.cpp b/src/devices/bus/ti99x/datamux.cpp
index dcda3cc0cf3..34f25a89c91 100644
--- a/src/devices/bus/ti99x/datamux.cpp
+++ b/src/devices/bus/ti99x/datamux.cpp
@@ -74,7 +74,7 @@
/*
Constructor
*/
-ti99_datamux_device::ti99_datamux_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti99_datamux_device::ti99_datamux_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, DATAMUX, "Databus multiplexer", tag, owner, clock, "ti99_datamux", __FILE__),
m_video(*owner, VDP_TAG),
m_sound(*owner, TISOUNDCHIP_TAG),
@@ -106,7 +106,7 @@ ti99_datamux_device::ti99_datamux_device(const machine_config &mconfig, const ch
DEVICE ACCESSOR FUNCTIONS
***************************************************************************/
-void ti99_datamux_device::read_all(address_space& space, UINT16 addr, UINT8 *value)
+void ti99_datamux_device::read_all(address_space& space, uint16_t addr, uint8_t *value)
{
// Valid access
bool validaccess = ((addr & 0x0400)==0);
@@ -144,7 +144,7 @@ void ti99_datamux_device::read_all(address_space& space, UINT16 addr, UINT8 *val
m_peb->memen_in(CLEAR_LINE);
}
-void ti99_datamux_device::write_all(address_space& space, UINT16 addr, UINT8 value)
+void ti99_datamux_device::write_all(address_space& space, uint16_t addr, uint8_t value)
{
// GROM access
if ((addr & 0xf801)==0x9800)
@@ -180,7 +180,7 @@ void ti99_datamux_device::write_all(address_space& space, UINT16 addr, UINT8 val
m_peb->memen_in(CLEAR_LINE);
}
-void ti99_datamux_device::setaddress_all(address_space& space, UINT16 addr)
+void ti99_datamux_device::setaddress_all(address_space& space, uint16_t addr)
{
line_state a14 = ((addr & 2)!=0)? ASSERT_LINE : CLEAR_LINE;
@@ -223,10 +223,10 @@ void ti99_datamux_device::setaddress_all(address_space& space, UINT16 addr)
mapped devices are excluded because their state would be changed
unpredictably by the debugger access.
*/
-UINT16 ti99_datamux_device::debugger_read(address_space& space, UINT16 addr)
+uint16_t ti99_datamux_device::debugger_read(address_space& space, uint16_t addr)
{
- UINT16 addrb = addr << 1;
- UINT16 value = 0;
+ uint16_t addrb = addr << 1;
+ uint16_t value = 0;
if ((addrb & 0xe000)==0x0000) value = m_consolerom[(addrb & 0x1fff)>>1];
else
@@ -248,8 +248,8 @@ UINT16 ti99_datamux_device::debugger_read(address_space& space, UINT16 addr)
}
else
{
- UINT8 lval = 0;
- UINT8 hval = 0;
+ uint8_t lval = 0;
+ uint8_t hval = 0;
if ((addrb & 0xe000)==0x6000)
{
@@ -268,9 +268,9 @@ UINT16 ti99_datamux_device::debugger_read(address_space& space, UINT16 addr)
return value;
}
-void ti99_datamux_device::debugger_write(address_space& space, UINT16 addr, UINT16 data)
+void ti99_datamux_device::debugger_write(address_space& space, uint16_t addr, uint16_t data)
{
- UINT16 addrb = addr << 1;
+ uint16_t addrb = addr << 1;
if ((addrb & 0xe000)==0x0000) return;
@@ -319,7 +319,7 @@ void ti99_datamux_device::debugger_write(address_space& space, UINT16 addr, UINT
*/
READ16_MEMBER( ti99_datamux_device::read )
{
- UINT16 value = 0;
+ uint16_t value = 0;
// Care for debugger
if (space.debugger_access())
@@ -355,7 +355,7 @@ READ16_MEMBER( ti99_datamux_device::read )
{
// The byte from the odd address has already been read into the latch
// Reading the even address now (addr)
- UINT8 hbyte = 0;
+ uint8_t hbyte = 0;
read_all(space, m_addr_buf, &hbyte);
if (TRACE_ACCESS) logerror("Read even byte from address %04x -> %02x\n", m_addr_buf, hbyte);
@@ -589,7 +589,7 @@ void ti99_datamux_device::device_stop(void)
void ti99_datamux_device::device_reset(void)
{
- m_consolerom = (UINT16*)owner()->memregion(CONSOLEROM)->base();
+ m_consolerom = (uint16_t*)owner()->memregion(CONSOLEROM)->base();
m_use32k = (ioport("RAM")->read()==1);
m_console_groms_present = (ioport("GROMENA")->read()==1);
diff --git a/src/devices/bus/ti99x/datamux.h b/src/devices/bus/ti99x/datamux.h
index 3fe74f4ead2..828abebe667 100644
--- a/src/devices/bus/ti99x/datamux.h
+++ b/src/devices/bus/ti99x/datamux.h
@@ -30,7 +30,7 @@ extern const device_type DATAMUX;
class ti99_datamux_device : public device_t
{
public:
- ti99_datamux_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti99_datamux_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ16_MEMBER( read );
DECLARE_WRITE16_MEMBER( write );
DECLARE_SETOFFSET_MEMBER( setoffset );
@@ -77,23 +77,23 @@ private:
address_space* m_spacep;
// Console ROM
- UINT16* m_consolerom;
+ uint16_t* m_consolerom;
// Console GROMs
tmc0430_device* m_grom[3];
// Common read routine
- void read_all(address_space& space, UINT16 addr, UINT8 *target);
+ void read_all(address_space& space, uint16_t addr, uint8_t *target);
// Common write routine
- void write_all(address_space& space, UINT16 addr, UINT8 value);
+ void write_all(address_space& space, uint16_t addr, uint8_t value);
// Common set address method
- void setaddress_all(address_space& space, UINT16 addr);
+ void setaddress_all(address_space& space, uint16_t addr);
// Debugger access
- UINT16 debugger_read(address_space& space, UINT16 addr);
- void debugger_write(address_space& space, UINT16 addr, UINT16 data);
+ uint16_t debugger_read(address_space& space, uint16_t addr);
+ void debugger_write(address_space& space, uint16_t addr, uint16_t data);
// Join own READY and external READY
void ready_join();
@@ -102,7 +102,7 @@ private:
devcb_write_line m_ready;
// Address latch (emu). In reality, the address bus remains constant.
- UINT16 m_addr_buf;
+ uint16_t m_addr_buf;
// DBIN line
int m_dbin;
@@ -114,7 +114,7 @@ private:
int m_sysready;
// Latch which stores the first (odd) byte
- UINT8 m_latch;
+ uint8_t m_latch;
// Counter for the wait states.
int m_waitcount;
@@ -123,7 +123,7 @@ private:
bool m_use32k;
// Memory base for piggy-back 32K expansion. If 0, expansion is not used.
- UINT16 m_base32k;
+ uint16_t m_base32k;
// Console GROMs are available (the HSGPL expects them to be removed)
bool m_console_groms_present;
diff --git a/src/devices/bus/ti99x/genboard.cpp b/src/devices/bus/ti99x/genboard.cpp
index 404cfbc0012..581b829c08e 100644
--- a/src/devices/bus/ti99x/genboard.cpp
+++ b/src/devices/bus/ti99x/genboard.cpp
@@ -209,7 +209,7 @@
#define SRAM_PAR_TAG ":sram"
#define DRAM_PAR_TAG ":dram"
-geneve_mapper_device::geneve_mapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+geneve_mapper_device::geneve_mapper_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, GENEVE_MAPPER, "Geneve Gate Array", tag, owner, clock, "geneve_mapper", __FILE__), m_gromwaddr_LSB(false),
m_gromraddr_LSB(false), m_grom_address(0), m_video_waitstates(false),
m_extra_waitstates(false), m_ready_asserted(false), m_read_mode(false),
@@ -228,7 +228,7 @@ geneve_mapper_device::geneve_mapper_device(const machine_config &mconfig, const
INPUT_CHANGED_MEMBER( geneve_mapper_device::settings_changed )
{
- int number = (int)((UINT64)param&0x03);
+ int number = (int)((uint64_t)param&0x03);
int value = newval;
switch (number)
@@ -265,7 +265,7 @@ INPUT_CHANGED_MEMBER( geneve_mapper_device::settings_changed )
*/
READ8_MEMBER( geneve_mapper_device::read_grom )
{
- UINT8 reply;
+ uint8_t reply;
if (offset & 0x0002)
{
// GROM address handling
@@ -312,7 +312,7 @@ WRITE8_MEMBER( geneve_mapper_device::write_grom )
}
else
{
- m_grom_address = (m_grom_address & 0x00ff) | ((UINT16)data<<8);
+ m_grom_address = (m_grom_address & 0x00ff) | ((uint16_t)data<<8);
m_gromwaddr_LSB = true;
}
}
@@ -457,7 +457,7 @@ enum
*/
READ8_MEMBER( geneve_mapper_device::readm )
{
- UINT8 value = 0;
+ uint8_t value = 0;
decdata *dec;
decdata debug;
@@ -1225,7 +1225,7 @@ void geneve_mapper_device::decode(address_space& space, offs_t offset, bool read
*/
READ8_MEMBER( geneve_mapper_device::read_from_pfm )
{
- UINT8 value;
+ uint8_t value;
if (!m_pfm_output_enable) return 0;
int address = (offset & 0x01ffff) | (m_pfm_bank<<17);
@@ -1497,7 +1497,7 @@ const device_type GENEVE_MAPPER = &device_creator<geneve_mapper_device>;
static const char *const KEYNAMES[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4", "KEY5", "KEY6", "KEY7" };
-static const UINT8 MF1_CODE[0xe] =
+static const uint8_t MF1_CODE[0xe] =
{
/* extended keys that are equivalent to non-extended keys */
0x1c, /* keypad enter */
@@ -1525,7 +1525,7 @@ static const UINT8 MF1_CODE[0xe] =
0x53 /* delete */
};
-geneve_keyboard_device::geneve_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+geneve_keyboard_device::geneve_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, GENEVE_KEYBOARD, "Geneve XT-style keyboard", tag, owner, clock, "geneve_keyboard", __FILE__),
m_interrupt(*this), m_key_reset(false), m_key_queue_length(0), m_key_queue_head(0), m_key_in_buffer(false), m_key_numlock_state(false), m_key_ctrl_state(0), m_key_alt_state(0),
m_key_real_shift_state(0), m_key_fake_shift_state(false), m_key_fake_unshift_state(false), m_key_autorepeat_key(0), m_key_autorepeat_timer(0), m_keep_keybuf(false),
@@ -1548,8 +1548,8 @@ void geneve_keyboard_device::device_timer(emu_timer &timer, device_timer_id id,
void geneve_keyboard_device::poll()
{
- UINT32 keystate;
- UINT32 key_transitions;
+ uint32_t keystate;
+ uint32_t key_transitions;
int i, j;
int keycode;
int pressed;
@@ -1747,7 +1747,7 @@ void geneve_keyboard_device::poll()
}
}
-UINT8 geneve_keyboard_device::get_recent_key()
+uint8_t geneve_keyboard_device::get_recent_key()
{
if (m_key_in_buffer) return m_key_queue[m_key_queue_head];
else return 0;
@@ -1996,7 +1996,7 @@ const device_type GENEVE_KEYBOARD = &device_creator<geneve_keyboard_device>;
Mouse support
****************************************************************************/
-geneve_mouse_device::geneve_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+geneve_mouse_device::geneve_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, GENEVE_MOUSE, "Geneve mouse", tag, owner, clock, "geneve_mouse", __FILE__), m_v9938(nullptr), m_last_mx(0), m_last_my(0)
{
}
diff --git a/src/devices/bus/ti99x/genboard.h b/src/devices/bus/ti99x/genboard.h
index 932989cf8d7..17683ba0358 100644
--- a/src/devices/bus/ti99x/genboard.h
+++ b/src/devices/bus/ti99x/genboard.h
@@ -32,7 +32,7 @@ extern const device_type GENEVE_MAPPER;
class geneve_mouse_device : public device_t
{
public:
- geneve_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ geneve_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void poll();
line_state left_button(); // left button is not connected to the V9938 but to a TMS9901 pin
@@ -60,11 +60,11 @@ private:
class geneve_keyboard_device : public device_t
{
public:
- geneve_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ geneve_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_WRITE_LINE_MEMBER( reset_line );
DECLARE_WRITE_LINE_MEMBER( send_scancodes );
DECLARE_WRITE_LINE_MEMBER( clock_control );
- UINT8 get_recent_key();
+ uint8_t get_recent_key();
template<class _Object> static devcb_base &static_set_int_callback(device_t &device, _Object object) { return downcast<geneve_keyboard_device &>(device).m_interrupt.set_callback(object); }
@@ -82,10 +82,10 @@ private:
bool m_key_reset;
int m_key_queue_length;
- UINT8 m_key_queue[KEYQUEUESIZE];
+ uint8_t m_key_queue[KEYQUEUESIZE];
int m_key_queue_head;
bool m_key_in_buffer;
- UINT32 m_key_state_save[4];
+ uint32_t m_key_state_save[4];
bool m_key_numlock_state;
int m_key_ctrl_state;
@@ -112,7 +112,7 @@ private:
class geneve_mapper_device : public device_t
{
public:
- geneve_mapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ geneve_mapper_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void set_geneve_mode(bool geneve);
void set_direct_mode(bool direct);
void set_cartridge_size(int size);
@@ -212,7 +212,7 @@ private:
geneve_keyboard_device* m_keyboard;
v9938_device* m_video;
peribox_device* m_peribox;
- UINT8* m_eprom;
+ uint8_t* m_eprom;
required_device<ram_device> m_sram;
required_device<ram_device> m_dram;
};
diff --git a/src/devices/bus/ti99x/gromport.cpp b/src/devices/bus/ti99x/gromport.cpp
index ac00f72df02..846efab7608 100644
--- a/src/devices/bus/ti99x/gromport.cpp
+++ b/src/devices/bus/ti99x/gromport.cpp
@@ -130,7 +130,7 @@
#define GKRACKER_ROM_TAG "gkracker_rom"
#define GKRACKER_NVRAM_TAG "gkracker_nvram"
-gromport_device::gromport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gromport_device::gromport_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: bus8z_device(mconfig, GROMPORT, "Cartridge port", tag, owner, clock, "gromport", __FILE__),
device_slot_interface(mconfig, *this),
m_connector(nullptr),
@@ -293,7 +293,7 @@ const device_type GROMPORT_SINGLE = &device_creator<single_conn_device>;
const device_type GROMPORT_MULTI = &device_creator<multi_conn_device>;
const device_type GROMPORT_GK = &device_creator<gkracker_device>;
-ti99_cartridge_connector_device::ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ti99_cartridge_connector_device::ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_gromport(nullptr)
{
@@ -309,7 +309,7 @@ void ti99_cartridge_connector_device::device_config_complete()
m_gromport = static_cast<gromport_device*>(owner());
}
-single_conn_device::single_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+single_conn_device::single_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti99_cartridge_connector_device(mconfig, GROMPORT_SINGLE, "Standard cartridge connector", tag, owner, clock, "single", __FILE__),
m_cartridge(nullptr)
{
@@ -432,7 +432,7 @@ machine_config_constructor single_conn_device::device_mconfig_additions() const
#define AUTO -1
-multi_conn_device::multi_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+multi_conn_device::multi_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti99_cartridge_connector_device(mconfig, GROMPORT_MULTI, "Multi-cartridge extender", tag, owner, clock, "multi", __FILE__),
m_active_slot(0),
m_fixed_slot(0),
@@ -571,7 +571,7 @@ READ8Z_MEMBER(multi_conn_device::readz)
{
if (m_cartridge[i] != nullptr)
{
- UINT8 newval = *value;
+ uint8_t newval = *value;
m_cartridge[i]->readz(space, offset, &newval, 0xff);
if (i==slot)
{
@@ -692,7 +692,7 @@ machine_config_constructor multi_conn_device::device_mconfig_additions() const
INPUT_CHANGED_MEMBER( multi_conn_device::switch_changed )
{
- if (TRACE_CHANGE) logerror("Slot changed %d - %d\n", (int)((UINT64)param & 0x07), newval);
+ if (TRACE_CHANGE) logerror("Slot changed %d - %d\n", (int)((uint64_t)param & 0x07), newval);
m_active_slot = m_fixed_slot = newval - 1;
}
@@ -826,7 +826,7 @@ enum
#define GKSWITCH4_TAG "GKSWITCH4"
#define GKSWITCH5_TAG "GKSWITCH5"
-gkracker_device::gkracker_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+gkracker_device::gkracker_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ti99_cartridge_connector_device(mconfig, GROMPORT_GK, "GRAMKracker", tag, owner, clock, "ti99_gkracker", __FILE__),
device_nvram_interface(mconfig, *this),
m_romspace_selected(false),
@@ -918,7 +918,7 @@ READ8Z_MEMBER(gkracker_device::readz)
if (m_cartridge != nullptr)
{
// For debugging
- UINT8 val1 = *value;
+ uint8_t val1 = *value;
// Read from the guest cartridge.
m_cartridge->readz(space, offset, value, mem_mask);
@@ -1011,8 +1011,8 @@ WRITE8_MEMBER( gkracker_device::cruwrite )
INPUT_CHANGED_MEMBER( gkracker_device::gk_changed )
{
- if (TRACE_GKRACKER) logerror("Input changed %d - %d\n", (int)((UINT64)param & 0x07), newval);
- m_gk_switch[(UINT64)param & 0x07] = newval;
+ if (TRACE_GKRACKER) logerror("Input changed %d - %d\n", (int)((uint64_t)param & 0x07), newval);
+ m_gk_switch[(uint64_t)param & 0x07] = newval;
}
void gkracker_device::insert(int index, ti99_cartridge_device* cart)
@@ -1033,12 +1033,12 @@ void gkracker_device::remove(int index)
void gkracker_device::gk_install_menu(const char* menutext, int len, int ptr, int next, int start)
{
const int base = 0x0000;
- m_ram_ptr[base + ptr] = (UINT8)((next >> 8) & 0xff);
- m_ram_ptr[base + ptr+1] = (UINT8)(next & 0xff);
- m_ram_ptr[base + ptr+2] = (UINT8)((start >> 8) & 0xff);
- m_ram_ptr[base + ptr+3] = (UINT8)(start & 0xff);
+ m_ram_ptr[base + ptr] = (uint8_t)((next >> 8) & 0xff);
+ m_ram_ptr[base + ptr+1] = (uint8_t)(next & 0xff);
+ m_ram_ptr[base + ptr+2] = (uint8_t)((start >> 8) & 0xff);
+ m_ram_ptr[base + ptr+3] = (uint8_t)(start & 0xff);
- m_ram_ptr[base + ptr+4] = (UINT8)(len & 0xff);
+ m_ram_ptr[base + ptr+4] = (uint8_t)(len & 0xff);
memcpy(m_ram_ptr + base + ptr+5, menutext, len);
}
@@ -1225,7 +1225,7 @@ static const pcb_type sw_pcbdefs[] =
{ 0, nullptr}
};
-ti99_cartridge_device::ti99_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti99_cartridge_device::ti99_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: bus8z_device(mconfig, TI99CART, "TI-99 cartridge", tag, owner, clock, "cartridge", __FILE__),
device_image_interface(mconfig, *this),
m_pcbtype(0),
@@ -1240,8 +1240,8 @@ void ti99_cartridge_device::prepare_cartridge()
{
int rom2_length;
- UINT8* grom_ptr;
- UINT8* rom_ptr;
+ uint8_t* grom_ptr;
+ uint8_t* rom_ptr;
memory_region *regg;
memory_region *regr;
@@ -1970,7 +1970,7 @@ READ8Z_MEMBER(ti99_super_cartridge::crureadz)
if ((offset & 0xfff0) == 0x0800)
{
if (TRACE_CRU) space.device().logerror("CRU accessed at %04x\n", offset);
- UINT8 val = 0x02 << (m_ram_page << 1);
+ uint8_t val = 0x02 << (m_ram_page << 1);
*value = (val >> ((offset - 0x0800)>>1)) & 0xff;
}
}
@@ -2520,7 +2520,7 @@ rpk::~rpk()
/*
Deliver the contents of the socket by name of the socket.
*/
-UINT8* rpk::get_contents_of_socket(const char *socket_name)
+uint8_t* rpk::get_contents_of_socket(const char *socket_name)
{
auto socket = m_sockets.find(socket_name);
if (socket == m_sockets.end()) return nullptr;
@@ -2572,12 +2572,12 @@ void rpk::close()
not a network socket)
***************************************************************/
-rpk_socket::rpk_socket(const char* id, int length, UINT8* contents, const char *pathname)
+rpk_socket::rpk_socket(const char* id, int length, uint8_t* contents, const char *pathname)
: m_id(id), m_length(length), m_contents(contents), m_pathname(pathname)
{
}
-rpk_socket::rpk_socket(const char* id, int length, UINT8* contents)
+rpk_socket::rpk_socket(const char* id, int length, uint8_t* contents)
: m_id(id), m_length(length), m_contents(contents), m_pathname(nullptr)
{
}
@@ -2585,7 +2585,7 @@ rpk_socket::rpk_socket(const char* id, int length, UINT8* contents)
/*
Locate a file in the ZIP container
*/
-int rpk_reader::find_file(util::archive_file &zip, const char *filename, UINT32 crc)
+int rpk_reader::find_file(util::archive_file &zip, const char *filename, uint32_t crc)
{
for (int header = zip.first_file(); header >= 0; header = zip.next_file())
{
@@ -2621,9 +2621,9 @@ std::unique_ptr<rpk_socket> rpk_reader::load_rom_resource(util::archive_file &zi
const char* crcstr;
const char* sha1;
util::archive_file::error ziperr;
- UINT32 crc;
+ uint32_t crc;
int length;
- UINT8* contents;
+ uint8_t* contents;
int header;
// find the file attribute (required)
@@ -2649,7 +2649,7 @@ std::unique_ptr<rpk_socket> rpk_reader::load_rom_resource(util::archive_file &zi
length = zip.current_uncompressed_length();
// Allocate storage
- contents = global_alloc_array_clear<UINT8>(length);
+ contents = global_alloc_array_clear<uint8_t>(length);
if (contents==nullptr) throw rpk_exception(RPK_OUT_OF_MEMORY);
// and unzip file from the zip file
@@ -2665,7 +2665,7 @@ std::unique_ptr<rpk_socket> rpk_reader::load_rom_resource(util::archive_file &zi
if (sha1 != nullptr)
{
util::hash_collection actual_hashes;
- actual_hashes.compute((const UINT8 *)contents, length, util::hash_collection::HASH_TYPES_CRC_SHA1);
+ actual_hashes.compute((const uint8_t *)contents, length, util::hash_collection::HASH_TYPES_CRC_SHA1);
util::hash_collection expected_hashes;
expected_hashes.add_from_string(util::hash_collection::HASH_SHA1, sha1, strlen(sha1));
@@ -2687,7 +2687,7 @@ std::unique_ptr<rpk_socket> rpk_reader::load_ram_resource(emu_options &options,
const char* ram_filename;
const char* ram_pname;
unsigned int length;
- UINT8* contents;
+ uint8_t* contents;
// find the length attribute
length_string = xml_get_attribute_string(ram_resource_node, "length", nullptr);
@@ -2715,7 +2715,7 @@ std::unique_ptr<rpk_socket> rpk_reader::load_ram_resource(emu_options &options,
}
// Allocate memory for this resource
- contents = global_alloc_array_clear<UINT8>(length);
+ contents = global_alloc_array_clear<uint8_t>(length);
if (contents==nullptr) throw rpk_exception(RPK_OUT_OF_MEMORY);
if (TRACE_RPK) printf("gromport/RPK: Allocating RAM buffer (%d bytes) for socket '%s'\n", length, socketname);
diff --git a/src/devices/bus/ti99x/gromport.h b/src/devices/bus/ti99x/gromport.h
index 34161cb6a5d..9e0765fd826 100644
--- a/src/devices/bus/ti99x/gromport.h
+++ b/src/devices/bus/ti99x/gromport.h
@@ -22,7 +22,7 @@ class ti99_cartridge_connector_device;
class gromport_device : public bus8z_device, public device_slot_interface
{
public:
- gromport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gromport_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
DECLARE_READ8Z_MEMBER(crureadz);
@@ -86,7 +86,7 @@ class ti99_cartridge_pcb;
class ti99_cartridge_device : public bus8z_device, public device_image_interface
{
public:
- ti99_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti99_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -164,7 +164,7 @@ public:
virtual bool is_grom_idle() =0;
protected:
- ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
virtual void device_config_complete() override;
gromport_device* m_gromport;
@@ -177,7 +177,7 @@ protected:
class single_conn_device : public ti99_cartridge_connector_device
{
public:
- single_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ single_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -210,7 +210,7 @@ private:
class multi_conn_device : public ti99_cartridge_connector_device
{
public:
- multi_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ multi_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -249,7 +249,7 @@ private:
class gkracker_device : public ti99_cartridge_connector_device, public device_nvram_interface
{
public:
- gkracker_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ gkracker_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8Z_MEMBER(readz) override;
DECLARE_WRITE8_MEMBER(write) override;
@@ -285,8 +285,8 @@ private:
bool m_romspace_selected;
int m_ram_page;
int m_grom_address;
- UINT8* m_ram_ptr;
- UINT8* m_grom_ptr;
+ uint8_t* m_ram_ptr;
+ uint8_t* m_grom_ptr;
bool m_waddr_LSB;
@@ -334,16 +334,16 @@ protected:
int m_rom_size;
int m_ram_size;
- UINT8* m_rom_ptr;
- UINT8* m_ram_ptr;
+ uint8_t* m_rom_ptr;
+ uint8_t* m_ram_ptr;
bool m_romspace_selected;
int m_rom_page; // for some cartridge types
- UINT8* m_grom_ptr; // for gromemu
+ uint8_t* m_grom_ptr; // for gromemu
int m_grom_address; // for gromemu
int m_ram_page; // for super
const char* m_tag;
- std::vector<UINT8> m_nvram; // for MiniMemory
- std::vector<UINT8> m_ram; // for MBX
+ std::vector<uint8_t> m_nvram; // for MiniMemory
+ std::vector<uint8_t> m_ram; // for MBX
};
/******************** Standard cartridge ******************************/
@@ -488,21 +488,21 @@ class rpk_socket
friend class rpk;
public:
- rpk_socket(const char *id, int length, UINT8 *contents);
- rpk_socket(const char *id, int length, UINT8 *contents, const char *pathname);
+ rpk_socket(const char *id, int length, uint8_t *contents);
+ rpk_socket(const char *id, int length, uint8_t *contents, const char *pathname);
~rpk_socket() {}
const char* id() { return m_id; }
int get_content_length() { return m_length; }
- UINT8* get_contents() { return m_contents; }
+ uint8_t* get_contents() { return m_contents; }
bool persistent_ram() { return m_pathname != nullptr; }
const char* get_pathname() { return m_pathname; }
void cleanup() { if (m_contents != nullptr) global_free_array(m_contents); }
private:
const char* m_id;
- UINT32 m_length;
- UINT8* m_contents;
+ uint32_t m_length;
+ uint8_t* m_contents;
const char* m_pathname;
};
@@ -515,7 +515,7 @@ public:
rpk *open(emu_options &options, const char *filename, const char *system_name);
private:
- int find_file(util::archive_file &zip, const char *filename, UINT32 crc);
+ int find_file(util::archive_file &zip, const char *filename, uint32_t crc);
std::unique_ptr<rpk_socket> load_rom_resource(util::archive_file &zip, xml_data_node* rom_resource_node, const char* socketname);
std::unique_ptr<rpk_socket> load_ram_resource(emu_options &options, xml_data_node* ram_resource_node, const char* socketname, const char* system_name);
const pcb_type* m_types;
@@ -529,7 +529,7 @@ public:
~rpk();
int get_type(void) { return m_type; }
- UINT8* get_contents_of_socket(const char *socket_name);
+ uint8_t* get_contents_of_socket(const char *socket_name);
int get_resource_length(const char *socket_name);
void close();
diff --git a/src/devices/bus/ti99x/handset.cpp b/src/devices/bus/ti99x/handset.cpp
index 6e759b2115c..c4a3f86630c 100644
--- a/src/devices/bus/ti99x/handset.cpp
+++ b/src/devices/bus/ti99x/handset.cpp
@@ -50,7 +50,7 @@ static const char *const joynames[2][4] =
static const char *const keynames[] = { "KP0", "KP1", "KP2", "KP3", "KP4" };
-ti99_handset_device::ti99_handset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti99_handset_device::ti99_handset_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: joyport_attached_device(mconfig, HANDSET, "TI-99/4 IR handset", tag, owner, clock, "handset", __FILE__), m_ack(0), m_clock_high(false), m_buf(0), m_buflen(0), m_delay_timer(nullptr)
{
}
@@ -68,12 +68,12 @@ ti99_handset_device::ti99_handset_device(const machine_config &mconfig, const ch
answer = |0|I|C|1|B|B|B|B|
*/
-UINT8 ti99_handset_device::read_dev()
+uint8_t ti99_handset_device::read_dev()
{
return (m_buf & 0xf) | 0x10 | (m_clock_high? 0x20:0) | ( m_buflen==3? 0x00:0x40);
}
-void ti99_handset_device::write_dev(UINT8 data)
+void ti99_handset_device::write_dev(uint8_t data)
{
if (VERBOSE>7) LOG("ti99_handset_device: Set ack %d\n", data);
set_acknowledge(data);
@@ -152,8 +152,8 @@ void ti99_handset_device::post_message(int message)
*/
bool ti99_handset_device::poll_keyboard(int num)
{
- UINT32 key_buf;
- UINT8 current_key;
+ uint32_t key_buf;
+ uint8_t current_key;
int i;
/* read current key state */
@@ -223,7 +223,7 @@ bool ti99_handset_device::poll_keyboard(int num)
*/
bool ti99_handset_device::poll_joystick(int num)
{
- UINT8 current_joy;
+ uint8_t current_joy;
int current_joy_x, current_joy_y;
int message;
/* read joystick position */
@@ -495,7 +495,7 @@ INPUT_PORTS_START( joysticks )
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1/*, "(2FIRE)", CODE_NONE, OSD_JOY2_FIRE, 0*/) PORT_PLAYER(2)
INPUT_PORTS_END
-ti99_twin_joystick::ti99_twin_joystick(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ti99_twin_joystick::ti99_twin_joystick(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: joyport_attached_device(mconfig, HANDSET, "TI-99/4(A) Twin Joystick", tag, owner, clock, "twinjoy", __FILE__), m_joystick(0)
{
}
@@ -510,9 +510,9 @@ void ti99_twin_joystick::device_start(void)
answer = |0|0|0|U|D|R|L|B|
*/
-UINT8 ti99_twin_joystick::read_dev()
+uint8_t ti99_twin_joystick::read_dev()
{
- UINT8 value;
+ uint8_t value;
if (m_joystick==1) value = ioport("JOY1")->read();
else
{
@@ -523,7 +523,7 @@ UINT8 ti99_twin_joystick::read_dev()
return value;
}
-void ti99_twin_joystick::write_dev(UINT8 data)
+void ti99_twin_joystick::write_dev(uint8_t data)
{
if (VERBOSE>7) LOG("ti99_twin_joystick: Select joystick %d\n", data);
m_joystick = data & 0x03;
diff --git a/src/devices/bus/ti99x/handset.h b/src/devices/bus/ti99x/handset.h
index 5e592bd2ebc..5b899813ed0 100644
--- a/src/devices/bus/ti99x/handset.h
+++ b/src/devices/bus/ti99x/handset.h
@@ -27,10 +27,10 @@ extern const device_type HANDSET;
class ti99_handset_device : public joyport_attached_device
{
public:
- ti99_handset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti99_handset_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- UINT8 read_dev() override;
- void write_dev(UINT8 data) override;
+ uint8_t read_dev() override;
+ void write_dev(uint8_t data) override;
void pulse_clock() override;
@@ -52,8 +52,8 @@ private:
bool m_clock_high;
int m_buf;
int m_buflen;
- UINT8 previous_joy[MAX_HANDSETS];
- UINT8 previous_key[MAX_HANDSETS];
+ uint8_t previous_joy[MAX_HANDSETS];
+ uint8_t previous_key[MAX_HANDSETS];
emu_timer *m_delay_timer;
};
@@ -65,11 +65,11 @@ extern const device_type TI99_JOYSTICK;
class ti99_twin_joystick : public joyport_attached_device
{
public:
- ti99_twin_joystick(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ti99_twin_joystick(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void device_start(void) override;
- UINT8 read_dev() override;
- void write_dev(UINT8 data) override;
+ uint8_t read_dev() override;
+ void write_dev(uint8_t data) override;
protected:
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/ti99x/joyport.cpp b/src/devices/bus/ti99x/joyport.cpp
index 5cc4dd08e56..d37dea4c48f 100644
--- a/src/devices/bus/ti99x/joyport.cpp
+++ b/src/devices/bus/ti99x/joyport.cpp
@@ -39,7 +39,7 @@
#include "handset.h"
#include "mecmouse.h"
-joyport_device::joyport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+joyport_device::joyport_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, JOYPORT, "Joystick port", tag, owner, clock, "ti99_joyport", __FILE__),
device_slot_interface(mconfig, *this),
m_interrupt(*this), m_connected(nullptr)
@@ -49,7 +49,7 @@ joyport_device::joyport_device(const machine_config &mconfig, const char *tag, d
/*
Reads a value from the port.
*/
-UINT8 joyport_device::read_port()
+uint8_t joyport_device::read_port()
{
return m_connected->read_dev();
}
diff --git a/src/devices/bus/ti99x/joyport.h b/src/devices/bus/ti99x/joyport.h
index 82129db726e..d50988c47c6 100644
--- a/src/devices/bus/ti99x/joyport.h
+++ b/src/devices/bus/ti99x/joyport.h
@@ -32,12 +32,12 @@ class joyport_device;
class joyport_attached_device : public device_t
{
public:
- joyport_attached_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ joyport_attached_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source), m_joyport(nullptr)
{ }
- virtual UINT8 read_dev() =0;
- virtual void write_dev(UINT8 data) =0;
+ virtual uint8_t read_dev() =0;
+ virtual void write_dev(uint8_t data) =0;
virtual void pulse_clock() { };
protected:
@@ -51,8 +51,8 @@ protected:
class joyport_device : public device_t, public device_slot_interface
{
public:
- joyport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- UINT8 read_port();
+ joyport_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ uint8_t read_port();
void write_port(int data);
void set_interrupt(int state);
void pulse_clock();
diff --git a/src/devices/bus/ti99x/mecmouse.cpp b/src/devices/bus/ti99x/mecmouse.cpp
index 56b370e55c5..9bd767484ec 100644
--- a/src/devices/bus/ti99x/mecmouse.cpp
+++ b/src/devices/bus/ti99x/mecmouse.cpp
@@ -52,13 +52,13 @@
#define POLL_TIMER 1
-mecmouse_device::mecmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+mecmouse_device::mecmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: joyport_attached_device(mconfig, MECMOUSE, "Mechatronics Mouse", tag, owner, clock, "mecmouse", __FILE__), m_last_select(0), m_read_y_axis(false), m_x(0), m_y(0), m_x_buf(0), m_y_buf(0), m_last_mx(0), m_last_my(0), m_poll_timer(nullptr)
{
}
-UINT8 mecmouse_device::read_dev()
+uint8_t mecmouse_device::read_dev()
{
int answer;
int buttons = ioport("MOUSE0")->read() & 3;
@@ -80,7 +80,7 @@ UINT8 mecmouse_device::read_dev()
/*
Used to select lines. data = 0x01 (Joy1), 0x02 (Joy2)
*/
-void mecmouse_device::write_dev(UINT8 data)
+void mecmouse_device::write_dev(uint8_t data)
{
if (data == 0x02) {
if (m_last_select == 0x01) {
diff --git a/src/devices/bus/ti99x/mecmouse.h b/src/devices/bus/ti99x/mecmouse.h
index 37390a7461c..ba0e70b4629 100644
--- a/src/devices/bus/ti99x/mecmouse.h
+++ b/src/devices/bus/ti99x/mecmouse.h
@@ -22,10 +22,10 @@ extern const device_type MECMOUSE;
class mecmouse_device : public joyport_attached_device
{
public:
- mecmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ mecmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- UINT8 read_dev() override;
- void write_dev(UINT8 data) override;
+ uint8_t read_dev() override;
+ void write_dev(uint8_t data) override;
protected:
virtual void device_start(void) override;
diff --git a/src/devices/bus/ti99x/ti99defs.h b/src/devices/bus/ti99x/ti99defs.h
index 38d0f1d9f61..134b7cf0331 100644
--- a/src/devices/bus/ti99x/ti99defs.h
+++ b/src/devices/bus/ti99x/ti99defs.h
@@ -91,10 +91,10 @@
#define PFM512_TAG "pfm512"
#define PFM512A_TAG "pfm512a"
-#define READ16Z_MEMBER(name) void name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 *value, ATTR_UNUSED UINT16 mem_mask)
-#define DECLARE_READ16Z_MEMBER(name) void name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 *value, ATTR_UNUSED UINT16 mem_mask = 0xffff)
-#define READ8Z_MEMBER(name) void name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 *value, ATTR_UNUSED UINT8 mem_mask)
-#define DECLARE_READ8Z_MEMBER(name) void name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 *value, ATTR_UNUSED UINT8 mem_mask = 0xff)
+#define READ16Z_MEMBER(name) void name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED uint16_t *value, ATTR_UNUSED uint16_t mem_mask)
+#define DECLARE_READ16Z_MEMBER(name) void name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED uint16_t *value, ATTR_UNUSED uint16_t mem_mask = 0xffff)
+#define READ8Z_MEMBER(name) void name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED uint8_t *value, ATTR_UNUSED uint8_t mem_mask)
+#define DECLARE_READ8Z_MEMBER(name) void name(ATTR_UNUSED address_space &space, ATTR_UNUSED offs_t offset, ATTR_UNUSED uint8_t *value, ATTR_UNUSED uint8_t mem_mask = 0xff)
/*
For almost all applications of setoffset, we also need the data bus
@@ -117,7 +117,7 @@
class bus8z_device : public device_t
{
public:
- bus8z_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ bus8z_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source) { }
virtual DECLARE_READ8Z_MEMBER(readz) =0;
virtual DECLARE_WRITE8_MEMBER(write) =0;
@@ -127,7 +127,7 @@ public:
class bus16z_device : device_t
{
public:
- bus16z_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ bus16z_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source) { }
virtual DECLARE_READ16Z_MEMBER(read16z) =0;
virtual DECLARE_WRITE16_MEMBER(write16) =0;
@@ -160,7 +160,7 @@ const device_type EVPC_CONN = &device_creator<evpc_clock_connector>;
class evpc_clock_connector : public device_t
{
public:
- evpc_clock_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ evpc_clock_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, EVPC_CONN, "EVPC clock connector", tag, owner, clock, "ti99_evpc_clock", __FILE__),
m_vdpint(*this) { };
diff --git a/src/devices/bus/tiki100/8088.cpp b/src/devices/bus/tiki100/8088.cpp
index e3bc01908fb..2c1fb9f7cbd 100644
--- a/src/devices/bus/tiki100/8088.cpp
+++ b/src/devices/bus/tiki100/8088.cpp
@@ -91,7 +91,7 @@ machine_config_constructor tiki100_8088_t::device_mconfig_additions() const
// tiki100_8088_t - constructor
//-------------------------------------------------
-tiki100_8088_t::tiki100_8088_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+tiki100_8088_t::tiki100_8088_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, TIKI100_8088, "TIKI-100 8/16", tag, owner, clock, "tiki100_8088", __FILE__),
device_tiki100bus_card_interface(mconfig, *this),
m_maincpu(*this, I8088_TAG),
@@ -125,7 +125,7 @@ void tiki100_8088_t::device_reset()
// tiki100bus_iorq_r - I/O read
//-------------------------------------------------
-UINT8 tiki100_8088_t::iorq_r(address_space &space, offs_t offset, UINT8 data)
+uint8_t tiki100_8088_t::iorq_r(address_space &space, offs_t offset, uint8_t data)
{
if ((offset & 0xff) == 0x7f)
{
@@ -140,7 +140,7 @@ UINT8 tiki100_8088_t::iorq_r(address_space &space, offs_t offset, UINT8 data)
// tiki100bus_iorq_w - I/O write
//-------------------------------------------------
-void tiki100_8088_t::iorq_w(address_space &space, offs_t offset, UINT8 data)
+void tiki100_8088_t::iorq_w(address_space &space, offs_t offset, uint8_t data)
{
if ((offset & 0xff) == 0x7f)
{
diff --git a/src/devices/bus/tiki100/8088.h b/src/devices/bus/tiki100/8088.h
index 3b019131472..640feb1b3f0 100644
--- a/src/devices/bus/tiki100/8088.h
+++ b/src/devices/bus/tiki100/8088.h
@@ -28,7 +28,7 @@ class tiki100_8088_t : public device_t,
{
public:
// construction/destruction
- tiki100_8088_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tiki100_8088_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -43,13 +43,13 @@ protected:
virtual void device_reset() override;
// device_tiki100bus_card_interface overrides
- virtual UINT8 iorq_r(address_space &space, offs_t offset, UINT8 data) override;
- virtual void iorq_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void iorq_w(address_space &space, offs_t offset, uint8_t data) override;
private:
required_device<i8088_cpu_device> m_maincpu;
- UINT8 m_data;
+ uint8_t m_data;
};
diff --git a/src/devices/bus/tiki100/exp.cpp b/src/devices/bus/tiki100/exp.cpp
index 9ec594375b2..8cc34faed90 100644
--- a/src/devices/bus/tiki100/exp.cpp
+++ b/src/devices/bus/tiki100/exp.cpp
@@ -26,7 +26,7 @@ const device_type TIKI100_BUS_SLOT = &device_creator<tiki100_bus_slot_t>;
// tiki100_bus_slot_t - constructor
//-------------------------------------------------
-tiki100_bus_slot_t::tiki100_bus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+tiki100_bus_slot_t::tiki100_bus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, TIKI100_BUS_SLOT, "TIKI-100 expansion bus slot", tag, owner, clock, "tiki100bus_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_z80daisy_interface(mconfig, *this),
@@ -56,7 +56,7 @@ void tiki100_bus_slot_t::device_start()
// tiki100_bus_t - constructor
//-------------------------------------------------
-tiki100_bus_t::tiki100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+tiki100_bus_t::tiki100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, TIKI100_BUS, "TIKI-100 expansion bus", tag, owner, clock, "tiki100bus", __FILE__),
m_irq_cb(*this),
m_nmi_cb(*this),
@@ -98,7 +98,7 @@ void tiki100_bus_t::add_card(device_tiki100bus_card_interface *card)
// mrq_r - memory read
//-------------------------------------------------
-UINT8 tiki100_bus_t::mrq_r(address_space &space, offs_t offset, UINT8 data, bool &mdis)
+uint8_t tiki100_bus_t::mrq_r(address_space &space, offs_t offset, uint8_t data, bool &mdis)
{
device_tiki100bus_card_interface *entry = m_device_list.first();
@@ -132,7 +132,7 @@ WRITE8_MEMBER( tiki100_bus_t::mrq_w )
// iorq_r - I/O read
//-------------------------------------------------
-UINT8 tiki100_bus_t::iorq_r(address_space &space, offs_t offset, UINT8 data)
+uint8_t tiki100_bus_t::iorq_r(address_space &space, offs_t offset, uint8_t data)
{
device_tiki100bus_card_interface *entry = m_device_list.first();
diff --git a/src/devices/bus/tiki100/exp.h b/src/devices/bus/tiki100/exp.h
index 511d449beea..831694612f4 100644
--- a/src/devices/bus/tiki100/exp.h
+++ b/src/devices/bus/tiki100/exp.h
@@ -80,12 +80,12 @@ public:
device_tiki100bus_card_interface *next() const { return m_next; }
// memory access
- virtual UINT8 mrq_r(address_space &space, offs_t offset, UINT8 data, bool &mdis) { mdis = 1; return data; };
- virtual void mrq_w(address_space &space, offs_t offset, UINT8 data) { };
+ virtual uint8_t mrq_r(address_space &space, offs_t offset, uint8_t data, bool &mdis) { mdis = 1; return data; };
+ virtual void mrq_w(address_space &space, offs_t offset, uint8_t data) { };
// I/O access
- virtual UINT8 iorq_r(address_space &space, offs_t offset, UINT8 data) { return data; };
- virtual void iorq_w(address_space &space, offs_t offset, UINT8 data) { };
+ virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data) { return data; };
+ virtual void iorq_w(address_space &space, offs_t offset, uint8_t data) { };
virtual void busak_w(int state) { m_busak = state; };
@@ -110,7 +110,7 @@ class tiki100_bus_slot_t : public device_t,
{
public:
// construction/destruction
- tiki100_bus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tiki100_bus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -138,7 +138,7 @@ class tiki100_bus_t : public device_t
{
public:
// construction/destruction
- tiki100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tiki100_bus_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
~tiki100_bus_t() { m_device_list.detach_all(); }
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<tiki100_bus_t &>(device).m_irq_cb.set_callback(object); }
@@ -150,10 +150,10 @@ public:
void add_card(device_tiki100bus_card_interface *card);
// computer interface
- UINT8 mrq_r(address_space &space, offs_t offset, UINT8 data, bool &mdis);
+ uint8_t mrq_r(address_space &space, offs_t offset, uint8_t data, bool &mdis);
DECLARE_WRITE8_MEMBER( mrq_w );
- UINT8 iorq_r(address_space &space, offs_t offset, UINT8 data);
+ uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data);
DECLARE_WRITE8_MEMBER( iorq_w );
DECLARE_WRITE_LINE_MEMBER( busak_w );
diff --git a/src/devices/bus/tiki100/hdc.cpp b/src/devices/bus/tiki100/hdc.cpp
index 504222f0f48..a79e51242b2 100644
--- a/src/devices/bus/tiki100/hdc.cpp
+++ b/src/devices/bus/tiki100/hdc.cpp
@@ -63,7 +63,7 @@ machine_config_constructor tiki100_hdc_t::device_mconfig_additions() const
// tiki100_hdc_t - constructor
//-------------------------------------------------
-tiki100_hdc_t::tiki100_hdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+tiki100_hdc_t::tiki100_hdc_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, TIKI100_HDC, "TIKI-100 Winchester controller", tag, owner, clock, "tiki100_hdc", __FILE__),
device_tiki100bus_card_interface(mconfig, *this),
m_hdc(*this, WD1010_TAG)
@@ -94,7 +94,7 @@ void tiki100_hdc_t::device_reset()
// tiki100bus_iorq_r - I/O read
//-------------------------------------------------
-UINT8 tiki100_hdc_t::iorq_r(address_space &space, offs_t offset, UINT8 data)
+uint8_t tiki100_hdc_t::iorq_r(address_space &space, offs_t offset, uint8_t data)
{
if ((offset & 0xf8) == 0x20)
{
@@ -109,7 +109,7 @@ UINT8 tiki100_hdc_t::iorq_r(address_space &space, offs_t offset, UINT8 data)
// tiki100bus_iorq_w - I/O write
//-------------------------------------------------
-void tiki100_hdc_t::iorq_w(address_space &space, offs_t offset, UINT8 data)
+void tiki100_hdc_t::iorq_w(address_space &space, offs_t offset, uint8_t data)
{
if ((offset & 0xf8) == 0x20)
{
diff --git a/src/devices/bus/tiki100/hdc.h b/src/devices/bus/tiki100/hdc.h
index 0d533bf7f96..b02cd79d3b0 100644
--- a/src/devices/bus/tiki100/hdc.h
+++ b/src/devices/bus/tiki100/hdc.h
@@ -29,7 +29,7 @@ class tiki100_hdc_t : public device_t,
{
public:
// construction/destruction
- tiki100_hdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tiki100_hdc_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -40,8 +40,8 @@ protected:
virtual void device_reset() override;
// device_tiki100bus_card_interface overrides
- virtual UINT8 iorq_r(address_space &space, offs_t offset, UINT8 data) override;
- virtual void iorq_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void iorq_w(address_space &space, offs_t offset, uint8_t data) override;
private:
required_device<wd2010_device> m_hdc;
diff --git a/src/devices/bus/tvc/hbf.cpp b/src/devices/bus/tvc/hbf.cpp
index e8de66ebc07..017d67af1d6 100644
--- a/src/devices/bus/tvc/hbf.cpp
+++ b/src/devices/bus/tvc/hbf.cpp
@@ -58,7 +58,7 @@ const device_type TVC_HBF = &device_creator<tvc_hbf_device>;
// tvc_hbf_device - constructor
//-------------------------------------------------
-tvc_hbf_device::tvc_hbf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+tvc_hbf_device::tvc_hbf_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TVC_HBF, "HBF floppy interface", tag, owner, clock, "tvc_hbf", __FILE__),
device_tvcexp_interface( mconfig, *this ),
m_fdc(*this, "fdc"), m_rom(nullptr), m_ram(nullptr), m_rom_bank(0)
diff --git a/src/devices/bus/tvc/hbf.h b/src/devices/bus/tvc/hbf.h
index 83d98d8a0cb..2beb189391d 100644
--- a/src/devices/bus/tvc/hbf.h
+++ b/src/devices/bus/tvc/hbf.h
@@ -23,7 +23,7 @@ class tvc_hbf_device :
{
public:
// construction/destruction
- tvc_hbf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tvc_hbf_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -37,7 +37,7 @@ protected:
virtual void device_reset() override;
// tvcexp_interface overrides
- virtual UINT8 id_r() override { return 0x02; } // ID_A to GND, ID_B to VCC
+ virtual uint8_t id_r() override { return 0x02; } // ID_A to GND, ID_B to VCC
virtual DECLARE_READ8_MEMBER(read) override;
virtual DECLARE_WRITE8_MEMBER(write) override;
virtual DECLARE_READ8_MEMBER(io_read) override;
@@ -47,9 +47,9 @@ private:
// internal state
required_device<fd1793_t> m_fdc;
- UINT8 * m_rom;
- UINT8 * m_ram;
- UINT8 m_rom_bank; // A12 and A13
+ uint8_t * m_rom;
+ uint8_t * m_ram;
+ uint8_t m_rom_bank; // A12 and A13
};
diff --git a/src/devices/bus/tvc/tvc.cpp b/src/devices/bus/tvc/tvc.cpp
index db2ed411ad2..84f90f96af1 100644
--- a/src/devices/bus/tvc/tvc.cpp
+++ b/src/devices/bus/tvc/tvc.cpp
@@ -51,7 +51,7 @@ device_tvcexp_interface::~device_tvcexp_interface()
//-------------------------------------------------
// tvcexp_slot_device - constructor
//-------------------------------------------------
-tvcexp_slot_device::tvcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+tvcexp_slot_device::tvcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, TVCEXP_SLOT, "TVC64 Expansion Slot", tag, owner, clock, "tvcexp_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_out_irq_cb(*this),
@@ -84,9 +84,9 @@ void tvcexp_slot_device::device_start()
module id read
-------------------------------------------------*/
-UINT8 tvcexp_slot_device::id_r()
+uint8_t tvcexp_slot_device::id_r()
{
- UINT8 result = 0x00;
+ uint8_t result = 0x00;
if (m_cart)
result = m_cart->id_r() & 0x03;
@@ -108,9 +108,9 @@ void tvcexp_slot_device::int_ack()
module int read
-------------------------------------------------*/
-UINT8 tvcexp_slot_device::int_r()
+uint8_t tvcexp_slot_device::int_r()
{
- UINT8 result = 1;
+ uint8_t result = 1;
if (m_cart)
result = m_cart->int_r() & 0x01;
diff --git a/src/devices/bus/tvc/tvc.h b/src/devices/bus/tvc/tvc.h
index 9fa9e89fd2b..40ceb334886 100644
--- a/src/devices/bus/tvc/tvc.h
+++ b/src/devices/bus/tvc/tvc.h
@@ -71,9 +71,9 @@ public:
virtual ~device_tvcexp_interface();
// reading and writing
- virtual UINT8 id_r() { return 0x00; } // ID_A and ID_B lines
+ virtual uint8_t id_r() { return 0x00; } // ID_A and ID_B lines
virtual void int_ack() { }
- virtual UINT8 int_r() { return 1; }
+ virtual uint8_t int_r() { return 1; }
virtual DECLARE_READ8_MEMBER(read) { return 0x00; }
virtual DECLARE_WRITE8_MEMBER(write) {}
virtual DECLARE_READ8_MEMBER(io_read) { return 0x00; }
@@ -87,7 +87,7 @@ class tvcexp_slot_device : public device_t,
{
public:
// construction/destruction
- tvcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ tvcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~tvcexp_slot_device();
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<tvcexp_slot_device &>(device).m_out_irq_cb.set_callback(object); }
@@ -97,9 +97,9 @@ public:
virtual void device_start() override;
// reading and writing
- virtual UINT8 id_r();
+ virtual uint8_t id_r();
virtual void int_ack();
- virtual UINT8 int_r();
+ virtual uint8_t int_r();
virtual DECLARE_READ8_MEMBER(read);
virtual DECLARE_WRITE8_MEMBER(write);
virtual DECLARE_READ8_MEMBER(io_read);
diff --git a/src/devices/bus/vboy/rom.cpp b/src/devices/bus/vboy/rom.cpp
index 587be158610..7ae6a408233 100644
--- a/src/devices/bus/vboy/rom.cpp
+++ b/src/devices/bus/vboy/rom.cpp
@@ -21,19 +21,19 @@ const device_type VBOY_ROM_STD = &device_creator<vboy_rom_device>;
const device_type VBOY_ROM_EEPROM = &device_creator<vboy_eeprom_device>;
-vboy_rom_device::vboy_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+vboy_rom_device::vboy_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_vboy_cart_interface( mconfig, *this )
{
}
-vboy_rom_device::vboy_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vboy_rom_device::vboy_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VBOY_ROM_STD, "Nintendo Virtual Boy Carts", tag, owner, clock, "vboy_rom", __FILE__),
device_vboy_cart_interface( mconfig, *this )
{
}
-vboy_eeprom_device::vboy_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vboy_eeprom_device::vboy_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: vboy_rom_device(mconfig, VBOY_ROM_EEPROM, "Nintendo Virtual Boy Carts + EEPROM", tag, owner, clock, "vboy_eeprom", __FILE__)
{
}
diff --git a/src/devices/bus/vboy/rom.h b/src/devices/bus/vboy/rom.h
index 9ced7b51296..05b0a518120 100644
--- a/src/devices/bus/vboy/rom.h
+++ b/src/devices/bus/vboy/rom.h
@@ -13,8 +13,8 @@ class vboy_rom_device : public device_t,
{
public:
// construction/destruction
- vboy_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- vboy_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vboy_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ vboy_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override {}
@@ -29,7 +29,7 @@ class vboy_eeprom_device : public vboy_rom_device
{
public:
// construction/destruction
- vboy_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vboy_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ32_MEMBER(read_eeprom) override;
diff --git a/src/devices/bus/vboy/slot.cpp b/src/devices/bus/vboy/slot.cpp
index e59a7299a7a..d89e497a3b5 100644
--- a/src/devices/bus/vboy/slot.cpp
+++ b/src/devices/bus/vboy/slot.cpp
@@ -46,11 +46,11 @@ device_vboy_cart_interface::~device_vboy_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_vboy_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_vboy_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
- m_rom = (UINT32 *)device().machine().memory().region_alloc(std::string(tag).append(VBOYSLOT_ROM_REGION_TAG).c_str(), size, 4, ENDIANNESS_LITTLE)->base();
+ m_rom = (uint32_t *)device().machine().memory().region_alloc(std::string(tag).append(VBOYSLOT_ROM_REGION_TAG).c_str(), size, 4, ENDIANNESS_LITTLE)->base();
m_rom_size = size/4;
m_rom_mask = m_rom_size - 1;
}
@@ -61,9 +61,9 @@ void device_vboy_cart_interface::rom_alloc(UINT32 size, const char *tag)
// ram_alloc - alloc the space for the ram
//-------------------------------------------------
-void device_vboy_cart_interface::eeprom_alloc(UINT32 size)
+void device_vboy_cart_interface::eeprom_alloc(uint32_t size)
{
- m_eeprom.resize(size/sizeof(UINT32));
+ m_eeprom.resize(size/sizeof(uint32_t));
}
@@ -74,7 +74,7 @@ void device_vboy_cart_interface::eeprom_alloc(UINT32 size)
//-------------------------------------------------
// vboy_cart_slot_device - constructor
//-------------------------------------------------
-vboy_cart_slot_device::vboy_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vboy_cart_slot_device::vboy_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VBOY_CART_SLOT, "Nintendo Virtual Boy Cartridge Slot", tag, owner, clock, "vboy_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -162,8 +162,8 @@ image_init_result vboy_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT8 *ROM;
- UINT32 len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
+ uint8_t *ROM;
+ uint32_t len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
bool has_eeprom = (software_entry() != nullptr) && get_software_region("eeprom");
if (len > 0x200000)
@@ -178,7 +178,7 @@ image_init_result vboy_cart_slot_device::call_load()
if (has_eeprom)
m_cart->eeprom_alloc(get_software_region_length("eeprom"));
- ROM = (UINT8 *)m_cart->get_rom_base();
+ ROM = (uint8_t *)m_cart->get_rom_base();
if (software_entry() == nullptr)
fread(ROM, len);
diff --git a/src/devices/bus/vboy/slot.h b/src/devices/bus/vboy/slot.h
index 71adadd6a2a..831882984d5 100644
--- a/src/devices/bus/vboy/slot.h
+++ b/src/devices/bus/vboy/slot.h
@@ -33,21 +33,21 @@ public:
virtual DECLARE_READ32_MEMBER(read_eeprom) { return 0xffffffff; }
virtual DECLARE_WRITE32_MEMBER(write_eeprom) {}
- void rom_alloc(UINT32 size, const char *tag);
- void eeprom_alloc(UINT32 size);
- UINT32* get_rom_base() { return m_rom; }
- UINT32* get_eeprom_base() { return &m_eeprom[0]; }
- UINT32 get_rom_size() { return m_rom_size; }
- UINT32 get_eeprom_size() { return m_eeprom.size(); }
+ void rom_alloc(uint32_t size, const char *tag);
+ void eeprom_alloc(uint32_t size);
+ uint32_t* get_rom_base() { return m_rom; }
+ uint32_t* get_eeprom_base() { return &m_eeprom[0]; }
+ uint32_t get_rom_size() { return m_rom_size; }
+ uint32_t get_eeprom_size() { return m_eeprom.size(); }
void save_eeprom() { device().save_item(NAME(m_eeprom)); }
protected:
// internal state
- UINT32 *m_rom;
- UINT32 m_rom_size;
- UINT32 m_rom_mask;
- std::vector<UINT32> m_eeprom;
+ uint32_t *m_rom;
+ uint32_t m_rom_size;
+ uint32_t m_rom_mask;
+ std::vector<uint32_t> m_eeprom;
};
@@ -59,7 +59,7 @@ class vboy_cart_slot_device : public device_t,
{
public:
// construction/destruction
- vboy_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vboy_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~vboy_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/vc4000/rom.cpp b/src/devices/bus/vc4000/rom.cpp
index 5c8ebf5c7bb..ef5289abe0f 100644
--- a/src/devices/bus/vc4000/rom.cpp
+++ b/src/devices/bus/vc4000/rom.cpp
@@ -198,29 +198,29 @@ const device_type VC4000_ROM_RAM1K = &device_creator<vc4000_ram1k_device>;
const device_type VC4000_ROM_CHESS2 = &device_creator<vc4000_chess2_device>;
-vc4000_rom_device::vc4000_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+vc4000_rom_device::vc4000_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_vc4000_cart_interface( mconfig, *this )
{
}
-vc4000_rom_device::vc4000_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vc4000_rom_device::vc4000_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VC4000_ROM_STD, "VC 4000 Standard Carts", tag, owner, clock, "vc4000_rom", __FILE__),
device_vc4000_cart_interface( mconfig, *this )
{
}
-vc4000_rom4k_device::vc4000_rom4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vc4000_rom4k_device::vc4000_rom4k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: vc4000_rom_device(mconfig, VC4000_ROM_ROM4K, "VC 4000 Carts w/4K ROM", tag, owner, clock, "vc4000_rom4k", __FILE__)
{
}
-vc4000_ram1k_device::vc4000_ram1k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vc4000_ram1k_device::vc4000_ram1k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: vc4000_rom_device(mconfig, VC4000_ROM_RAM1K, "VC 4000 Carts w/1K RAM", tag, owner, clock, "vc4000_ram1k", __FILE__)
{
}
-vc4000_chess2_device::vc4000_chess2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vc4000_chess2_device::vc4000_chess2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: vc4000_rom_device(mconfig, VC4000_ROM_CHESS2, "VC 4000 Chess II Cart", tag, owner, clock, "vc4000_chess2", __FILE__)
{
}
diff --git a/src/devices/bus/vc4000/rom.h b/src/devices/bus/vc4000/rom.h
index af7bb070271..dcd5d3b37f8 100644
--- a/src/devices/bus/vc4000/rom.h
+++ b/src/devices/bus/vc4000/rom.h
@@ -13,8 +13,8 @@ class vc4000_rom_device : public device_t,
{
public:
// construction/destruction
- vc4000_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- vc4000_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vc4000_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ vc4000_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override {}
@@ -30,7 +30,7 @@ class vc4000_rom4k_device : public vc4000_rom_device
{
public:
// construction/destruction
- vc4000_rom4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vc4000_rom4k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
// ======================> vc4000_ram1k_device
@@ -39,7 +39,7 @@ class vc4000_ram1k_device : public vc4000_rom_device
{
public:
// construction/destruction
- vc4000_ram1k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vc4000_ram1k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_ram) override;
@@ -52,7 +52,7 @@ class vc4000_chess2_device : public vc4000_rom_device
{
public:
// construction/destruction
- vc4000_chess2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vc4000_chess2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(extra_rom) override;
diff --git a/src/devices/bus/vc4000/slot.cpp b/src/devices/bus/vc4000/slot.cpp
index 9351a055dec..e582831151f 100644
--- a/src/devices/bus/vc4000/slot.cpp
+++ b/src/devices/bus/vc4000/slot.cpp
@@ -46,7 +46,7 @@ device_vc4000_cart_interface::~device_vc4000_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_vc4000_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_vc4000_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -60,7 +60,7 @@ void device_vc4000_cart_interface::rom_alloc(UINT32 size, const char *tag)
// ram_alloc - alloc the space for the ram
//-------------------------------------------------
-void device_vc4000_cart_interface::ram_alloc(UINT32 size)
+void device_vc4000_cart_interface::ram_alloc(uint32_t size)
{
m_ram.resize(size);
}
@@ -73,7 +73,7 @@ void device_vc4000_cart_interface::ram_alloc(UINT32 size)
//-------------------------------------------------
// vc4000_cart_slot_device - constructor
//-------------------------------------------------
-vc4000_cart_slot_device::vc4000_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vc4000_cart_slot_device::vc4000_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VC4000_CART_SLOT, "Interton VC 4000 Cartridge Slot", tag, owner, clock, "vc4000_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -115,7 +115,7 @@ void vc4000_cart_slot_device::device_config_complete()
// trq h-21 slot
//-------------------------------------------------
-h21_cart_slot_device::h21_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+h21_cart_slot_device::h21_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
vc4000_cart_slot_device(mconfig, tag, owner, clock)
{
}
@@ -174,7 +174,7 @@ image_init_result vc4000_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT32 size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
+ uint32_t size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
if (size > 0x1800)
{
@@ -229,7 +229,7 @@ std::string vc4000_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- UINT32 size = m_file->size();
+ uint32_t size = m_file->size();
int type = VC4000_STD;
// attempt to identify the non-standard types
diff --git a/src/devices/bus/vc4000/slot.h b/src/devices/bus/vc4000/slot.h
index 479da188c07..e61259d08d0 100644
--- a/src/devices/bus/vc4000/slot.h
+++ b/src/devices/bus/vc4000/slot.h
@@ -36,20 +36,20 @@ public:
virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_ram) {}
- void rom_alloc(UINT32 size, const char *tag);
- void ram_alloc(UINT32 size);
- UINT8* get_rom_base() { return m_rom; }
- UINT8* get_ram_base() { return &m_ram[0]; }
- UINT32 get_rom_size() { return m_rom_size; }
- UINT32 get_ram_size() { return m_ram.size(); }
+ void rom_alloc(uint32_t size, const char *tag);
+ void ram_alloc(uint32_t size);
+ uint8_t* get_rom_base() { return m_rom; }
+ uint8_t* get_ram_base() { return &m_ram[0]; }
+ uint32_t get_rom_size() { return m_rom_size; }
+ uint32_t get_ram_size() { return m_ram.size(); }
void save_ram() { device().save_item(NAME(m_ram)); }
protected:
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT8> m_ram;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint8_t> m_ram;
};
@@ -61,7 +61,7 @@ class vc4000_cart_slot_device : public device_t,
{
public:
// construction/destruction
- vc4000_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vc4000_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~vc4000_cart_slot_device();
// device-level overrides
@@ -105,7 +105,7 @@ class h21_cart_slot_device : public vc4000_cart_slot_device
{
public:
// construction/destruction
- h21_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ h21_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~h21_cart_slot_device();
virtual const char *image_interface() const override { return "h21_cart"; }
diff --git a/src/devices/bus/vcs/compumat.cpp b/src/devices/bus/vcs/compumat.cpp
index 4fc7d9cba5b..b5e90744688 100644
--- a/src/devices/bus/vcs/compumat.cpp
+++ b/src/devices/bus/vcs/compumat.cpp
@@ -16,7 +16,7 @@
const device_type A26_ROM_COMPUMATE = &device_creator<a26_rom_cm_device>;
-a26_rom_cm_device::a26_rom_cm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_cm_device::a26_rom_cm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f6_device(mconfig, A26_ROM_COMPUMATE, "Atari 2600 ROM Cart Compumate", tag, owner, clock, "a2600_cm", __FILE__)
{
}
diff --git a/src/devices/bus/vcs/compumat.h b/src/devices/bus/vcs/compumat.h
index 986cab23320..6f59ead6ea0 100644
--- a/src/devices/bus/vcs/compumat.h
+++ b/src/devices/bus/vcs/compumat.h
@@ -15,7 +15,7 @@ class a26_rom_cm_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_cm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_cm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/vcs/dpc.cpp b/src/devices/bus/vcs/dpc.cpp
index fac776fabb1..476f102456c 100644
--- a/src/devices/bus/vcs/dpc.cpp
+++ b/src/devices/bus/vcs/dpc.cpp
@@ -17,7 +17,7 @@
const device_type ATARI_DPC = &device_creator<dpc_device>;
-dpc_device::dpc_device(const machine_config& mconfig, const char* tag, device_t* owner, UINT32 clock) :
+dpc_device::dpc_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) :
device_t(mconfig, ATARI_DPC, "Atari DCP", tag, owner, clock, "atari_dcp", __FILE__),
m_movamt(0),
m_latch_62(0),
@@ -65,7 +65,7 @@ void dpc_device::device_reset()
}
-void dpc_device::check_flag(UINT8 data_fetcher)
+void dpc_device::check_flag(uint8_t data_fetcher)
{
/* Set flag when low counter equals top */
if (m_df[data_fetcher].low == m_df[data_fetcher].top)
@@ -76,7 +76,7 @@ void dpc_device::check_flag(UINT8 data_fetcher)
m_df[data_fetcher].flag = 0;
}
-void dpc_device::decrement_counter(UINT8 data_fetcher)
+void dpc_device::decrement_counter(uint8_t data_fetcher)
{
m_df[data_fetcher].low -= 1;
if (m_df[data_fetcher].low == 0xff)
@@ -116,9 +116,9 @@ void dpc_device::device_timer(emu_timer &timer, device_timer_id id, int param, v
READ8_MEMBER(dpc_device::read)
{
- static const UINT8 dpc_amplitude[8] = { 0x00, 0x04, 0x05, 0x09, 0x06, 0x0a, 0x0b, 0x0f };
- UINT8 data_fetcher = offset & 0x07;
- UINT8 data = 0xff;
+ static const uint8_t dpc_amplitude[8] = { 0x00, 0x04, 0x05, 0x09, 0x06, 0x0a, 0x0b, 0x0f };
+ uint8_t data_fetcher = offset & 0x07;
+ uint8_t data = 0xff;
//logerror("%04X: Read from DPC offset $%02X\n", machine().device<cpu_device>("maincpu")->pc(), offset);
if (offset < 0x08)
@@ -148,7 +148,7 @@ READ8_MEMBER(dpc_device::read)
}
else
{
- UINT8 display_data = m_displaydata[(~((m_df[data_fetcher].low | (m_df[data_fetcher].high << 8))) & 0x7ff)];
+ uint8_t display_data = m_displaydata[(~((m_df[data_fetcher].low | (m_df[data_fetcher].high << 8))) & 0x7ff)];
switch (offset & 0x38)
{
@@ -185,7 +185,7 @@ READ8_MEMBER(dpc_device::read)
WRITE8_MEMBER(dpc_device::write)
{
- UINT8 data_fetcher = offset & 0x07;
+ uint8_t data_fetcher = offset & 0x07;
switch (offset & 0x38)
{
@@ -240,7 +240,7 @@ WRITE8_MEMBER(dpc_device::write)
const device_type A26_ROM_DPC = &device_creator<a26_rom_dpc_device>;
-a26_rom_dpc_device::a26_rom_dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_dpc_device::a26_rom_dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f8_device(mconfig, A26_ROM_DPC, "Atari 2600 ROM Cart Pitfall II", tag, owner, clock, "a2600_dcp", __FILE__),
m_dpc(*this, "dpc")
{
@@ -260,7 +260,7 @@ void a26_rom_dpc_device::device_reset()
m_base_bank = 0;
}
-void a26_rom_dpc_device::setup_addon_ptr(UINT8 *ptr)
+void a26_rom_dpc_device::setup_addon_ptr(uint8_t *ptr)
{
m_dpc->set_display_data(ptr);
}
@@ -296,7 +296,7 @@ DIRECT_UPDATE_MEMBER(a26_rom_dpc_device::cart_opbase)
{
if (!direct.space().debugger_access())
{
- UINT8 new_bit;
+ uint8_t new_bit;
new_bit = (m_dpc->m_shift_reg & 0x80) ^ ((m_dpc->m_shift_reg & 0x20) << 2);
new_bit = new_bit ^ (((m_dpc->m_shift_reg & 0x10) << 3) ^ ((m_dpc->m_shift_reg & 0x08) << 4));
new_bit = new_bit ^ 0x80;
diff --git a/src/devices/bus/vcs/dpc.h b/src/devices/bus/vcs/dpc.h
index f9af63202a3..6debc39164b 100644
--- a/src/devices/bus/vcs/dpc.h
+++ b/src/devices/bus/vcs/dpc.h
@@ -12,13 +12,13 @@
// TO DO: DPC should be made a separate device!
struct df_t {
- UINT8 top;
- UINT8 bottom;
- UINT8 low;
- UINT8 high;
- UINT8 flag;
- UINT8 music_mode; /* Only used by data fetchers 5,6, and 7 */
- UINT8 osc_clk; /* Only used by data fetchers 5,6, and 7 */
+ uint8_t top;
+ uint8_t bottom;
+ uint8_t low;
+ uint8_t high;
+ uint8_t flag;
+ uint8_t music_mode; /* Only used by data fetchers 5,6, and 7 */
+ uint8_t osc_clk; /* Only used by data fetchers 5,6, and 7 */
};
// m_dpc.oscillator = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(a2600_state::modeDPC_timer_callback),this));
@@ -27,16 +27,16 @@ class dpc_device : public device_t
{
public:
// construction/destruction
- dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
df_t m_df[8];
- UINT8 m_movamt;
- UINT8 m_latch_62;
- UINT8 m_latch_64;
- UINT8 m_dlc;
- UINT8 m_shift_reg;
- UINT8 *m_displaydata;
- void set_display_data(UINT8 *data) { m_displaydata = data; }
+ uint8_t m_movamt;
+ uint8_t m_latch_62;
+ uint8_t m_latch_64;
+ uint8_t m_dlc;
+ uint8_t m_shift_reg;
+ uint8_t *m_displaydata;
+ void set_display_data(uint8_t *data) { m_displaydata = data; }
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
@@ -49,8 +49,8 @@ public:
private:
- void decrement_counter(UINT8 data_fetcher);
- void check_flag(UINT8 data_fetcher);
+ void decrement_counter(uint8_t data_fetcher);
+ void check_flag(uint8_t data_fetcher);
static const device_timer_id TIMER_OSC = 0;
emu_timer *m_oscillator;
@@ -68,7 +68,7 @@ class a26_rom_dpc_device : public a26_rom_f8_device
{
public:
// construction/destruction
- a26_rom_dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -82,7 +82,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_bank) override;
virtual DECLARE_DIRECT_UPDATE_MEMBER(cart_opbase) override;
- virtual void setup_addon_ptr(UINT8 *ptr) override;
+ virtual void setup_addon_ptr(uint8_t *ptr) override;
};
diff --git a/src/devices/bus/vcs/harmony_melody.cpp b/src/devices/bus/vcs/harmony_melody.cpp
index af5b09e0d8a..2940bd5cf4f 100644
--- a/src/devices/bus/vcs/harmony_melody.cpp
+++ b/src/devices/bus/vcs/harmony_melody.cpp
@@ -66,7 +66,7 @@ map:
const device_type A26_ROM_HARMONY = &device_creator<a26_rom_harmony_device>;
-a26_rom_harmony_device::a26_rom_harmony_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_harmony_device::a26_rom_harmony_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f8_device(mconfig, A26_ROM_HARMONY, "Atari 2600 ROM Cart HARMONY/MELODY", tag, owner, clock, "a2600_harmony", __FILE__),
m_cpu(*this, "arm")
{
@@ -132,7 +132,7 @@ void a26_rom_harmony_device::check_bankswitch(offs_t offset)
READ8_MEMBER(a26_rom_harmony_device::read_rom)
{
- UINT8 retvalue = read8_r(space, offset + 0xc00); // banks start at 0xc00
+ uint8_t retvalue = read8_r(space, offset + 0xc00); // banks start at 0xc00
check_bankswitch(offset);
diff --git a/src/devices/bus/vcs/harmony_melody.h b/src/devices/bus/vcs/harmony_melody.h
index 344d929af29..7ed337c56ec 100644
--- a/src/devices/bus/vcs/harmony_melody.h
+++ b/src/devices/bus/vcs/harmony_melody.h
@@ -13,7 +13,7 @@ class a26_rom_harmony_device : public a26_rom_f8_device
{
public:
// construction/destruction
- a26_rom_harmony_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_harmony_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/bus/vcs/rom.cpp b/src/devices/bus/vcs/rom.cpp
index 2c4dcd0d3a0..65ff0715fa8 100755
--- a/src/devices/bus/vcs/rom.cpp
+++ b/src/devices/bus/vcs/rom.cpp
@@ -44,143 +44,143 @@ const device_type A26_ROM_32IN1 = &device_creator<a26_rom_32in1_device>;
const device_type A26_ROM_X07 = &device_creator<a26_rom_x07_device>;
-a26_rom_2k_device::a26_rom_2k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a26_rom_2k_device::a26_rom_2k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_vcs_cart_interface( mconfig, *this )
{
}
-a26_rom_2k_device::a26_rom_2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_2k_device::a26_rom_2k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, A26_ROM_2K, "Atari VCS 2600 2K ROM Carts", tag, owner, clock, "vcs_2k", __FILE__),
device_vcs_cart_interface( mconfig, *this )
{
}
-a26_rom_4k_device::a26_rom_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_4k_device::a26_rom_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_2k_device(mconfig, A26_ROM_4K, "Atari VCS 2600 4K ROM Carts", tag, owner, clock, "vcs_4k", __FILE__)
{
}
-a26_rom_f6_device::a26_rom_f6_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a26_rom_f6_device::a26_rom_f6_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: a26_rom_2k_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_base_bank(-1) // set to -1 to help the Xin1 multicart...
{
}
-a26_rom_f6_device::a26_rom_f6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_f6_device::a26_rom_f6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_2k_device(mconfig, A26_ROM_F6, "Atari VCS 2600 ROM Carts w/F6 bankswitch", tag, owner, clock, "vcs_f6", __FILE__),
m_base_bank(-1) // set to -1 to help the Xin1 multicart...
{
}
-a26_rom_f4_device::a26_rom_f4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_f4_device::a26_rom_f4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f6_device(mconfig, A26_ROM_F4, "Atari VCS 2600 ROM Carts w/F4 bankswitch", tag, owner, clock, "vcs_f4", __FILE__)
{
}
-a26_rom_f8_device::a26_rom_f8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+a26_rom_f8_device::a26_rom_f8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: a26_rom_f6_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-a26_rom_f8_device::a26_rom_f8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_f8_device::a26_rom_f8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f6_device(mconfig, A26_ROM_F8, "Atari VCS 2600 ROM Carts w/F8 bankswitch", tag, owner, clock, "vcs_f8", __FILE__)
{
}
-a26_rom_f8_sw_device::a26_rom_f8_sw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_f8_sw_device::a26_rom_f8_sw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f8_device(mconfig, A26_ROM_F8_SW, "Atari VCS 2600 ROM Cart Snow White", tag, owner, clock, "vcs_f8_sw", __FILE__)
{
}
-a26_rom_fa_device::a26_rom_fa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_fa_device::a26_rom_fa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f6_device(mconfig, A26_ROM_FA, "Atari VCS 2600 ROM Carts w/FA bankswitch", tag, owner, clock, "vcs_fa", __FILE__)
{
}
-a26_rom_fe_device::a26_rom_fe_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_fe_device::a26_rom_fe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_2k_device(mconfig, A26_ROM_FE, "Atari VCS 2600 ROM Carts w/FE bankswitch", tag, owner, clock, "vcs_fe", __FILE__), m_base_bank(0), m_trigger_on_next_access(0)
{
}
-a26_rom_3e_device::a26_rom_3e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_3e_device::a26_rom_3e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f6_device(mconfig, A26_ROM_3E, "Atari VCS 2600 ROM Carts w/3E bankswitch", tag, owner, clock, "vcs_3e", __FILE__), m_num_bank(0), m_ram_bank(0), m_ram_enable(0)
{
}
-a26_rom_3f_device::a26_rom_3f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_3f_device::a26_rom_3f_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f6_device(mconfig, A26_ROM_3F, "Atari VCS 2600 ROM Carts w/3F bankswitch", tag, owner, clock, "vcs_3f", __FILE__), m_num_bank(0)
{
}
-a26_rom_e0_device::a26_rom_e0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_e0_device::a26_rom_e0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f6_device(mconfig, A26_ROM_E0, "Atari VCS 2600 ROM Carts w/E0 bankswitch", tag, owner, clock, "vcs_e0", __FILE__)
{
}
-a26_rom_e7_device::a26_rom_e7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_e7_device::a26_rom_e7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f6_device(mconfig, A26_ROM_E7, "Atari VCS 2600 ROM Carts w/E7 bankswitch", tag, owner, clock, "vcs_e7", __FILE__), m_ram_bank(0)
{
}
-a26_rom_ua_device::a26_rom_ua_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_ua_device::a26_rom_ua_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f6_device(mconfig, A26_ROM_UA, "Atari VCS 2600 ROM Carts w/UA bankswitch", tag, owner, clock, "vcs_ua", __FILE__)
{
}
-a26_rom_cv_device::a26_rom_cv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_cv_device::a26_rom_cv_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_2k_device(mconfig, A26_ROM_CV, "Atari VCS 2600 ROM Carts w/Commavid bankswitch", tag, owner, clock, "vcs_cv", __FILE__)
{
}
-a26_rom_dc_device::a26_rom_dc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_dc_device::a26_rom_dc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f6_device(mconfig, A26_ROM_DC, "Atari VCS 2600 ROM Carts w/Dynacom bankswitch", tag, owner, clock, "vcs_dc", __FILE__)
{
}
-a26_rom_fv_device::a26_rom_fv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_fv_device::a26_rom_fv_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f6_device(mconfig, A26_ROM_FV, "Atari VCS 2600 ROM Carts w/FV bankswitch", tag, owner, clock, "vcs_fv", __FILE__), m_locked(0)
{
}
-a26_rom_jvp_device::a26_rom_jvp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_jvp_device::a26_rom_jvp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f6_device(mconfig, A26_ROM_JVP, "Atari VCS 2600 ROM Carts w/JVP bankswitch", tag, owner, clock, "vcs_jvp", __FILE__)
{
}
-a26_rom_4in1_device::a26_rom_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_4in1_device::a26_rom_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f6_device(mconfig, A26_ROM_4IN1, "Atari VCS 2600 ROM Cart 4 in 1", tag, owner, clock, "vcs_4in1", __FILE__)
{
}
-a26_rom_8in1_device::a26_rom_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_8in1_device::a26_rom_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f8_device(mconfig, A26_ROM_8IN1, "Atari VCS 2600 ROM Cart 8 in 1", tag, owner, clock, "vcs_8in1", __FILE__), m_reset_bank(0)
{
}
-a26_rom_32in1_device::a26_rom_32in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_32in1_device::a26_rom_32in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f6_device(mconfig, A26_ROM_32IN1, "Atari VCS 2600 ROM Cart 32 in 1", tag, owner, clock, "vcs_32in1", __FILE__)
{
}
-a26_rom_x07_device::a26_rom_x07_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_x07_device::a26_rom_x07_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f6_device(mconfig, A26_ROM_X07, "Atari VCS 2600 ROM Carts w/X07 bankswitch", tag, owner, clock, "vcs_x07", __FILE__)
{
}
@@ -608,7 +608,7 @@ WRITE8_MEMBER(a26_rom_fa_device::write_bank)
READ8_MEMBER(a26_rom_fe_device::read_rom)
{
- UINT8 data;
+ uint8_t data;
// Super Chip RAM reads are mapped in 0x1080-0x10ff
if (!m_ram.empty() && offset >= 0x80 && offset < 0x100)
@@ -641,7 +641,7 @@ WRITE8_MEMBER(a26_rom_fe_device::write_ram)
READ8_MEMBER(a26_rom_fe_device::read_bank)
{
- UINT8 data = space.read_byte(0xfe + offset);
+ uint8_t data = space.read_byte(0xfe + offset);
if (!space.debugger_access())
{
diff --git a/src/devices/bus/vcs/rom.h b/src/devices/bus/vcs/rom.h
index a6c37465c07..cfccbd3e80a 100755
--- a/src/devices/bus/vcs/rom.h
+++ b/src/devices/bus/vcs/rom.h
@@ -13,8 +13,8 @@ class a26_rom_2k_device : public device_t,
{
public:
// construction/destruction
- a26_rom_2k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a26_rom_2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_2k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a26_rom_2k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -31,7 +31,7 @@ class a26_rom_4k_device : public a26_rom_2k_device
{
public:
// construction/destruction
- a26_rom_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
@@ -46,8 +46,8 @@ class a26_rom_f6_device : public a26_rom_2k_device
{
public:
// construction/destruction
- a26_rom_f6_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a26_rom_f6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_f6_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a26_rom_f6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -69,7 +69,7 @@ class a26_rom_f4_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_f4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_f4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_reset() override;
@@ -86,8 +86,8 @@ class a26_rom_f8_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_f8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- a26_rom_f8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_f8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ a26_rom_f8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
@@ -101,7 +101,7 @@ class a26_rom_f8_sw_device : public a26_rom_f8_device
{
public:
// construction/destruction
- a26_rom_f8_sw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_f8_sw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_reset() override;
@@ -114,7 +114,7 @@ class a26_rom_fa_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_fa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_fa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
@@ -128,7 +128,7 @@ class a26_rom_fe_device : public a26_rom_2k_device
{
public:
// construction/destruction
- a26_rom_fe_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_fe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -152,7 +152,7 @@ class a26_rom_3e_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_3e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_3e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -176,7 +176,7 @@ class a26_rom_3f_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_3f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_3f_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_reset() override;
@@ -196,7 +196,7 @@ class a26_rom_e0_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_e0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_e0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -217,7 +217,7 @@ class a26_rom_e7_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_e7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_e7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -238,7 +238,7 @@ class a26_rom_ua_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_ua_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_ua_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_reset() override;
@@ -256,7 +256,7 @@ class a26_rom_cv_device : public a26_rom_2k_device
{
public:
// construction/destruction
- a26_rom_cv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_cv_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
@@ -270,7 +270,7 @@ class a26_rom_dc_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_dc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_dc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
@@ -284,7 +284,7 @@ class a26_rom_fv_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_fv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_fv_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -305,7 +305,7 @@ class a26_rom_jvp_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_jvp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_jvp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
@@ -319,7 +319,7 @@ class a26_rom_4in1_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_reset() override;
@@ -335,7 +335,7 @@ class a26_rom_8in1_device : public a26_rom_f8_device
{
public:
// construction/destruction
- a26_rom_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -355,7 +355,7 @@ class a26_rom_32in1_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_32in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_32in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_reset() override;
@@ -371,7 +371,7 @@ class a26_rom_x07_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_x07_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_x07_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom) override;
diff --git a/src/devices/bus/vcs/scharger.cpp b/src/devices/bus/vcs/scharger.cpp
index aeebde0f4c6..49c27b2f311 100644
--- a/src/devices/bus/vcs/scharger.cpp
+++ b/src/devices/bus/vcs/scharger.cpp
@@ -40,7 +40,7 @@
const device_type A26_ROM_SUPERCHARGER = &device_creator<a26_rom_ss_device>;
-a26_rom_ss_device::a26_rom_ss_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+a26_rom_ss_device::a26_rom_ss_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: a26_rom_f6_device(mconfig, A26_ROM_SUPERCHARGER, "Atari 2600 ROM Cart Supercharger", tag, owner, clock, "a2600_ss", __FILE__),
m_cassette(*this, "cassette"),
m_maincpu(nullptr),
@@ -102,7 +102,7 @@ machine_config_constructor a26_rom_ss_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( a26_ss );
}
-inline UINT8 a26_rom_ss_device::read_byte(UINT32 offset)
+inline uint8_t a26_rom_ss_device::read_byte(uint32_t offset)
{
if (offset < 0x800)
return m_ram[(offset & 0x7ff) + (m_base_banks[0] * 0x800)];
diff --git a/src/devices/bus/vcs/scharger.h b/src/devices/bus/vcs/scharger.h
index 141a08e00e7..d4c8b2d10bc 100644
--- a/src/devices/bus/vcs/scharger.h
+++ b/src/devices/bus/vcs/scharger.h
@@ -16,7 +16,7 @@ class a26_rom_ss_device : public a26_rom_f6_device
{
public:
// construction/destruction
- a26_rom_ss_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ a26_rom_ss_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -30,14 +30,14 @@ public:
private:
cpu_device *m_maincpu;
- inline UINT8 read_byte(UINT32 offset);
+ inline uint8_t read_byte(uint32_t offset);
int m_base_banks[2];
- UINT8 m_reg;
- UINT8 m_write_delay, m_ram_write_enabled, m_rom_enabled;
- UINT32 m_byte_started;
- UINT16 m_last_address;
- UINT32 m_diff_adjust;
+ uint8_t m_reg;
+ uint8_t m_write_delay, m_ram_write_enabled, m_rom_enabled;
+ uint32_t m_byte_started;
+ uint16_t m_last_address;
+ uint32_t m_diff_adjust;
};
diff --git a/src/devices/bus/vcs/vcs_slot.cpp b/src/devices/bus/vcs/vcs_slot.cpp
index e9b0a93900b..8ae6783e2dd 100644
--- a/src/devices/bus/vcs/vcs_slot.cpp
+++ b/src/devices/bus/vcs/vcs_slot.cpp
@@ -49,7 +49,7 @@ device_vcs_cart_interface::~device_vcs_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_vcs_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_vcs_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -62,7 +62,7 @@ void device_vcs_cart_interface::rom_alloc(UINT32 size, const char *tag)
// ram_alloc - alloc the space for the on-cart RAM
//-------------------------------------------------
-void device_vcs_cart_interface::ram_alloc(UINT32 size)
+void device_vcs_cart_interface::ram_alloc(uint32_t size)
{
m_ram.resize(size);
device().save_item(NAME(m_ram));
@@ -77,7 +77,7 @@ void device_vcs_cart_interface::ram_alloc(UINT32 size)
//-------------------------------------------------
// vcs_cart_slot_device - constructor
//-------------------------------------------------
-vcs_cart_slot_device::vcs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vcs_cart_slot_device::vcs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VCS_CART_SLOT, "Atari VCS 2600 Cartridge Slot", tag, owner, clock, "vcs_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this), m_cart(nullptr), m_type(0)
@@ -186,8 +186,8 @@ image_init_result vcs_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT8 *ROM;
- UINT32 len;
+ uint8_t *ROM;
+ uint32_t len;
if (software_entry() != nullptr)
len = get_software_region_length("rom");
@@ -308,7 +308,7 @@ image_init_result vcs_cart_slot_device::call_load()
// pass a pointer to the now allocated ROM for the DPC chip
if (m_type == A26_DPC)
- m_cart->setup_addon_ptr((UINT8 *)m_cart->get_rom_base() + 0x2000);
+ m_cart->setup_addon_ptr((uint8_t *)m_cart->get_rom_base() + 0x2000);
return image_init_result::PASS;
}
@@ -331,7 +331,7 @@ void vcs_cart_slot_device::call_unload()
detection helper routines
-------------------------------------------------*/
-int vcs_cart_slot_device::detect_modeDC(UINT8 *cart, UINT32 len)
+int vcs_cart_slot_device::detect_modeDC(uint8_t *cart, uint32_t len)
{
int numfound = 0;
// signature is also in 'video reflex'.. maybe figure out that controller port someday...
@@ -352,7 +352,7 @@ int vcs_cart_slot_device::detect_modeDC(UINT8 *cart, UINT32 len)
return 0;
}
-int vcs_cart_slot_device::detect_modeF6(UINT8 *cart, UINT32 len)
+int vcs_cart_slot_device::detect_modeF6(uint8_t *cart, uint32_t len)
{
int numfound = 0;
static const unsigned char signature[3] = { 0x8d, 0xf6, 0xff };
@@ -372,7 +372,7 @@ int vcs_cart_slot_device::detect_modeF6(UINT8 *cart, UINT32 len)
return 0;
}
-int vcs_cart_slot_device::detect_snowhite(UINT8 *cart, UINT32 len)
+int vcs_cart_slot_device::detect_snowhite(uint8_t *cart, uint32_t len)
{
static const unsigned char snowwhite[] = { 0x10, 0xd0, 0xff, 0xff }; // Snow White Proto
@@ -381,7 +381,7 @@ int vcs_cart_slot_device::detect_snowhite(UINT8 *cart, UINT32 len)
return 0;
}
-int vcs_cart_slot_device::detect_mode3E(UINT8 *cart, UINT32 len)
+int vcs_cart_slot_device::detect_mode3E(uint8_t *cart, uint32_t len)
{
// this one is a little hacky... looks for STY $3e, which is unique to
// 'not boulderdash', but is the only example I have (cow)
@@ -404,7 +404,7 @@ int vcs_cart_slot_device::detect_mode3E(UINT8 *cart, UINT32 len)
return 0;
}
-int vcs_cart_slot_device::detect_modeSS(UINT8 *cart, UINT32 len)
+int vcs_cart_slot_device::detect_modeSS(uint8_t *cart, uint32_t len)
{
int numfound = 0;
static const unsigned char signature[5] = { 0xbd, 0xe5, 0xff, 0x95, 0x81 };
@@ -424,7 +424,7 @@ int vcs_cart_slot_device::detect_modeSS(UINT8 *cart, UINT32 len)
return 0;
}
-int vcs_cart_slot_device::detect_modeFE(UINT8 *cart, UINT32 len)
+int vcs_cart_slot_device::detect_modeFE(uint8_t *cart, uint32_t len)
{
int numfound = 0;
static const unsigned char signatures[][5] = {
@@ -452,7 +452,7 @@ int vcs_cart_slot_device::detect_modeFE(UINT8 *cart, UINT32 len)
return 0;
}
-int vcs_cart_slot_device::detect_modeE0(UINT8 *cart, UINT32 len)
+int vcs_cart_slot_device::detect_modeE0(uint8_t *cart, uint32_t len)
{
int numfound = 0;
static const unsigned char signatures[][3] = {
@@ -482,7 +482,7 @@ int vcs_cart_slot_device::detect_modeE0(UINT8 *cart, UINT32 len)
return 0;
}
-int vcs_cart_slot_device::detect_modeCV(UINT8 *cart, UINT32 len)
+int vcs_cart_slot_device::detect_modeCV(uint8_t *cart, uint32_t len)
{
int numfound = 0;
static const unsigned char signatures[][3] = {
@@ -508,7 +508,7 @@ int vcs_cart_slot_device::detect_modeCV(UINT8 *cart, UINT32 len)
return 0;
}
-int vcs_cart_slot_device::detect_modeFV(UINT8 *cart, UINT32 len)
+int vcs_cart_slot_device::detect_modeFV(uint8_t *cart, uint32_t len)
{
int numfound = 0;
static const unsigned char signatures[][3] = { { 0x2c, 0xd0, 0xff } };
@@ -531,7 +531,7 @@ int vcs_cart_slot_device::detect_modeFV(UINT8 *cart, UINT32 len)
return 0;
}
-int vcs_cart_slot_device::detect_modeJVP(UINT8 *cart, UINT32 len)
+int vcs_cart_slot_device::detect_modeJVP(uint8_t *cart, uint32_t len)
{
int numfound = 0;
static const unsigned char signatures[][4] = {
@@ -557,7 +557,7 @@ int vcs_cart_slot_device::detect_modeJVP(UINT8 *cart, UINT32 len)
return 0;
}
-int vcs_cart_slot_device::detect_modeE7(UINT8 *cart, UINT32 len)
+int vcs_cart_slot_device::detect_modeE7(uint8_t *cart, uint32_t len)
{
int numfound = 0;
static const unsigned char signatures[][3] = {
@@ -583,7 +583,7 @@ int vcs_cart_slot_device::detect_modeE7(UINT8 *cart, UINT32 len)
return 0;
}
-int vcs_cart_slot_device::detect_modeUA(UINT8 *cart, UINT32 len)
+int vcs_cart_slot_device::detect_modeUA(uint8_t *cart, uint32_t len)
{
int numfound = 0;
static const unsigned char signature[3] = { 0x8d, 0x40, 0x02 };
@@ -603,7 +603,7 @@ int vcs_cart_slot_device::detect_modeUA(UINT8 *cart, UINT32 len)
return 0;
}
-int vcs_cart_slot_device::detect_8K_mode3F(UINT8 *cart, UINT32 len)
+int vcs_cart_slot_device::detect_8K_mode3F(uint8_t *cart, uint32_t len)
{
int numfound = 0;
static const unsigned char signature1[4] = { 0xa9, 0x01, 0x85, 0x3f };
@@ -629,7 +629,7 @@ int vcs_cart_slot_device::detect_8K_mode3F(UINT8 *cart, UINT32 len)
return 0;
}
-int vcs_cart_slot_device::detect_32K_mode3F(UINT8 *cart, UINT32 len)
+int vcs_cart_slot_device::detect_32K_mode3F(uint8_t *cart, uint32_t len)
{
int numfound = 0;
static const unsigned char signature[4] = { 0xa9, 0x0e, 0x85, 0x3f };
@@ -649,7 +649,7 @@ int vcs_cart_slot_device::detect_32K_mode3F(UINT8 *cart, UINT32 len)
return 0;
}
-int vcs_cart_slot_device::detect_super_chip(UINT8 *cart, UINT32 len)
+int vcs_cart_slot_device::detect_super_chip(uint8_t *cart, uint32_t len)
{
static const unsigned char signatures[][5] = {
{ 0xa2, 0x7f, 0x9d, 0x00, 0xf0 }, // dig dug
@@ -691,7 +691,7 @@ int vcs_cart_slot_device::detect_super_chip(UINT8 *cart, UINT32 len)
-------------------------------------------------*/
// 4in1 & 8in1 are not currently detected from fullpath...
-int vcs_cart_slot_device::identify_cart_type(UINT8 *ROM, UINT32 len)
+int vcs_cart_slot_device::identify_cart_type(uint8_t *ROM, uint32_t len)
{
int type = 0xff;
@@ -775,8 +775,8 @@ std::string vcs_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- UINT32 len = m_file->size();
- std::vector<UINT8> rom(len);
+ uint32_t len = m_file->size();
+ std::vector<uint8_t> rom(len);
int type;
m_file->read(&rom[0], len);
diff --git a/src/devices/bus/vcs/vcs_slot.h b/src/devices/bus/vcs/vcs_slot.h
index da08b7db743..65024d33e26 100755
--- a/src/devices/bus/vcs/vcs_slot.h
+++ b/src/devices/bus/vcs/vcs_slot.h
@@ -63,20 +63,20 @@ public:
// direct update handler
virtual DECLARE_DIRECT_UPDATE_MEMBER(cart_opbase) { return address; }
- virtual void setup_addon_ptr(UINT8 *ptr) {}
+ virtual void setup_addon_ptr(uint8_t *ptr) {}
- void rom_alloc(UINT32 size, const char *tag);
- void ram_alloc(UINT32 size);
- UINT8* get_rom_base() { return m_rom; }
- UINT8* get_ram_base() { return &m_ram[0]; }
- UINT32 get_rom_size() { return m_rom_size; }
- UINT32 get_ram_size() { return m_ram.size(); }
+ void rom_alloc(uint32_t size, const char *tag);
+ void ram_alloc(uint32_t size);
+ uint8_t* get_rom_base() { return m_rom; }
+ uint8_t* get_ram_base() { return &m_ram[0]; }
+ uint32_t get_rom_size() { return m_rom_size; }
+ uint32_t get_ram_size() { return m_ram.size(); }
protected:
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT8> m_ram;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint8_t> m_ram;
};
@@ -88,7 +88,7 @@ class vcs_cart_slot_device : public device_t,
{
public:
// construction/destruction
- vcs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vcs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~vcs_cart_slot_device();
// device-level overrides
@@ -101,7 +101,7 @@ public:
virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
int get_cart_type() { return m_type; };
- int identify_cart_type(UINT8 *ROM, UINT32 len);
+ int identify_cart_type(uint8_t *ROM, uint32_t len);
virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
virtual bool is_readable() const override { return 1; }
@@ -126,21 +126,21 @@ private:
device_vcs_cart_interface* m_cart;
int m_type;
- int detect_snowhite(UINT8 *cart, UINT32 len);
- int detect_modeDC(UINT8 *cart, UINT32 len);
- int detect_modeF6(UINT8 *cart, UINT32 len);
- int detect_mode3E(UINT8 *cart, UINT32 len);
- int detect_modeSS(UINT8 *cart, UINT32 len);
- int detect_modeFE(UINT8 *cart, UINT32 len);
- int detect_modeE0(UINT8 *cart, UINT32 len);
- int detect_modeCV(UINT8 *cart, UINT32 len);
- int detect_modeFV(UINT8 *cart, UINT32 len);
- int detect_modeJVP(UINT8 *cart, UINT32 len);
- int detect_modeE7(UINT8 *cart, UINT32 len);
- int detect_modeUA(UINT8 *cart, UINT32 len);
- int detect_8K_mode3F(UINT8 *cart, UINT32 len);
- int detect_32K_mode3F(UINT8 *cart, UINT32 len);
- int detect_super_chip(UINT8 *cart, UINT32 len);
+ int detect_snowhite(uint8_t *cart, uint32_t len);
+ int detect_modeDC(uint8_t *cart, uint32_t len);
+ int detect_modeF6(uint8_t *cart, uint32_t len);
+ int detect_mode3E(uint8_t *cart, uint32_t len);
+ int detect_modeSS(uint8_t *cart, uint32_t len);
+ int detect_modeFE(uint8_t *cart, uint32_t len);
+ int detect_modeE0(uint8_t *cart, uint32_t len);
+ int detect_modeCV(uint8_t *cart, uint32_t len);
+ int detect_modeFV(uint8_t *cart, uint32_t len);
+ int detect_modeJVP(uint8_t *cart, uint32_t len);
+ int detect_modeE7(uint8_t *cart, uint32_t len);
+ int detect_modeUA(uint8_t *cart, uint32_t len);
+ int detect_8K_mode3F(uint8_t *cart, uint32_t len);
+ int detect_32K_mode3F(uint8_t *cart, uint32_t len);
+ int detect_super_chip(uint8_t *cart, uint32_t len);
};
diff --git a/src/devices/bus/vcs_ctrl/ctrl.cpp b/src/devices/bus/vcs_ctrl/ctrl.cpp
index a74c5ae1b84..dbcbefb0aeb 100644
--- a/src/devices/bus/vcs_ctrl/ctrl.cpp
+++ b/src/devices/bus/vcs_ctrl/ctrl.cpp
@@ -42,7 +42,7 @@ device_vcs_control_port_interface::device_vcs_control_port_interface(const machi
// vcs_control_port_device - constructor
//-------------------------------------------------
-vcs_control_port_device::vcs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vcs_control_port_device::vcs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VCS_CONTROL_PORT, "Atari VCS control port", tag, owner, clock, "vcs_control_port", __FILE__),
device_slot_interface(mconfig, *this), m_device(nullptr),
m_write_trigger(*this)
diff --git a/src/devices/bus/vcs_ctrl/ctrl.h b/src/devices/bus/vcs_ctrl/ctrl.h
index 41f7c12e75a..46c39d2ae85 100644
--- a/src/devices/bus/vcs_ctrl/ctrl.h
+++ b/src/devices/bus/vcs_ctrl/ctrl.h
@@ -48,10 +48,10 @@ public:
device_vcs_control_port_interface(const machine_config &mconfig, device_t &device);
virtual ~device_vcs_control_port_interface() { }
- virtual UINT8 vcs_joy_r() { return 0xff; };
- virtual UINT8 vcs_pot_x_r() { return 0xff; };
- virtual UINT8 vcs_pot_y_r() { return 0xff; };
- virtual void vcs_joy_w(UINT8 data) { };
+ virtual uint8_t vcs_joy_r() { return 0xff; };
+ virtual uint8_t vcs_pot_x_r() { return 0xff; };
+ virtual uint8_t vcs_pot_y_r() { return 0xff; };
+ virtual void vcs_joy_w(uint8_t data) { };
virtual bool has_pot_x() { return false; }
virtual bool has_pot_y() { return false; }
@@ -68,7 +68,7 @@ class vcs_control_port_device : public device_t,
{
public:
// construction/destruction
- vcs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vcs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~vcs_control_port_device() { }
// static configuration helpers
@@ -87,14 +87,14 @@ public:
// pin 8 - GND
// bit 6 - pin 9 -
//
- UINT8 joy_r() { UINT8 data = 0xff; if (exists()) data = m_device->vcs_joy_r(); return data; }
+ uint8_t joy_r() { uint8_t data = 0xff; if (exists()) data = m_device->vcs_joy_r(); return data; }
DECLARE_READ8_MEMBER( joy_r ) { return joy_r(); }
- UINT8 pot_x_r() { UINT8 data = 0xff; if (exists()) data = m_device->vcs_pot_x_r(); return data; }
+ uint8_t pot_x_r() { uint8_t data = 0xff; if (exists()) data = m_device->vcs_pot_x_r(); return data; }
DECLARE_READ8_MEMBER( pot_x_r ) { return pot_x_r(); }
- UINT8 pot_y_r() { UINT8 data = 0xff; if (exists()) data = m_device->vcs_pot_y_r(); return data; }
+ uint8_t pot_y_r() { uint8_t data = 0xff; if (exists()) data = m_device->vcs_pot_y_r(); return data; }
DECLARE_READ8_MEMBER( pot_y_r ) { return pot_y_r(); }
- void joy_w( UINT8 data ) { if ( exists() ) m_device->vcs_joy_w( data ); }
+ void joy_w( uint8_t data ) { if ( exists() ) m_device->vcs_joy_w( data ); }
bool exists() { return m_device != nullptr; }
bool has_pot_x() { return exists() && m_device->has_pot_x(); }
diff --git a/src/devices/bus/vcs_ctrl/joybooster.cpp b/src/devices/bus/vcs_ctrl/joybooster.cpp
index e1fbfec7c90..af73a326e0f 100644
--- a/src/devices/bus/vcs_ctrl/joybooster.cpp
+++ b/src/devices/bus/vcs_ctrl/joybooster.cpp
@@ -56,7 +56,7 @@ ioport_constructor vcs_joystick_booster_device::device_input_ports() const
// vcs_joystick_booster_device - constructor
//-------------------------------------------------
-vcs_joystick_booster_device::vcs_joystick_booster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vcs_joystick_booster_device::vcs_joystick_booster_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VCS_JOYSTICK_BOOSTER, "Atari / CBM Digital joystick with Boostergrip", tag, owner, clock, "vcs_joystick_booster", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_joy(*this, "JOY"),
@@ -79,17 +79,17 @@ void vcs_joystick_booster_device::device_start()
// vcs_joy_r - joystick read
//-------------------------------------------------
-UINT8 vcs_joystick_booster_device::vcs_joy_r()
+uint8_t vcs_joystick_booster_device::vcs_joy_r()
{
return m_joy->read();
}
-UINT8 vcs_joystick_booster_device::vcs_pot_x_r()
+uint8_t vcs_joystick_booster_device::vcs_pot_x_r()
{
return m_potx->read();
}
-UINT8 vcs_joystick_booster_device::vcs_pot_y_r()
+uint8_t vcs_joystick_booster_device::vcs_pot_y_r()
{
return m_poty->read();
}
diff --git a/src/devices/bus/vcs_ctrl/joybooster.h b/src/devices/bus/vcs_ctrl/joybooster.h
index d04be025ab9..55455dcf92e 100644
--- a/src/devices/bus/vcs_ctrl/joybooster.h
+++ b/src/devices/bus/vcs_ctrl/joybooster.h
@@ -28,7 +28,7 @@ class vcs_joystick_booster_device : public device_t,
{
public:
// construction/destruction
- vcs_joystick_booster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vcs_joystick_booster_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -38,9 +38,9 @@ protected:
virtual void device_start() override;
// device_vcs_control_port_interface overrides
- virtual UINT8 vcs_joy_r() override;
- virtual UINT8 vcs_pot_x_r() override;
- virtual UINT8 vcs_pot_y_r() override;
+ virtual uint8_t vcs_joy_r() override;
+ virtual uint8_t vcs_pot_x_r() override;
+ virtual uint8_t vcs_pot_y_r() override;
virtual bool has_pot_x() override { return true; }
virtual bool has_pot_y() override { return true; }
diff --git a/src/devices/bus/vcs_ctrl/joystick.cpp b/src/devices/bus/vcs_ctrl/joystick.cpp
index f1539eabeef..789d679a56c 100644
--- a/src/devices/bus/vcs_ctrl/joystick.cpp
+++ b/src/devices/bus/vcs_ctrl/joystick.cpp
@@ -47,7 +47,7 @@ ioport_constructor vcs_joystick_device::device_input_ports() const
// vcs_joystick_device - constructor
//-------------------------------------------------
-vcs_joystick_device::vcs_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vcs_joystick_device::vcs_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VCS_JOYSTICK, "Atari / CBM Digital joystick", tag, owner, clock, "vcs_joystick", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_joy(*this, "JOY")
@@ -68,7 +68,7 @@ void vcs_joystick_device::device_start()
// vcs_joy_r - joystick read
//-------------------------------------------------
-UINT8 vcs_joystick_device::vcs_joy_r()
+uint8_t vcs_joystick_device::vcs_joy_r()
{
return m_joy->read();
}
diff --git a/src/devices/bus/vcs_ctrl/joystick.h b/src/devices/bus/vcs_ctrl/joystick.h
index d43f6912dff..80dfeafb0f5 100644
--- a/src/devices/bus/vcs_ctrl/joystick.h
+++ b/src/devices/bus/vcs_ctrl/joystick.h
@@ -27,7 +27,7 @@ class vcs_joystick_device : public device_t,
{
public:
// construction/destruction
- vcs_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vcs_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,7 +37,7 @@ protected:
virtual void device_start() override;
// device_vcs_control_port_interface overrides
- virtual UINT8 vcs_joy_r() override;
+ virtual uint8_t vcs_joy_r() override;
private:
required_ioport m_joy;
diff --git a/src/devices/bus/vcs_ctrl/keypad.cpp b/src/devices/bus/vcs_ctrl/keypad.cpp
index b1a1f2079d6..9d16b5a8f2d 100644
--- a/src/devices/bus/vcs_ctrl/keypad.cpp
+++ b/src/devices/bus/vcs_ctrl/keypad.cpp
@@ -53,7 +53,7 @@ ioport_constructor vcs_keypad_device::device_input_ports() const
// vcs_keypad_device - constructor
//-------------------------------------------------
-vcs_keypad_device::vcs_keypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vcs_keypad_device::vcs_keypad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VCS_KEYPAD, "Atari / CBM Keypad", tag, owner, clock, "vcs_keypad", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_keypad(*this, "KEYPAD"), m_column(0)
@@ -76,7 +76,7 @@ void vcs_keypad_device::device_start()
// vcs_joy_w - joystick write
//-------------------------------------------------
-UINT8 vcs_keypad_device::vcs_joy_r()
+uint8_t vcs_keypad_device::vcs_joy_r()
{
for ( int i = 0; i < 4; i++ )
{
@@ -95,12 +95,12 @@ UINT8 vcs_keypad_device::vcs_joy_r()
return 0xff;
}
-void vcs_keypad_device::vcs_joy_w( UINT8 data )
+void vcs_keypad_device::vcs_joy_w( uint8_t data )
{
m_column = data & 0x0F;
}
-UINT8 vcs_keypad_device::vcs_pot_x_r()
+uint8_t vcs_keypad_device::vcs_pot_x_r()
{
for ( int i = 0; i < 4; i++ )
{
@@ -119,7 +119,7 @@ UINT8 vcs_keypad_device::vcs_pot_x_r()
return 0;
}
-UINT8 vcs_keypad_device::vcs_pot_y_r()
+uint8_t vcs_keypad_device::vcs_pot_y_r()
{
for ( int i = 0; i < 4; i++ )
{
diff --git a/src/devices/bus/vcs_ctrl/keypad.h b/src/devices/bus/vcs_ctrl/keypad.h
index ffa4c1fed63..272ca6fa626 100644
--- a/src/devices/bus/vcs_ctrl/keypad.h
+++ b/src/devices/bus/vcs_ctrl/keypad.h
@@ -27,7 +27,7 @@ class vcs_keypad_device : public device_t,
{
public:
// construction/destruction
- vcs_keypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vcs_keypad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,10 +37,10 @@ protected:
virtual void device_start() override;
// device_vcs_control_port_interface overrides
- virtual UINT8 vcs_joy_r() override;
- virtual void vcs_joy_w( UINT8 data ) override;
- virtual UINT8 vcs_pot_x_r() override;
- virtual UINT8 vcs_pot_y_r() override;
+ virtual uint8_t vcs_joy_r() override;
+ virtual void vcs_joy_w( uint8_t data ) override;
+ virtual uint8_t vcs_pot_x_r() override;
+ virtual uint8_t vcs_pot_y_r() override;
virtual bool has_pot_x() override { return true; }
virtual bool has_pot_y() override { return true; }
@@ -48,7 +48,7 @@ protected:
private:
required_ioport m_keypad;
- UINT8 m_column;
+ uint8_t m_column;
};
diff --git a/src/devices/bus/vcs_ctrl/lightpen.cpp b/src/devices/bus/vcs_ctrl/lightpen.cpp
index 446e57cd6a0..2a1ca665412 100644
--- a/src/devices/bus/vcs_ctrl/lightpen.cpp
+++ b/src/devices/bus/vcs_ctrl/lightpen.cpp
@@ -56,7 +56,7 @@ ioport_constructor vcs_lightpen_device::device_input_ports() const
// vcs_lightpen_device - constructor
//-------------------------------------------------
-vcs_lightpen_device::vcs_lightpen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vcs_lightpen_device::vcs_lightpen_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VCS_LIGHTPEN, "Atari / CBM Light Pen", tag, owner, clock, "vcs_lightpen", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_joy(*this, "JOY"),
@@ -79,7 +79,7 @@ void vcs_lightpen_device::device_start()
// vcs_joy_r - lightpen read
//-------------------------------------------------
-UINT8 vcs_lightpen_device::vcs_joy_r()
+uint8_t vcs_lightpen_device::vcs_joy_r()
{
return m_joy->read();
}
diff --git a/src/devices/bus/vcs_ctrl/lightpen.h b/src/devices/bus/vcs_ctrl/lightpen.h
index 0aed6ac85a4..cc6bfe454ab 100644
--- a/src/devices/bus/vcs_ctrl/lightpen.h
+++ b/src/devices/bus/vcs_ctrl/lightpen.h
@@ -27,7 +27,7 @@ class vcs_lightpen_device : public device_t,
{
public:
// construction/destruction
- vcs_lightpen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vcs_lightpen_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -39,7 +39,7 @@ protected:
virtual void device_start() override;
// device_vcs_control_port_interface overrides
- virtual UINT8 vcs_joy_r() override;
+ virtual uint8_t vcs_joy_r() override;
private:
required_ioport m_joy;
diff --git a/src/devices/bus/vcs_ctrl/paddles.cpp b/src/devices/bus/vcs_ctrl/paddles.cpp
index b8a4f4a6de5..0329853b0c8 100644
--- a/src/devices/bus/vcs_ctrl/paddles.cpp
+++ b/src/devices/bus/vcs_ctrl/paddles.cpp
@@ -50,7 +50,7 @@ ioport_constructor vcs_paddles_device::device_input_ports() const
// vcs_paddles_device - constructor
//-------------------------------------------------
-vcs_paddles_device::vcs_paddles_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vcs_paddles_device::vcs_paddles_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VCS_PADDLES, "Atari / CBM Digital paddles", tag, owner, clock, "vcs_paddles", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_joy(*this, "JOY"),
@@ -73,7 +73,7 @@ void vcs_paddles_device::device_start()
// vcs_joy_r - joystick read
//-------------------------------------------------
-UINT8 vcs_paddles_device::vcs_joy_r()
+uint8_t vcs_paddles_device::vcs_joy_r()
{
return m_joy->read();
}
@@ -83,7 +83,7 @@ UINT8 vcs_paddles_device::vcs_joy_r()
// vcs_pot_x_r - potentiometer X read
//-------------------------------------------------
-UINT8 vcs_paddles_device::vcs_pot_x_r()
+uint8_t vcs_paddles_device::vcs_pot_x_r()
{
return m_potx->read();
}
@@ -93,7 +93,7 @@ UINT8 vcs_paddles_device::vcs_pot_x_r()
// vcs_pot_y_r - potentiometer Y read
//-------------------------------------------------
-UINT8 vcs_paddles_device::vcs_pot_y_r()
+uint8_t vcs_paddles_device::vcs_pot_y_r()
{
return m_poty->read();
}
diff --git a/src/devices/bus/vcs_ctrl/paddles.h b/src/devices/bus/vcs_ctrl/paddles.h
index 65ffd394fef..44c3f066a8e 100644
--- a/src/devices/bus/vcs_ctrl/paddles.h
+++ b/src/devices/bus/vcs_ctrl/paddles.h
@@ -27,7 +27,7 @@ class vcs_paddles_device : public device_t,
{
public:
// construction/destruction
- vcs_paddles_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vcs_paddles_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,9 +37,9 @@ protected:
virtual void device_start() override;
// device_vcs_control_port_interface overrides
- virtual UINT8 vcs_joy_r() override;
- virtual UINT8 vcs_pot_x_r() override;
- virtual UINT8 vcs_pot_y_r() override;
+ virtual uint8_t vcs_joy_r() override;
+ virtual uint8_t vcs_pot_x_r() override;
+ virtual uint8_t vcs_pot_y_r() override;
virtual bool has_pot_x() override { return true; }
virtual bool has_pot_y() override { return true; }
diff --git a/src/devices/bus/vcs_ctrl/wheel.cpp b/src/devices/bus/vcs_ctrl/wheel.cpp
index 9d1f3009596..e9374c65ece 100644
--- a/src/devices/bus/vcs_ctrl/wheel.cpp
+++ b/src/devices/bus/vcs_ctrl/wheel.cpp
@@ -46,7 +46,7 @@ ioport_constructor vcs_wheel_device::device_input_ports() const
// vcs_wheel_device - constructor
//-------------------------------------------------
-vcs_wheel_device::vcs_wheel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vcs_wheel_device::vcs_wheel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VCS_WHEEL, "Atari / CBM Driving Wheel", tag, owner, clock, "vcs_wheel", __FILE__),
device_vcs_control_port_interface(mconfig, *this),
m_joy(*this, "JOY"),
@@ -68,9 +68,9 @@ void vcs_wheel_device::device_start()
// vcs_joy_r - joystick read
//-------------------------------------------------
-UINT8 vcs_wheel_device::vcs_joy_r()
+uint8_t vcs_wheel_device::vcs_joy_r()
{
- static const UINT8 driving_lookup[4] = { 0x00, 0x02, 0x03, 0x01 };
+ static const uint8_t driving_lookup[4] = { 0x00, 0x02, 0x03, 0x01 };
return m_joy->read() | driving_lookup[ ( m_wheel->read() & 0x18 ) >> 3 ];
}
diff --git a/src/devices/bus/vcs_ctrl/wheel.h b/src/devices/bus/vcs_ctrl/wheel.h
index 9cb8818144e..126ba65ebd9 100644
--- a/src/devices/bus/vcs_ctrl/wheel.h
+++ b/src/devices/bus/vcs_ctrl/wheel.h
@@ -27,7 +27,7 @@ class vcs_wheel_device : public device_t,
{
public:
// construction/destruction
- vcs_wheel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vcs_wheel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,7 +37,7 @@ protected:
virtual void device_start() override;
// device_vcs_control_port_interface overrides
- virtual UINT8 vcs_joy_r() override;
+ virtual uint8_t vcs_joy_r() override;
private:
required_ioport m_joy;
diff --git a/src/devices/bus/vectrex/rom.cpp b/src/devices/bus/vectrex/rom.cpp
index d8f2993a3be..44c4cd23c40 100644
--- a/src/devices/bus/vectrex/rom.cpp
+++ b/src/devices/bus/vectrex/rom.cpp
@@ -25,24 +25,24 @@ const device_type VECTREX_ROM_64K = &device_creator<vectrex_rom64k_device>;
const device_type VECTREX_ROM_SRAM = &device_creator<vectrex_sram_device>;
-vectrex_rom_device::vectrex_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+vectrex_rom_device::vectrex_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_vectrex_cart_interface(mconfig, *this)
{
}
-vectrex_rom_device::vectrex_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vectrex_rom_device::vectrex_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VECTREX_ROM_STD, "Vectrex Standard Carts", tag, owner, clock, "vectrex_rom", __FILE__),
device_vectrex_cart_interface(mconfig, *this)
{
}
-vectrex_rom64k_device::vectrex_rom64k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vectrex_rom64k_device::vectrex_rom64k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: vectrex_rom_device(mconfig, VECTREX_ROM_64K, "Vectrex Carts w/ Bankswitch", tag, owner, clock, "vectrex_64k", __FILE__), m_bank(0)
{
}
-vectrex_sram_device::vectrex_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vectrex_sram_device::vectrex_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: vectrex_rom_device(mconfig, VECTREX_ROM_SRAM, "Vectrex Carts w/ SRAM", tag, owner, clock, "vectrex_sram", __FILE__)
{
}
diff --git a/src/devices/bus/vectrex/rom.h b/src/devices/bus/vectrex/rom.h
index 453cbfed89b..4ef56d8f58d 100644
--- a/src/devices/bus/vectrex/rom.h
+++ b/src/devices/bus/vectrex/rom.h
@@ -13,8 +13,8 @@ class vectrex_rom_device : public device_t,
{
public:
// construction/destruction
- vectrex_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- vectrex_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vectrex_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ vectrex_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override {}
@@ -30,7 +30,7 @@ class vectrex_rom64k_device : public vectrex_rom_device
{
public:
// construction/destruction
- vectrex_rom64k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vectrex_rom64k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -50,7 +50,7 @@ class vectrex_sram_device : public vectrex_rom_device
{
public:
// construction/destruction
- vectrex_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vectrex_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
virtual DECLARE_WRITE8_MEMBER(write_ram) override;
diff --git a/src/devices/bus/vectrex/slot.cpp b/src/devices/bus/vectrex/slot.cpp
index 4063ed7b01c..44649a8929a 100644
--- a/src/devices/bus/vectrex/slot.cpp
+++ b/src/devices/bus/vectrex/slot.cpp
@@ -45,7 +45,7 @@ device_vectrex_cart_interface::~device_vectrex_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_vectrex_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_vectrex_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -62,7 +62,7 @@ void device_vectrex_cart_interface::rom_alloc(UINT32 size, const char *tag)
//-------------------------------------------------
// vectrex_cart_slot_device - constructor
//-------------------------------------------------
-vectrex_cart_slot_device::vectrex_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vectrex_cart_slot_device::vectrex_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VECTREX_CART_SLOT, "GCE Vectrex Cartridge Slot", tag, owner, clock, "vectrex_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -152,8 +152,8 @@ image_init_result vectrex_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT32 size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
- UINT8 *ROM;
+ uint32_t size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
+ uint8_t *ROM;
if (size > 0x10000)
{
@@ -211,8 +211,8 @@ std::string vectrex_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- UINT32 size = m_file->size();
- std::vector<UINT8> rom(size);
+ uint32_t size = m_file->size();
+ std::vector<uint8_t> rom(size);
int type = VECTREX_STD;
m_file->read(&rom[0], size);
diff --git a/src/devices/bus/vectrex/slot.h b/src/devices/bus/vectrex/slot.h
index 261574556cd..3a06107faf8 100644
--- a/src/devices/bus/vectrex/slot.h
+++ b/src/devices/bus/vectrex/slot.h
@@ -42,14 +42,14 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_ram) {}
virtual DECLARE_WRITE8_MEMBER(write_bank) {}
- void rom_alloc(UINT32 size, const char *tag);
- UINT8* get_rom_base() { return m_rom; }
- UINT32 get_rom_size() { return m_rom_size; }
+ void rom_alloc(uint32_t size, const char *tag);
+ uint8_t* get_rom_base() { return m_rom; }
+ uint32_t get_rom_size() { return m_rom_size; }
protected:
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
};
@@ -61,7 +61,7 @@ class vectrex_cart_slot_device : public device_t,
{
public:
// construction/destruction
- vectrex_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vectrex_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~vectrex_cart_slot_device();
// device-level overrides
diff --git a/src/devices/bus/vic10/exp.cpp b/src/devices/bus/vic10/exp.cpp
index d9a5c414768..dc162e12f8a 100644
--- a/src/devices/bus/vic10/exp.cpp
+++ b/src/devices/bus/vic10/exp.cpp
@@ -56,7 +56,7 @@ device_vic10_expansion_card_interface::~device_vic10_expansion_card_interface()
// vic10_expansion_slot_device - constructor
//-------------------------------------------------
-vic10_expansion_slot_device::vic10_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vic10_expansion_slot_device::vic10_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VIC10_EXPANSION_SLOT, "VIC-10 expansion port", tag, owner, clock, "vic10_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this),
@@ -141,8 +141,8 @@ image_init_result vic10_expansion_slot_device::call_load()
if (cbm_crt_read_header(*m_file, &roml_size, &romh_size, &exrom, &game))
{
- UINT8 *roml = nullptr;
- UINT8 *romh = nullptr;
+ uint8_t *roml = nullptr;
+ uint8_t *romh = nullptr;
m_card->m_lorom.allocate(roml_size);
m_card->m_uprom.allocate(romh_size);
@@ -188,7 +188,7 @@ std::string vic10_expansion_slot_device::get_default_card_software()
// cd_r - cartridge data read
//-------------------------------------------------
-UINT8 vic10_expansion_slot_device::cd_r(address_space &space, offs_t offset, UINT8 data, int lorom, int uprom, int exram)
+uint8_t vic10_expansion_slot_device::cd_r(address_space &space, offs_t offset, uint8_t data, int lorom, int uprom, int exram)
{
if (m_card != nullptr)
{
@@ -203,7 +203,7 @@ UINT8 vic10_expansion_slot_device::cd_r(address_space &space, offs_t offset, UIN
// cd_w - cartridge data write
//-------------------------------------------------
-void vic10_expansion_slot_device::cd_w(address_space &space, offs_t offset, UINT8 data, int lorom, int uprom, int exram)
+void vic10_expansion_slot_device::cd_w(address_space &space, offs_t offset, uint8_t data, int lorom, int uprom, int exram)
{
if (m_card != nullptr)
{
diff --git a/src/devices/bus/vic10/exp.h b/src/devices/bus/vic10/exp.h
index a3ff118c891..7084727e84a 100644
--- a/src/devices/bus/vic10/exp.h
+++ b/src/devices/bus/vic10/exp.h
@@ -93,7 +93,7 @@ class vic10_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- vic10_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic10_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<vic10_expansion_slot_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_res_wr_callback(device_t &device, _Object object) { return downcast<vic10_expansion_slot_device &>(device).m_write_res.set_callback(object); }
@@ -101,8 +101,8 @@ public:
template<class _Object> static devcb_base &set_sp_wr_callback(device_t &device, _Object object) { return downcast<vic10_expansion_slot_device &>(device).m_write_sp.set_callback(object); }
// computer interface
- UINT8 cd_r(address_space &space, offs_t offset, UINT8 data, int lorom, int uprom, int exram);
- void cd_w(address_space &space, offs_t offset, UINT8 data, int lorom, int uprom, int exram);
+ uint8_t cd_r(address_space &space, offs_t offset, uint8_t data, int lorom, int uprom, int exram);
+ void cd_w(address_space &space, offs_t offset, uint8_t data, int lorom, int uprom, int exram);
DECLARE_READ_LINE_MEMBER( p0_r );
DECLARE_WRITE_LINE_MEMBER( p0_w );
@@ -156,17 +156,17 @@ public:
device_vic10_expansion_card_interface(const machine_config &mconfig, device_t &device);
virtual ~device_vic10_expansion_card_interface();
- virtual UINT8 vic10_cd_r(address_space &space, offs_t offset, UINT8 data, int lorom, int uprom, int exram) { return data; };
- virtual void vic10_cd_w(address_space &space, offs_t offset, UINT8 data, int lorom, int uprom, int exram) { };
+ virtual uint8_t vic10_cd_r(address_space &space, offs_t offset, uint8_t data, int lorom, int uprom, int exram) { return data; };
+ virtual void vic10_cd_w(address_space &space, offs_t offset, uint8_t data, int lorom, int uprom, int exram) { };
virtual int vic10_p0_r() { return 0; };
virtual void vic10_p0_w(int state) { };
virtual void vic10_sp_w(int state) { };
virtual void vic10_cnt_w(int state) { };
protected:
- optional_shared_ptr<UINT8> m_lorom;
- optional_shared_ptr<UINT8> m_exram;
- optional_shared_ptr<UINT8> m_uprom;
+ optional_shared_ptr<uint8_t> m_lorom;
+ optional_shared_ptr<uint8_t> m_exram;
+ optional_shared_ptr<uint8_t> m_uprom;
vic10_expansion_slot_device *m_slot;
};
diff --git a/src/devices/bus/vic10/std.cpp b/src/devices/bus/vic10/std.cpp
index a0cd1aa67cf..a9005056f31 100644
--- a/src/devices/bus/vic10/std.cpp
+++ b/src/devices/bus/vic10/std.cpp
@@ -26,7 +26,7 @@ const device_type VIC10_STD = &device_creator<vic10_standard_cartridge_device>;
// vic10_standard_cartridge_device - constructor
//-------------------------------------------------
-vic10_standard_cartridge_device::vic10_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic10_standard_cartridge_device::vic10_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VIC10_STD, "VIC-10 Standard Cartridge", tag, owner, clock, "vic10_standard", __FILE__),
device_vic10_expansion_card_interface(mconfig, *this)
{
@@ -46,7 +46,7 @@ void vic10_standard_cartridge_device::device_start()
// vic10_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 vic10_standard_cartridge_device::vic10_cd_r(address_space &space, offs_t offset, UINT8 data, int lorom, int uprom, int exram)
+uint8_t vic10_standard_cartridge_device::vic10_cd_r(address_space &space, offs_t offset, uint8_t data, int lorom, int uprom, int exram)
{
if (!lorom && m_lorom.bytes())
{
@@ -69,7 +69,7 @@ UINT8 vic10_standard_cartridge_device::vic10_cd_r(address_space &space, offs_t o
// vic10_cd_w - cartridge data write
//-------------------------------------------------
-void vic10_standard_cartridge_device::vic10_cd_w(address_space &space, offs_t offset, UINT8 data, int lorom, int uprom, int exram)
+void vic10_standard_cartridge_device::vic10_cd_w(address_space &space, offs_t offset, uint8_t data, int lorom, int uprom, int exram)
{
if (!exram && m_exram.bytes())
{
diff --git a/src/devices/bus/vic10/std.h b/src/devices/bus/vic10/std.h
index 5f7e206a166..cac02e275e3 100644
--- a/src/devices/bus/vic10/std.h
+++ b/src/devices/bus/vic10/std.h
@@ -27,15 +27,15 @@ class vic10_standard_cartridge_device : public device_t,
{
public:
// construction/destruction
- vic10_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic10_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_vic10_expansion_card_interface overrides
- virtual UINT8 vic10_cd_r(address_space &space, offs_t offset, UINT8 data, int lorom, int uprom, int exram) override;
- virtual void vic10_cd_w(address_space &space, offs_t offset, UINT8 data, int lorom, int uprom, int exram) override;
+ virtual uint8_t vic10_cd_r(address_space &space, offs_t offset, uint8_t data, int lorom, int uprom, int exram) override;
+ virtual void vic10_cd_w(address_space &space, offs_t offset, uint8_t data, int lorom, int uprom, int exram) override;
};
diff --git a/src/devices/bus/vic20/4cga.cpp b/src/devices/bus/vic20/4cga.cpp
index 67901823065..57627b2e88f 100644
--- a/src/devices/bus/vic20/4cga.cpp
+++ b/src/devices/bus/vic20/4cga.cpp
@@ -58,7 +58,7 @@ ioport_constructor c64_4cga_device::device_input_ports() const
// c64_4cga_device - constructor
//-------------------------------------------------
-c64_4cga_device::c64_4cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+c64_4cga_device::c64_4cga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_4CGA, "C64 Protovision 4 Player Interface", tag, owner, clock, "c64_4cga", __FILE__),
device_pet_user_port_interface(mconfig, *this),
m_port(0),
@@ -84,7 +84,7 @@ void c64_4cga_device::device_start()
void c64_4cga_device::update_output()
{
- UINT8 data;
+ uint8_t data;
if (m_port)
{
diff --git a/src/devices/bus/vic20/4cga.h b/src/devices/bus/vic20/4cga.h
index e95e682ae1d..342201c2506 100644
--- a/src/devices/bus/vic20/4cga.h
+++ b/src/devices/bus/vic20/4cga.h
@@ -28,7 +28,7 @@ class c64_4cga_device : public device_t,
{
public:
// construction/destruction
- c64_4cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ c64_4cga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -54,8 +54,8 @@ private:
void update_output();
int m_port;
- UINT8 m_joy3;
- UINT8 m_joy4;
+ uint8_t m_joy3;
+ uint8_t m_joy4;
};
diff --git a/src/devices/bus/vic20/exp.cpp b/src/devices/bus/vic20/exp.cpp
index 1f560f62b5d..c95601773e3 100644
--- a/src/devices/bus/vic20/exp.cpp
+++ b/src/devices/bus/vic20/exp.cpp
@@ -56,7 +56,7 @@ device_vic20_expansion_card_interface::~device_vic20_expansion_card_interface()
// vic20_expansion_slot_device - constructor
//-------------------------------------------------
-vic20_expansion_slot_device::vic20_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vic20_expansion_slot_device::vic20_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VIC20_EXPANSION_SLOT, "VIC-20 expansion port", tag, owner, clock, "vic20_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this),
@@ -122,9 +122,9 @@ image_init_result vic20_expansion_slot_device::call_load()
else if (is_filetype("crt"))
{
// read the header
- UINT8 header[2];
+ uint8_t header[2];
fread(&header, 2);
- UINT16 address = (header[1] << 8) | header[0];
+ uint16_t address = (header[1] << 8) | header[0];
switch (address)
{
@@ -165,7 +165,7 @@ std::string vic20_expansion_slot_device::get_default_card_software()
// cd_r - cartridge data read
//-------------------------------------------------
-UINT8 vic20_expansion_slot_device::cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
+uint8_t vic20_expansion_slot_device::cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
{
if (m_card != nullptr)
{
@@ -180,7 +180,7 @@ UINT8 vic20_expansion_slot_device::cd_r(address_space &space, offs_t offset, UIN
// cd_w - cartridge data write
//-------------------------------------------------
-void vic20_expansion_slot_device::cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
+void vic20_expansion_slot_device::cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
{
if (m_card != nullptr)
{
diff --git a/src/devices/bus/vic20/exp.h b/src/devices/bus/vic20/exp.h
index 9f161fb5c28..8c2d9fc0059 100644
--- a/src/devices/bus/vic20/exp.h
+++ b/src/devices/bus/vic20/exp.h
@@ -88,15 +88,15 @@ class vic20_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- vic20_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic20_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<vic20_expansion_slot_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_nmi_wr_callback(device_t &device, _Object object) { return downcast<vic20_expansion_slot_device &>(device).m_write_nmi.set_callback(object); }
template<class _Object> static devcb_base &set_res_wr_callback(device_t &device, _Object object) { return downcast<vic20_expansion_slot_device &>(device).m_write_res.set_callback(object); }
// computer interface
- UINT8 cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
- void cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
+ uint8_t cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
+ void cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
// cartridge interface
DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); }
@@ -146,15 +146,15 @@ public:
device_vic20_expansion_card_interface(const machine_config &mconfig, device_t &device);
virtual ~device_vic20_expansion_card_interface();
- virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { return data; };
- virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { };
+ virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { return data; };
+ virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { };
protected:
- optional_shared_ptr<UINT8> m_blk1;
- optional_shared_ptr<UINT8> m_blk2;
- optional_shared_ptr<UINT8> m_blk3;
- optional_shared_ptr<UINT8> m_blk5;
- optional_shared_ptr<UINT8> m_nvram;
+ optional_shared_ptr<uint8_t> m_blk1;
+ optional_shared_ptr<uint8_t> m_blk2;
+ optional_shared_ptr<uint8_t> m_blk3;
+ optional_shared_ptr<uint8_t> m_blk5;
+ optional_shared_ptr<uint8_t> m_nvram;
vic20_expansion_slot_device *m_slot;
};
diff --git a/src/devices/bus/vic20/fe3.cpp b/src/devices/bus/vic20/fe3.cpp
index 1c07b296f98..4b338a49d08 100644
--- a/src/devices/bus/vic20/fe3.cpp
+++ b/src/devices/bus/vic20/fe3.cpp
@@ -110,7 +110,7 @@ machine_config_constructor vic20_final_expansion_3_t::device_mconfig_additions()
// vic20_final_expansion_3_t - constructor
//-------------------------------------------------
-vic20_final_expansion_3_t::vic20_final_expansion_3_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vic20_final_expansion_3_t::vic20_final_expansion_3_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VIC20_FE3, "Final Expansion v3", tag, owner, clock, "vic20_fe3", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this),
m_flash_rom(*this, AM29F040_TAG),
@@ -149,7 +149,7 @@ void vic20_final_expansion_3_t::device_reset()
// vic20_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 vic20_final_expansion_3_t::vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
+uint8_t vic20_final_expansion_3_t::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
{
switch (m_reg1 & REG1_MODE_MASK)
{
@@ -370,7 +370,7 @@ UINT8 vic20_final_expansion_3_t::vic20_cd_r(address_space &space, offs_t offset,
// vic20_cd_w - cartridge data write
//-------------------------------------------------
-void vic20_final_expansion_3_t::vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
+void vic20_final_expansion_3_t::vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
{
switch (m_reg1 & REG1_MODE_MASK)
{
@@ -600,9 +600,9 @@ offs_t vic20_final_expansion_3_t::get_address(int bank, int block, offs_t offset
// read_register -
//-------------------------------------------------
-UINT8 vic20_final_expansion_3_t::read_register(offs_t offset)
+uint8_t vic20_final_expansion_3_t::read_register(offs_t offset)
{
- UINT8 data = 0;
+ uint8_t data = 0;
switch (offset)
{
@@ -623,7 +623,7 @@ UINT8 vic20_final_expansion_3_t::read_register(offs_t offset)
// write_register -
//-------------------------------------------------
-void vic20_final_expansion_3_t::write_register(offs_t offset, UINT8 data)
+void vic20_final_expansion_3_t::write_register(offs_t offset, uint8_t data)
{
switch (offset)
{
diff --git a/src/devices/bus/vic20/fe3.h b/src/devices/bus/vic20/fe3.h
index 01a4a743c63..c4446b393d5 100644
--- a/src/devices/bus/vic20/fe3.h
+++ b/src/devices/bus/vic20/fe3.h
@@ -28,7 +28,7 @@ class vic20_final_expansion_3_t : public device_t,
{
public:
// construction/destruction
- vic20_final_expansion_3_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic20_final_expansion_3_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -40,8 +40,8 @@ protected:
virtual void device_reset() override;
// device_vic20_expansion_card_interface overrides
- virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
- virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
private:
enum
@@ -74,14 +74,14 @@ private:
};
offs_t get_address(int bank, int block, offs_t offset);
- UINT8 read_register(offs_t offset);
- void write_register(offs_t offset, UINT8 data);
+ uint8_t read_register(offs_t offset);
+ void write_register(offs_t offset, uint8_t data);
required_device<amd_29f040_device> m_flash_rom;
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
- UINT8 m_reg1;
- UINT8 m_reg2;
+ uint8_t m_reg1;
+ uint8_t m_reg2;
int m_lockbit;
};
diff --git a/src/devices/bus/vic20/megacart.cpp b/src/devices/bus/vic20/megacart.cpp
index e92e1dbbc55..a6d178f72f2 100644
--- a/src/devices/bus/vic20/megacart.cpp
+++ b/src/devices/bus/vic20/megacart.cpp
@@ -46,7 +46,7 @@ machine_config_constructor vic20_megacart_device::device_mconfig_additions() con
// vic20_megacart_device - constructor
//-------------------------------------------------
-vic20_megacart_device::vic20_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic20_megacart_device::vic20_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VIC20_MEGACART, "Mega-Cart", tag, owner, clock, "megacart", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
@@ -81,7 +81,7 @@ void vic20_megacart_device::device_reset()
// vic20_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 vic20_megacart_device::vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
+uint8_t vic20_megacart_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
{
if (!ram1 || !ram2 || !ram3 || !io2 || !io3)
{
@@ -105,7 +105,7 @@ UINT8 vic20_megacart_device::vic20_cd_r(address_space &space, offs_t offset, UIN
// vic20_cd_w - cartridge data write
//-------------------------------------------------
-void vic20_megacart_device::vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
+void vic20_megacart_device::vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
{
if (!ram1 || !ram2 || !ram3 || !io2)
{
diff --git a/src/devices/bus/vic20/megacart.h b/src/devices/bus/vic20/megacart.h
index 678ddac1cff..a4bb4ff4231 100644
--- a/src/devices/bus/vic20/megacart.h
+++ b/src/devices/bus/vic20/megacart.h
@@ -28,7 +28,7 @@ class vic20_megacart_device : public device_t,
{
public:
// construction/destruction
- vic20_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic20_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -44,8 +44,8 @@ protected:
virtual void nvram_write(emu_file &file) override { file.write(m_nvram, m_nvram.bytes()); }
// device_vic20_expansion_card_interface overrides
- virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
- virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
private:
int m_nvram_en;
diff --git a/src/devices/bus/vic20/std.cpp b/src/devices/bus/vic20/std.cpp
index fe02022f2be..fb8b2bf90d1 100644
--- a/src/devices/bus/vic20/std.cpp
+++ b/src/devices/bus/vic20/std.cpp
@@ -26,7 +26,7 @@ const device_type VIC20_STD = &device_creator<vic20_standard_cartridge_device>;
// vic20_standard_cartridge_device - constructor
//-------------------------------------------------
-vic20_standard_cartridge_device::vic20_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic20_standard_cartridge_device::vic20_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VIC20_STD, "VIC-20 Standard Cartridge", tag, owner, clock, "vic20_standard", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this)
{
@@ -46,7 +46,7 @@ void vic20_standard_cartridge_device::device_start()
// vic20_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 vic20_standard_cartridge_device::vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
+uint8_t vic20_standard_cartridge_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
{
if (!blk1 && (m_blk1 != nullptr))
{
diff --git a/src/devices/bus/vic20/std.h b/src/devices/bus/vic20/std.h
index 0ea4cdec1ab..2e73ba0f037 100644
--- a/src/devices/bus/vic20/std.h
+++ b/src/devices/bus/vic20/std.h
@@ -27,14 +27,14 @@ class vic20_standard_cartridge_device : public device_t,
{
public:
// construction/destruction
- vic20_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic20_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_vic20_expansion_card_interface overrides
- virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
};
diff --git a/src/devices/bus/vic20/vic1010.cpp b/src/devices/bus/vic20/vic1010.cpp
index 5aa981edb5a..cf112877b9f 100644
--- a/src/devices/bus/vic20/vic1010.cpp
+++ b/src/devices/bus/vic20/vic1010.cpp
@@ -51,7 +51,7 @@ machine_config_constructor vic1010_device::device_mconfig_additions() const
// vic1010_device - constructor
//-------------------------------------------------
-vic1010_device::vic1010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic1010_device::vic1010_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VIC1010, "VIC1010", tag, owner, clock, "vic1010", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this),
m_slot1(*this, "slot1"),
@@ -97,11 +97,11 @@ void vic1010_device::device_reset()
// vic20_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 vic1010_device::vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
+uint8_t vic1010_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
{
for (auto elem : m_expansion_slot)
{
- UINT8 slot_data = elem->cd_r(space, offset, data, ram1, ram2, ram3, blk1, blk2, blk3, blk5, io2, io3);
+ uint8_t slot_data = elem->cd_r(space, offset, data, ram1, ram2, ram3, blk1, blk2, blk3, blk5, io2, io3);
if (data != slot_data)
{
@@ -117,7 +117,7 @@ UINT8 vic1010_device::vic20_cd_r(address_space &space, offs_t offset, UINT8 data
// vic20_cd_w - cartridge data write
//-------------------------------------------------
-void vic1010_device::vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
+void vic1010_device::vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
{
for (auto & elem : m_expansion_slot)
{
diff --git a/src/devices/bus/vic20/vic1010.h b/src/devices/bus/vic20/vic1010.h
index a481ba9cb08..264c32a7734 100644
--- a/src/devices/bus/vic20/vic1010.h
+++ b/src/devices/bus/vic20/vic1010.h
@@ -35,7 +35,7 @@ class vic1010_device : public device_t,
{
public:
// construction/destruction
- vic1010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1010_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -46,8 +46,8 @@ protected:
virtual void device_reset() override;
// device_vic20_expansion_card_interface overrides
- virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
- virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
private:
required_device<vic20_expansion_slot_device> m_slot1;
diff --git a/src/devices/bus/vic20/vic1011.cpp b/src/devices/bus/vic20/vic1011.cpp
index 0b0d30f97f5..3c8bc3352a4 100644
--- a/src/devices/bus/vic20/vic1011.cpp
+++ b/src/devices/bus/vic20/vic1011.cpp
@@ -58,7 +58,7 @@ machine_config_constructor vic1011_device::device_mconfig_additions() const
// vic1011_device - constructor
//-------------------------------------------------
-vic1011_device::vic1011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic1011_device::vic1011_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VIC1011, "VIC1011", tag, owner, clock, "vic1011", __FILE__),
device_pet_user_port_interface(mconfig, *this),
m_rs232(*this, RS232_TAG)
diff --git a/src/devices/bus/vic20/vic1011.h b/src/devices/bus/vic20/vic1011.h
index 0e5b104b0e3..d3362b95d1a 100644
--- a/src/devices/bus/vic20/vic1011.h
+++ b/src/devices/bus/vic20/vic1011.h
@@ -27,7 +27,7 @@ class vic1011_device : public device_t,
{
public:
// construction/destruction
- vic1011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1011_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/vic20/vic1110.cpp b/src/devices/bus/vic20/vic1110.cpp
index c8d9acb1398..4144cb2b97d 100644
--- a/src/devices/bus/vic20/vic1110.cpp
+++ b/src/devices/bus/vic20/vic1110.cpp
@@ -65,7 +65,7 @@ ioport_constructor vic1110_device::device_input_ports() const
// vic1110_device - constructor
//-------------------------------------------------
-vic1110_device::vic1110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic1110_device::vic1110_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VIC1110, "VIC1110", tag, owner, clock, "vic1110", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram"),
@@ -89,9 +89,9 @@ void vic1110_device::device_start()
// vic20_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 vic1110_device::vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
+uint8_t vic1110_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
{
- UINT8 sw = m_sw->read();
+ uint8_t sw = m_sw->read();
if ((!blk1 && (sw == BLK1)) || (!blk2 && (sw == BLK2)) || (!blk3 && (sw == BLK3)) || (!blk5 && (sw == BLK5)))
{
@@ -106,9 +106,9 @@ UINT8 vic1110_device::vic20_cd_r(address_space &space, offs_t offset, UINT8 data
// vic20_cd_w - cartridge data write
//-------------------------------------------------
-void vic1110_device::vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
+void vic1110_device::vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
{
- UINT8 sw = m_sw->read();
+ uint8_t sw = m_sw->read();
if ((!blk1 && (sw == BLK1)) || (!blk2 && (sw == BLK2)) || (!blk3 && (sw == BLK3)) || (!blk5 && (sw == BLK5)))
{
diff --git a/src/devices/bus/vic20/vic1110.h b/src/devices/bus/vic20/vic1110.h
index 21a4660d282..05c99216849 100644
--- a/src/devices/bus/vic20/vic1110.h
+++ b/src/devices/bus/vic20/vic1110.h
@@ -27,7 +27,7 @@ class vic1110_device : public device_t,
{
public:
// construction/destruction
- vic1110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1110_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,11 +37,11 @@ protected:
virtual void device_start() override;
// device_vic20_expansion_card_interface overrides
- virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
- virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
private:
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
required_ioport m_sw;
};
diff --git a/src/devices/bus/vic20/vic1111.cpp b/src/devices/bus/vic20/vic1111.cpp
index 770d5639d8f..894b4075802 100644
--- a/src/devices/bus/vic20/vic1111.cpp
+++ b/src/devices/bus/vic20/vic1111.cpp
@@ -26,7 +26,7 @@ const device_type VIC1111 = &device_creator<vic1111_device>;
// vic1111_device - constructor
//-------------------------------------------------
-vic1111_device::vic1111_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic1111_device::vic1111_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VIC1111, "VIC1111", tag, owner, clock, "vic1111", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram")
@@ -49,7 +49,7 @@ void vic1111_device::device_start()
// vic20_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 vic1111_device::vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
+uint8_t vic1111_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
{
if (!blk1)
{
@@ -68,7 +68,7 @@ UINT8 vic1111_device::vic20_cd_r(address_space &space, offs_t offset, UINT8 data
// vic20_cd_w - cartridge data write
//-------------------------------------------------
-void vic1111_device::vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
+void vic1111_device::vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
{
if (!blk1)
{
diff --git a/src/devices/bus/vic20/vic1111.h b/src/devices/bus/vic20/vic1111.h
index 83783da6878..eebe166805a 100644
--- a/src/devices/bus/vic20/vic1111.h
+++ b/src/devices/bus/vic20/vic1111.h
@@ -27,18 +27,18 @@ class vic1111_device : public device_t,
{
public:
// construction/destruction
- vic1111_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1111_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_vic20_expansion_card_interface overrides
- virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
- virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
private:
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
};
diff --git a/src/devices/bus/vic20/vic1112.cpp b/src/devices/bus/vic20/vic1112.cpp
index 9ccb180aa6a..063fab98d68 100644
--- a/src/devices/bus/vic20/vic1112.cpp
+++ b/src/devices/bus/vic20/vic1112.cpp
@@ -50,7 +50,7 @@ READ8_MEMBER( vic1112_device::via0_pb_r )
*/
- UINT8 data = 0;
+ uint8_t data = 0;
data |= m_bus->eoi_r() << 3;
data |= m_bus->dav_r() << 4;
@@ -134,7 +134,7 @@ machine_config_constructor vic1112_device::device_mconfig_additions() const
// vic1112_device - constructor
//-------------------------------------------------
-vic1112_device::vic1112_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic1112_device::vic1112_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VIC1112, "VIC1112", tag, owner, clock, "vic1112", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this),
m_via0(*this, M6522_0_TAG),
@@ -171,7 +171,7 @@ void vic1112_device::device_reset()
// vic20_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 vic1112_device::vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
+uint8_t vic1112_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
{
if (!io2)
{
@@ -200,7 +200,7 @@ UINT8 vic1112_device::vic20_cd_r(address_space &space, offs_t offset, UINT8 data
// vic20_cd_w - cartridge data write
//-------------------------------------------------
-void vic1112_device::vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
+void vic1112_device::vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
{
if (!io2)
{
diff --git a/src/devices/bus/vic20/vic1112.h b/src/devices/bus/vic20/vic1112.h
index fce5971c533..84cb158f17b 100644
--- a/src/devices/bus/vic20/vic1112.h
+++ b/src/devices/bus/vic20/vic1112.h
@@ -32,7 +32,7 @@ class vic1112_device : public device_t,
{
public:
// construction/destruction
- vic1112_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1112_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -49,15 +49,15 @@ protected:
virtual void device_reset() override;
// device_vic20_expansion_card_interface overrides
- virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
- virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
private:
required_device<via6522_device> m_via0;
required_device<via6522_device> m_via1;
required_device<ieee488_device> m_bus;
- //UINT8 *m_rom;
+ //uint8_t *m_rom;
int m_via0_irq;
int m_via1_irq;
diff --git a/src/devices/bus/vic20/vic1210.cpp b/src/devices/bus/vic20/vic1210.cpp
index 5acb518cd08..026fba61c9b 100644
--- a/src/devices/bus/vic20/vic1210.cpp
+++ b/src/devices/bus/vic20/vic1210.cpp
@@ -27,7 +27,7 @@ const device_type VIC1210 = &device_creator<vic1210_device>;
// vic1210_device - constructor
//-------------------------------------------------
-vic1210_device::vic1210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+vic1210_device::vic1210_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VIC1210, "VIC1210", tag, owner, clock, "vic1210", __FILE__),
device_vic20_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram")
@@ -50,7 +50,7 @@ void vic1210_device::device_start()
// vic20_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 vic1210_device::vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
+uint8_t vic1210_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
{
if (!ram1 || !ram2 || !ram3)
{
@@ -69,7 +69,7 @@ UINT8 vic1210_device::vic20_cd_r(address_space &space, offs_t offset, UINT8 data
// vic20_cd_w - cartridge data write
//-------------------------------------------------
-void vic1210_device::vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
+void vic1210_device::vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3)
{
if (!ram1 || !ram2 || !ram3)
{
diff --git a/src/devices/bus/vic20/vic1210.h b/src/devices/bus/vic20/vic1210.h
index 90de25cddae..dbdcffc3407 100644
--- a/src/devices/bus/vic20/vic1210.h
+++ b/src/devices/bus/vic20/vic1210.h
@@ -28,18 +28,18 @@ class vic1210_device : public device_t,
{
public:
// construction/destruction
- vic1210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vic1210_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_vic20_expansion_card_interface overrides
- virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
- virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
private:
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
};
diff --git a/src/devices/bus/vidbrain/exp.cpp b/src/devices/bus/vidbrain/exp.cpp
index 183d2f590ff..128a40d82c9 100644
--- a/src/devices/bus/vidbrain/exp.cpp
+++ b/src/devices/bus/vidbrain/exp.cpp
@@ -47,7 +47,7 @@ device_videobrain_expansion_card_interface::device_videobrain_expansion_card_int
// videobrain_roml_pointer - get low ROM pointer
//-------------------------------------------------
-UINT8* device_videobrain_expansion_card_interface::videobrain_rom_pointer(running_machine &machine, size_t size)
+uint8_t* device_videobrain_expansion_card_interface::videobrain_rom_pointer(running_machine &machine, size_t size)
{
if (m_rom.empty())
{
@@ -64,7 +64,7 @@ UINT8* device_videobrain_expansion_card_interface::videobrain_rom_pointer(runnin
// videobrain_ram_pointer - get RAM pointer
//-------------------------------------------------
-UINT8* device_videobrain_expansion_card_interface::videobrain_ram_pointer(running_machine &machine, size_t size)
+uint8_t* device_videobrain_expansion_card_interface::videobrain_ram_pointer(running_machine &machine, size_t size)
{
if (m_ram.empty())
{
@@ -86,7 +86,7 @@ UINT8* device_videobrain_expansion_card_interface::videobrain_ram_pointer(runnin
// videobrain_expansion_slot_device - constructor
//-------------------------------------------------
-videobrain_expansion_slot_device::videobrain_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+videobrain_expansion_slot_device::videobrain_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VIDEOBRAIN_EXPANSION_SLOT, "VideoBrain expansion port", tag, owner, clock, "videobrain_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
device_image_interface(mconfig, *this),
@@ -152,9 +152,9 @@ std::string videobrain_expansion_slot_device::get_default_card_software()
// bo_r - cartridge data read
//-------------------------------------------------
-UINT8 videobrain_expansion_slot_device::bo_r(address_space &space, offs_t offset, int cs1, int cs2)
+uint8_t videobrain_expansion_slot_device::bo_r(address_space &space, offs_t offset, int cs1, int cs2)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_cart != nullptr)
{
@@ -169,7 +169,7 @@ UINT8 videobrain_expansion_slot_device::bo_r(address_space &space, offs_t offset
// bo_w - cartridge data write
//-------------------------------------------------
-void videobrain_expansion_slot_device::bo_w(address_space &space, offs_t offset, UINT8 data, int cs1, int cs2)
+void videobrain_expansion_slot_device::bo_w(address_space &space, offs_t offset, uint8_t data, int cs1, int cs2)
{
if (m_cart != nullptr)
{
diff --git a/src/devices/bus/vidbrain/exp.h b/src/devices/bus/vidbrain/exp.h
index d7ef79f3528..4c00a34ff4f 100644
--- a/src/devices/bus/vidbrain/exp.h
+++ b/src/devices/bus/vidbrain/exp.h
@@ -84,18 +84,18 @@ public:
protected:
// initialization
- virtual UINT8* videobrain_rom_pointer(running_machine &machine, size_t size);
- virtual UINT8* videobrain_ram_pointer(running_machine &machine, size_t size);
+ virtual uint8_t* videobrain_rom_pointer(running_machine &machine, size_t size);
+ virtual uint8_t* videobrain_ram_pointer(running_machine &machine, size_t size);
// runtime
- virtual UINT8 videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) { return 0; };
- virtual void videobrain_bo_w(address_space &space, offs_t offset, UINT8 data, int cs1, int cs2) { };
+ virtual uint8_t videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) { return 0; };
+ virtual void videobrain_bo_w(address_space &space, offs_t offset, uint8_t data, int cs1, int cs2) { };
virtual void videobrain_extres_w() { };
videobrain_expansion_slot_device *m_slot;
- std::vector<UINT8> m_rom;
- std::vector<UINT8> m_ram;
+ std::vector<uint8_t> m_rom;
+ std::vector<uint8_t> m_ram;
size_t m_rom_mask;
size_t m_ram_mask;
@@ -110,14 +110,14 @@ class videobrain_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- videobrain_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ videobrain_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~videobrain_expansion_slot_device() { }
template<class _Object> static devcb_base &set_extres_wr_callback(device_t &device, _Object object) { return downcast<videobrain_expansion_slot_device &>(device).m_write_extres.set_callback(object); }
// computer interface
- UINT8 bo_r(address_space &space, offs_t offset, int cs1, int cs2);
- void bo_w(address_space &space, offs_t offset, UINT8 data, int cs1, int cs2);
+ uint8_t bo_r(address_space &space, offs_t offset, int cs1, int cs2);
+ void bo_w(address_space &space, offs_t offset, uint8_t data, int cs1, int cs2);
DECLARE_READ8_MEMBER( cs1_r ) { return bo_r(space, offset + 0x1000, 0, 1); }
DECLARE_WRITE8_MEMBER( cs1_w ) { bo_w(space, offset + 0x1000, data, 0, 1); }
diff --git a/src/devices/bus/vidbrain/money_minder.cpp b/src/devices/bus/vidbrain/money_minder.cpp
index f5fa70bd868..47c2589c335 100644
--- a/src/devices/bus/vidbrain/money_minder.cpp
+++ b/src/devices/bus/vidbrain/money_minder.cpp
@@ -26,7 +26,7 @@ const device_type VB_MONEY_MINDER = &device_creator<videobrain_money_minder_cart
// videobrain_money_minder_cartridge_device - constructor
//-------------------------------------------------
-videobrain_money_minder_cartridge_device::videobrain_money_minder_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+videobrain_money_minder_cartridge_device::videobrain_money_minder_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VB_MONEY_MINDER, "VideoBrain Money Minder cartridge", tag, owner, clock, "vb_money_minder", __FILE__),
device_videobrain_expansion_card_interface(mconfig, *this)
{
@@ -46,9 +46,9 @@ void videobrain_money_minder_cartridge_device::device_start()
// videobrain_cd_r - cartridge data read
//-------------------------------------------------
-UINT8 videobrain_money_minder_cartridge_device::videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2)
+uint8_t videobrain_money_minder_cartridge_device::videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (!cs1 || !cs2)
{
@@ -67,7 +67,7 @@ UINT8 videobrain_money_minder_cartridge_device::videobrain_bo_r(address_space &s
// videobrain_bo_w - cartridge data write
//-------------------------------------------------
-void videobrain_money_minder_cartridge_device::videobrain_bo_w(address_space &space, offs_t offset, UINT8 data, int cs1, int cs2)
+void videobrain_money_minder_cartridge_device::videobrain_bo_w(address_space &space, offs_t offset, uint8_t data, int cs1, int cs2)
{
if (offset >= 0x3800)
{
diff --git a/src/devices/bus/vidbrain/money_minder.h b/src/devices/bus/vidbrain/money_minder.h
index b32723338f9..a9cf0263334 100644
--- a/src/devices/bus/vidbrain/money_minder.h
+++ b/src/devices/bus/vidbrain/money_minder.h
@@ -27,15 +27,15 @@ class videobrain_money_minder_cartridge_device : public device_t,
{
public:
// construction/destruction
- videobrain_money_minder_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ videobrain_money_minder_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_videobrain_expansion_card_interface overrides
- virtual UINT8 videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) override;
- virtual void videobrain_bo_w(address_space &space, offs_t offset, UINT8 data, int cs1, int cs2) override;
+ virtual uint8_t videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) override;
+ virtual void videobrain_bo_w(address_space &space, offs_t offset, uint8_t data, int cs1, int cs2) override;
};
diff --git a/src/devices/bus/vidbrain/std.cpp b/src/devices/bus/vidbrain/std.cpp
index f56f5fd9d9f..93f2867098b 100644
--- a/src/devices/bus/vidbrain/std.cpp
+++ b/src/devices/bus/vidbrain/std.cpp
@@ -26,7 +26,7 @@ const device_type VB_STD = &device_creator<videobrain_standard_cartridge_device>
// videobrain_standard_cartridge_device - constructor
//-------------------------------------------------
-videobrain_standard_cartridge_device::videobrain_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+videobrain_standard_cartridge_device::videobrain_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VB_STD, "VideoBrain standard cartridge", tag, owner, clock, "vb_std", __FILE__),
device_videobrain_expansion_card_interface(mconfig, *this)
{
@@ -46,9 +46,9 @@ void videobrain_standard_cartridge_device::device_start()
// videobrain_bo_r - cartridge data read
//-------------------------------------------------
-UINT8 videobrain_standard_cartridge_device::videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2)
+uint8_t videobrain_standard_cartridge_device::videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (!cs1)
{
diff --git a/src/devices/bus/vidbrain/std.h b/src/devices/bus/vidbrain/std.h
index 8cde3c70db4..c1e93d0dc94 100644
--- a/src/devices/bus/vidbrain/std.h
+++ b/src/devices/bus/vidbrain/std.h
@@ -27,14 +27,14 @@ class videobrain_standard_cartridge_device : public device_t,
{
public:
// construction/destruction
- videobrain_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ videobrain_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_videobrain_expansion_card_interface overrides
- virtual UINT8 videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) override;
+ virtual uint8_t videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) override;
};
diff --git a/src/devices/bus/vidbrain/timeshare.cpp b/src/devices/bus/vidbrain/timeshare.cpp
index 196bf66db2e..2b24c0e997e 100644
--- a/src/devices/bus/vidbrain/timeshare.cpp
+++ b/src/devices/bus/vidbrain/timeshare.cpp
@@ -26,7 +26,7 @@ const device_type VB_TIMESHARE = &device_creator<videobrain_timeshare_cartridge_
// videobrain_timeshare_cartridge_device - constructor
//-------------------------------------------------
-videobrain_timeshare_cartridge_device::videobrain_timeshare_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+videobrain_timeshare_cartridge_device::videobrain_timeshare_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VB_TIMESHARE, "VideoBrain Timeshare cartridge", tag, owner, clock, "vb_timeshare", __FILE__),
device_videobrain_expansion_card_interface(mconfig, *this)
{
@@ -46,9 +46,9 @@ void videobrain_timeshare_cartridge_device::device_start()
// videobrain_bo_r - cartridge data read
//-------------------------------------------------
-UINT8 videobrain_timeshare_cartridge_device::videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2)
+uint8_t videobrain_timeshare_cartridge_device::videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (!cs1)
{
@@ -66,7 +66,7 @@ UINT8 videobrain_timeshare_cartridge_device::videobrain_bo_r(address_space &spac
// videobrain_bo_w - cartridge data write
//-------------------------------------------------
-void videobrain_timeshare_cartridge_device::videobrain_bo_w(address_space &space, offs_t offset, UINT8 data, int cs1, int cs2)
+void videobrain_timeshare_cartridge_device::videobrain_bo_w(address_space &space, offs_t offset, uint8_t data, int cs1, int cs2)
{
if (!cs2)
{
diff --git a/src/devices/bus/vidbrain/timeshare.h b/src/devices/bus/vidbrain/timeshare.h
index ac59726dfb7..517cebe2b99 100644
--- a/src/devices/bus/vidbrain/timeshare.h
+++ b/src/devices/bus/vidbrain/timeshare.h
@@ -27,15 +27,15 @@ class videobrain_timeshare_cartridge_device : public device_t,
{
public:
// construction/destruction
- videobrain_timeshare_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ videobrain_timeshare_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
virtual void device_start() override;
// device_videobrain_expansion_card_interface overrides
- virtual UINT8 videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) override;
- virtual void videobrain_bo_w(address_space &space, offs_t offset, UINT8 data, int cs1, int cs2) override;
+ virtual uint8_t videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) override;
+ virtual void videobrain_bo_w(address_space &space, offs_t offset, uint8_t data, int cs1, int cs2) override;
};
diff --git a/src/devices/bus/vip/byteio.cpp b/src/devices/bus/vip/byteio.cpp
index 871a60138f4..f4db30fd93d 100644
--- a/src/devices/bus/vip/byteio.cpp
+++ b/src/devices/bus/vip/byteio.cpp
@@ -42,7 +42,7 @@ device_vip_byteio_port_interface::device_vip_byteio_port_interface(const machine
// vip_byteio_port_device - constructor
//-------------------------------------------------
-vip_byteio_port_device::vip_byteio_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vip_byteio_port_device::vip_byteio_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VIP_BYTEIO_PORT, "VIP byte I/O port", tag, owner, clock, "vip_byteio_port", __FILE__),
device_slot_interface(mconfig, *this),
m_write_inst(*this), m_cart(nullptr)
@@ -71,8 +71,8 @@ void vip_byteio_port_device::device_reset()
}
-UINT8 vip_byteio_port_device::in_r() { UINT8 data = 0xff; if (m_cart != nullptr) data = m_cart->vip_in_r(); return data; }
-void vip_byteio_port_device::out_w(UINT8 data) { if (m_cart != nullptr) m_cart->vip_out_w(data); }
+uint8_t vip_byteio_port_device::in_r() { uint8_t data = 0xff; if (m_cart != nullptr) data = m_cart->vip_in_r(); return data; }
+void vip_byteio_port_device::out_w(uint8_t data) { if (m_cart != nullptr) m_cart->vip_out_w(data); }
READ_LINE_MEMBER( vip_byteio_port_device::ef3_r ) { int state = CLEAR_LINE; if (m_cart != nullptr) state = m_cart->vip_ef3_r(); return state; }
READ_LINE_MEMBER( vip_byteio_port_device::ef4_r ) { int state = CLEAR_LINE; if (m_cart != nullptr) state = m_cart->vip_ef4_r(); return state; }
WRITE_LINE_MEMBER( vip_byteio_port_device::q_w ) { if (m_cart != nullptr) m_cart->vip_q_w(state); }
diff --git a/src/devices/bus/vip/byteio.h b/src/devices/bus/vip/byteio.h
index 8871e1f0d72..ce196dc20fd 100644
--- a/src/devices/bus/vip/byteio.h
+++ b/src/devices/bus/vip/byteio.h
@@ -72,13 +72,13 @@ class vip_byteio_port_device : public device_t,
{
public:
// construction/destruction
- vip_byteio_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vip_byteio_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _inst> void set_inst_callback(_inst inst) { m_write_inst.set_callback(inst); }
// computer interface
- UINT8 in_r();
- void out_w(UINT8 data);
+ uint8_t in_r();
+ void out_w(uint8_t data);
DECLARE_READ_LINE_MEMBER( ef3_r );
DECLARE_READ_LINE_MEMBER( ef4_r );
DECLARE_WRITE_LINE_MEMBER( q_w );
@@ -106,8 +106,8 @@ public:
// construction/destruction
device_vip_byteio_port_interface(const machine_config &mconfig, device_t &device);
- virtual UINT8 vip_in_r() { return 0xff; };
- virtual void vip_out_w(UINT8 data) { };
+ virtual uint8_t vip_in_r() { return 0xff; };
+ virtual void vip_out_w(uint8_t data) { };
virtual int vip_ef3_r() { return CLEAR_LINE; }
virtual int vip_ef4_r() { return CLEAR_LINE; }
diff --git a/src/devices/bus/vip/exp.cpp b/src/devices/bus/vip/exp.cpp
index 59db0c4844d..a062ea14670 100644
--- a/src/devices/bus/vip/exp.cpp
+++ b/src/devices/bus/vip/exp.cpp
@@ -50,7 +50,7 @@ device_vip_expansion_card_interface::device_vip_expansion_card_interface(const m
// vip_expansion_slot_device - constructor
//-------------------------------------------------
-vip_expansion_slot_device::vip_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vip_expansion_slot_device::vip_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VIP_EXPANSION_SLOT, "VIP expansion port", tag, owner, clock, "vip_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_write_int(*this),
@@ -79,9 +79,9 @@ void vip_expansion_slot_device::device_start()
// program_r - program read
//-------------------------------------------------
-UINT8 vip_expansion_slot_device::program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh)
+uint8_t vip_expansion_slot_device::program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_card != nullptr)
{
@@ -96,7 +96,7 @@ UINT8 vip_expansion_slot_device::program_r(address_space &space, offs_t offset,
// program_w - program write
//-------------------------------------------------
-void vip_expansion_slot_device::program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh)
+void vip_expansion_slot_device::program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh)
{
if (m_card != nullptr)
{
@@ -109,9 +109,9 @@ void vip_expansion_slot_device::program_w(address_space &space, offs_t offset, U
// io_r - io read
//-------------------------------------------------
-UINT8 vip_expansion_slot_device::io_r(address_space &space, offs_t offset)
+uint8_t vip_expansion_slot_device::io_r(address_space &space, offs_t offset)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_card != nullptr)
{
@@ -126,7 +126,7 @@ UINT8 vip_expansion_slot_device::io_r(address_space &space, offs_t offset)
// io_w - io write
//-------------------------------------------------
-void vip_expansion_slot_device::io_w(address_space &space, offs_t offset, UINT8 data)
+void vip_expansion_slot_device::io_w(address_space &space, offs_t offset, uint8_t data)
{
if (m_card != nullptr)
{
@@ -139,9 +139,9 @@ void vip_expansion_slot_device::io_w(address_space &space, offs_t offset, UINT8
// dma_r - dma read
//-------------------------------------------------
-UINT8 vip_expansion_slot_device::dma_r(address_space &space, offs_t offset)
+uint8_t vip_expansion_slot_device::dma_r(address_space &space, offs_t offset)
{
- UINT8 data = 0;
+ uint8_t data = 0;
if (m_card != nullptr)
{
@@ -156,7 +156,7 @@ UINT8 vip_expansion_slot_device::dma_r(address_space &space, offs_t offset)
// dma_w - dma write
//-------------------------------------------------
-void vip_expansion_slot_device::dma_w(address_space &space, offs_t offset, UINT8 data)
+void vip_expansion_slot_device::dma_w(address_space &space, offs_t offset, uint8_t data)
{
if (m_card != nullptr)
{
@@ -169,7 +169,7 @@ void vip_expansion_slot_device::dma_w(address_space &space, offs_t offset, UINT8
// screen_update -
//-------------------------------------------------
-UINT32 vip_expansion_slot_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t vip_expansion_slot_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
bool value = false;
diff --git a/src/devices/bus/vip/exp.h b/src/devices/bus/vip/exp.h
index 8aad60fafc8..6c9d65b5b12 100644
--- a/src/devices/bus/vip/exp.h
+++ b/src/devices/bus/vip/exp.h
@@ -81,20 +81,20 @@ class vip_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- vip_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vip_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> static devcb_base &set_int_wr_callback(device_t &device, _Object object) { return downcast<vip_expansion_slot_device &>(device).m_write_int.set_callback(object); }
template<class _Object> static devcb_base &set_dma_out_wr_callback(device_t &device, _Object object) { return downcast<vip_expansion_slot_device &>(device).m_write_dma_out.set_callback(object); }
template<class _Object> static devcb_base &set_dma_in_wr_callback(device_t &device, _Object object) { return downcast<vip_expansion_slot_device &>(device).m_write_dma_in.set_callback(object); }
// computer interface
- UINT8 program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh);
- void program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh);
- UINT8 io_r(address_space &space, offs_t offset);
- void io_w(address_space &space, offs_t offset, UINT8 data);
- UINT8 dma_r(address_space &space, offs_t offset);
- void dma_w(address_space &space, offs_t offset, UINT8 data);
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint8_t program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh);
+ void program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh);
+ uint8_t io_r(address_space &space, offs_t offset);
+ void io_w(address_space &space, offs_t offset, uint8_t data);
+ uint8_t dma_r(address_space &space, offs_t offset);
+ void dma_w(address_space &space, offs_t offset, uint8_t data);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_READ_LINE_MEMBER( ef1_r );
DECLARE_READ_LINE_MEMBER( ef3_r );
DECLARE_READ_LINE_MEMBER( ef4_r );
@@ -131,16 +131,16 @@ public:
protected:
// runtime
- virtual UINT8 vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) { return 0xff; };
- virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh) { };
+ virtual uint8_t vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) { return 0xff; };
+ virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) { };
- virtual UINT8 vip_io_r(address_space &space, offs_t offset) { return 0xff; };
- virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data) { };
+ virtual uint8_t vip_io_r(address_space &space, offs_t offset) { return 0xff; };
+ virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) { };
- virtual UINT8 vip_dma_r(address_space &space, offs_t offset) { return 0xff; };
- virtual void vip_dma_w(address_space &space, offs_t offset, UINT8 data) { };
+ virtual uint8_t vip_dma_r(address_space &space, offs_t offset) { return 0xff; };
+ virtual void vip_dma_w(address_space &space, offs_t offset, uint8_t data) { };
- virtual UINT32 vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return 0; }
+ virtual uint32_t vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return 0; }
virtual int vip_ef1_r() { return CLEAR_LINE; }
virtual int vip_ef3_r() { return CLEAR_LINE; }
diff --git a/src/devices/bus/vip/vp550.cpp b/src/devices/bus/vip/vp550.cpp
index dbf25a6a190..3d31b268c38 100644
--- a/src/devices/bus/vip/vp550.cpp
+++ b/src/devices/bus/vip/vp550.cpp
@@ -78,7 +78,7 @@ machine_config_constructor vp550_device::device_mconfig_additions() const
// vp550_device - constructor
//-------------------------------------------------
-vp550_device::vp550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp550_device::vp550_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VP550, "VP550", tag, owner, clock, "vp550", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_pfg_a(*this, CDP1863_A_TAG),
@@ -116,7 +116,7 @@ void vp550_device::device_timer(emu_timer &timer, device_timer_id id, int param,
// vip_program_w - program write
//-------------------------------------------------
-void vp550_device::vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh)
+void vp550_device::vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh)
{
if (BIT(offset, 15))
{
diff --git a/src/devices/bus/vip/vp550.h b/src/devices/bus/vip/vp550.h
index 99ba25b64fd..9f3f5a74fc7 100644
--- a/src/devices/bus/vip/vp550.h
+++ b/src/devices/bus/vip/vp550.h
@@ -28,7 +28,7 @@ class vp550_device : public device_t,
{
public:
// construction/destruction
- vp550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp550_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -45,7 +45,7 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
// device_vip_expansion_card_interface overrides
- virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh) override;
+ virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) override;
virtual void vip_sc_w(int data) override;
virtual void vip_q_w(int state) override;
virtual void vip_run_w(int state) override;
diff --git a/src/devices/bus/vip/vp570.cpp b/src/devices/bus/vip/vp570.cpp
index 42ec4119c21..1b8852438e7 100644
--- a/src/devices/bus/vip/vp570.cpp
+++ b/src/devices/bus/vip/vp570.cpp
@@ -59,7 +59,7 @@ ioport_constructor vp570_device::device_input_ports() const
// vp570_device - constructor
//-------------------------------------------------
-vp570_device::vp570_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp570_device::vp570_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VP570, "VP570", tag, owner, clock, "vp570", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram"),
@@ -83,9 +83,9 @@ void vp570_device::device_start()
// vip_program_r - program read
//-------------------------------------------------
-UINT8 vp570_device::vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh)
+uint8_t vp570_device::vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
offs_t base = m_base->read() << 12;
@@ -104,7 +104,7 @@ UINT8 vp570_device::vip_program_r(address_space &space, offs_t offset, int cs, i
// vip_program_w - program write
//-------------------------------------------------
-void vp570_device::vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh)
+void vp570_device::vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh)
{
offs_t base = m_base->read() << 12;
diff --git a/src/devices/bus/vip/vp570.h b/src/devices/bus/vip/vp570.h
index 745b96cff95..befde726eec 100644
--- a/src/devices/bus/vip/vp570.h
+++ b/src/devices/bus/vip/vp570.h
@@ -27,7 +27,7 @@ class vp570_device : public device_t,
{
public:
// construction/destruction
- vp570_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp570_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,11 +37,11 @@ protected:
virtual void device_start() override;
// device_vip_expansion_card_interface overrides
- virtual UINT8 vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override;
- virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh) override;
+ virtual uint8_t vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override;
+ virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) override;
private:
- optional_shared_ptr<UINT8> m_ram;
+ optional_shared_ptr<uint8_t> m_ram;
required_ioport m_base;
required_ioport m_sw1;
};
diff --git a/src/devices/bus/vip/vp575.cpp b/src/devices/bus/vip/vp575.cpp
index 680a2a14369..6eaa17289f8 100644
--- a/src/devices/bus/vip/vp575.cpp
+++ b/src/devices/bus/vip/vp575.cpp
@@ -92,7 +92,7 @@ machine_config_constructor vp575_device::device_mconfig_additions() const
// vp575_device - constructor
//-------------------------------------------------
-vp575_device::vp575_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp575_device::vp575_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VP575, "VP575", tag, owner, clock, "vp575", __FILE__),
device_vip_expansion_card_interface(mconfig, *this)
{
@@ -124,9 +124,9 @@ void vp575_device::device_start()
// vip_program_r - program read
//-------------------------------------------------
-UINT8 vp575_device::vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh)
+uint8_t vp575_device::vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
for (auto & elem : m_expansion_slot)
{
@@ -141,7 +141,7 @@ UINT8 vp575_device::vip_program_r(address_space &space, offs_t offset, int cs, i
// vip_program_w - program write
//-------------------------------------------------
-void vp575_device::vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh)
+void vp575_device::vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh)
{
for (auto & elem : m_expansion_slot)
{
@@ -154,9 +154,9 @@ void vp575_device::vip_program_w(address_space &space, offs_t offset, UINT8 data
// vip_io_r - I/O read
//-------------------------------------------------
-UINT8 vp575_device::vip_io_r(address_space &space, offs_t offset)
+uint8_t vp575_device::vip_io_r(address_space &space, offs_t offset)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
for (auto & elem : m_expansion_slot)
{
@@ -171,7 +171,7 @@ UINT8 vp575_device::vip_io_r(address_space &space, offs_t offset)
// vip_io_w - I/O write
//-------------------------------------------------
-void vp575_device::vip_io_w(address_space &space, offs_t offset, UINT8 data)
+void vp575_device::vip_io_w(address_space &space, offs_t offset, uint8_t data)
{
for (auto & elem : m_expansion_slot)
{
@@ -184,9 +184,9 @@ void vp575_device::vip_io_w(address_space &space, offs_t offset, UINT8 data)
// vip_dma_r - DMA read
//-------------------------------------------------
-UINT8 vp575_device::vip_dma_r(address_space &space, offs_t offset)
+uint8_t vp575_device::vip_dma_r(address_space &space, offs_t offset)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
for (auto & elem : m_expansion_slot)
{
@@ -201,7 +201,7 @@ UINT8 vp575_device::vip_dma_r(address_space &space, offs_t offset)
// vip_dma_w - DMA write
//-------------------------------------------------
-void vp575_device::vip_dma_w(address_space &space, offs_t offset, UINT8 data)
+void vp575_device::vip_dma_w(address_space &space, offs_t offset, uint8_t data)
{
for (auto & elem : m_expansion_slot)
{
@@ -214,9 +214,9 @@ void vp575_device::vip_dma_w(address_space &space, offs_t offset, UINT8 data)
// vip_screen_update - screen update
//-------------------------------------------------
-UINT32 vp575_device::vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t vp575_device::vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UINT32 data = 0;
+ uint32_t data = 0;
for (auto & elem : m_expansion_slot)
{
diff --git a/src/devices/bus/vip/vp575.h b/src/devices/bus/vip/vp575.h
index a91bf188aef..05671cda9f8 100644
--- a/src/devices/bus/vip/vp575.h
+++ b/src/devices/bus/vip/vp575.h
@@ -35,7 +35,7 @@ class vp575_device : public device_t,
{
public:
// construction/destruction
- vp575_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp575_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -66,13 +66,13 @@ protected:
virtual void device_start() override;
// device_vip_expansion_card_interface overrides
- virtual UINT8 vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override;
- virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh) override;
- virtual UINT8 vip_io_r(address_space &space, offs_t offset) override;
- virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data) override;
- virtual UINT8 vip_dma_r(address_space &space, offs_t offset) override;
- virtual void vip_dma_w(address_space &space, offs_t offset, UINT8 data) override;
- virtual UINT32 vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
+ virtual uint8_t vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override;
+ virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) override;
+ virtual uint8_t vip_io_r(address_space &space, offs_t offset) override;
+ virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) override;
+ virtual uint8_t vip_dma_r(address_space &space, offs_t offset) override;
+ virtual void vip_dma_w(address_space &space, offs_t offset, uint8_t data) override;
+ virtual uint32_t vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
virtual int vip_ef1_r() override;
virtual int vip_ef3_r() override;
virtual int vip_ef4_r() override;
diff --git a/src/devices/bus/vip/vp585.cpp b/src/devices/bus/vip/vp585.cpp
index 81d73634fe1..d913c0ce497 100644
--- a/src/devices/bus/vip/vp585.cpp
+++ b/src/devices/bus/vip/vp585.cpp
@@ -79,7 +79,7 @@ ioport_constructor vp585_device::device_input_ports() const
// vp585_device - constructor
//-------------------------------------------------
-vp585_device::vp585_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp585_device::vp585_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VP585, "VP585", tag, owner, clock, "vp585", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_j1(*this, "J1"),
@@ -103,7 +103,7 @@ void vp585_device::device_start()
// vip_io_w - I/O write
//-------------------------------------------------
-void vp585_device::vip_io_w(address_space &space, offs_t offset, UINT8 data)
+void vp585_device::vip_io_w(address_space &space, offs_t offset, uint8_t data)
{
if (offset == 0x02)
{
diff --git a/src/devices/bus/vip/vp585.h b/src/devices/bus/vip/vp585.h
index 8ae23737b64..2390f2b3ab3 100644
--- a/src/devices/bus/vip/vp585.h
+++ b/src/devices/bus/vip/vp585.h
@@ -27,7 +27,7 @@ class vp585_device : public device_t,
{
public:
// construction/destruction
- vp585_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp585_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -37,7 +37,7 @@ protected:
virtual void device_start() override;
// device_vip_expansion_card_interface overrides
- virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) override;
virtual int vip_ef3_r() override;
virtual int vip_ef4_r() override;
@@ -45,7 +45,7 @@ private:
required_ioport m_j1;
required_ioport m_j2;
- UINT8 m_keylatch;
+ uint8_t m_keylatch;
};
diff --git a/src/devices/bus/vip/vp590.cpp b/src/devices/bus/vip/vp590.cpp
index b9027a9c943..6f90c6d7473 100644
--- a/src/devices/bus/vip/vp590.cpp
+++ b/src/devices/bus/vip/vp590.cpp
@@ -136,7 +136,7 @@ ioport_constructor vp590_device::device_input_ports() const
// vp590_device - constructor
//-------------------------------------------------
-vp590_device::vp590_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp590_device::vp590_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VP590, "VP590", tag, owner, clock, "vp590", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_cgc(*this, CDP1862_TAG),
@@ -167,11 +167,11 @@ void vp590_device::device_start()
// vip_program_w - program write
//-------------------------------------------------
-void vp590_device::vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh)
+void vp590_device::vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh)
{
if (offset >= 0xc000 && offset < 0xe000)
{
- UINT8 mask = 0xff;
+ uint8_t mask = 0xff;
m_a12 = (offset & 0x1000) ? 1 : 0;
@@ -193,7 +193,7 @@ void vp590_device::vip_program_w(address_space &space, offs_t offset, UINT8 data
// vip_io_w - I/O write
//-------------------------------------------------
-void vp590_device::vip_io_w(address_space &space, offs_t offset, UINT8 data)
+void vp590_device::vip_io_w(address_space &space, offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -213,9 +213,9 @@ void vp590_device::vip_io_w(address_space &space, offs_t offset, UINT8 data)
// vip_dma_w - DMA write
//-------------------------------------------------
-void vp590_device::vip_dma_w(address_space &space, offs_t offset, UINT8 data)
+void vp590_device::vip_dma_w(address_space &space, offs_t offset, uint8_t data)
{
- UINT8 mask = 0xff;
+ uint8_t mask = 0xff;
if (!m_a12)
{
@@ -233,7 +233,7 @@ void vp590_device::vip_dma_w(address_space &space, offs_t offset, UINT8 data)
// vip_screen_update - screen update
//-------------------------------------------------
-UINT32 vp590_device::vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t vp590_device::vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
m_cgc->screen_update(screen, bitmap, cliprect);
diff --git a/src/devices/bus/vip/vp590.h b/src/devices/bus/vip/vp590.h
index fe006db8e6d..d01630f3c59 100644
--- a/src/devices/bus/vip/vp590.h
+++ b/src/devices/bus/vip/vp590.h
@@ -29,7 +29,7 @@ class vp590_device : public device_t,
{
public:
// construction/destruction
- vp590_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp590_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -45,22 +45,22 @@ protected:
virtual void device_start() override;
// device_vip_expansion_card_interface overrides
- virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh) override;
- virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data) override;
- virtual void vip_dma_w(address_space &space, offs_t offset, UINT8 data) override;
- virtual UINT32 vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
+ virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) override;
+ virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) override;
+ virtual void vip_dma_w(address_space &space, offs_t offset, uint8_t data) override;
+ virtual uint32_t vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
virtual int vip_ef3_r() override;
virtual int vip_ef4_r() override;
private:
required_device<cdp1862_device> m_cgc;
- optional_shared_ptr<UINT8> m_color_ram;
+ optional_shared_ptr<uint8_t> m_color_ram;
required_ioport m_j1;
required_ioport m_j2;
int m_a12;
- UINT8 m_color;
- UINT8 m_keylatch;
+ uint8_t m_color;
+ uint8_t m_keylatch;
};
diff --git a/src/devices/bus/vip/vp595.cpp b/src/devices/bus/vip/vp595.cpp
index d2ed10de18d..4e947245dd8 100644
--- a/src/devices/bus/vip/vp595.cpp
+++ b/src/devices/bus/vip/vp595.cpp
@@ -58,7 +58,7 @@ machine_config_constructor vp595_device::device_mconfig_additions() const
// vp595_device - constructor
//-------------------------------------------------
-vp595_device::vp595_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp595_device::vp595_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VP595, "VP595", tag, owner, clock, "vp595", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_pfg(*this, CDP1863_TAG)
@@ -79,7 +79,7 @@ void vp595_device::device_start()
// vip_io_w - I/O write
//-------------------------------------------------
-void vp595_device::vip_io_w(address_space &space, offs_t offset, UINT8 data)
+void vp595_device::vip_io_w(address_space &space, offs_t offset, uint8_t data)
{
if (offset == 0x03)
{
diff --git a/src/devices/bus/vip/vp595.h b/src/devices/bus/vip/vp595.h
index 43dcebd6d57..af1fde36094 100644
--- a/src/devices/bus/vip/vp595.h
+++ b/src/devices/bus/vip/vp595.h
@@ -28,7 +28,7 @@ class vp595_device : public device_t,
{
public:
// construction/destruction
- vp595_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp595_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -38,7 +38,7 @@ protected:
virtual void device_start() override;
// device_vip_expansion_card_interface overrides
- virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data) override;
+ virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) override;
virtual void vip_q_w(int state) override;
private:
diff --git a/src/devices/bus/vip/vp620.cpp b/src/devices/bus/vip/vp620.cpp
index 42a00b37444..45353701f27 100644
--- a/src/devices/bus/vip/vp620.cpp
+++ b/src/devices/bus/vip/vp620.cpp
@@ -61,7 +61,7 @@ machine_config_constructor vp620_device::device_mconfig_additions() const
// vp620_device - constructor
//-------------------------------------------------
-vp620_device::vp620_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp620_device::vp620_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VP620, "VP620", tag, owner, clock, "vp620", __FILE__),
device_vip_byteio_port_interface(mconfig, *this),
m_keydata(0),
@@ -83,7 +83,7 @@ void vp620_device::device_start()
// vip_in_r - byte input read
//-------------------------------------------------
-UINT8 vp620_device::vip_in_r()
+uint8_t vp620_device::vip_in_r()
{
return m_keydata;
}
diff --git a/src/devices/bus/vip/vp620.h b/src/devices/bus/vip/vp620.h
index 036cf482e68..6d87bccc55e 100644
--- a/src/devices/bus/vip/vp620.h
+++ b/src/devices/bus/vip/vp620.h
@@ -28,7 +28,7 @@ class vp620_device : public device_t,
{
public:
// construction/destruction
- vp620_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp620_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -41,11 +41,11 @@ protected:
virtual void device_start() override;
// device_vip_byteio_port_interface overrides
- virtual UINT8 vip_in_r() override;
+ virtual uint8_t vip_in_r() override;
virtual int vip_ef4_r() override;
private:
- UINT8 m_keydata;
+ uint8_t m_keydata;
int m_keystb;
};
diff --git a/src/devices/bus/vip/vp700.cpp b/src/devices/bus/vip/vp700.cpp
index bfdfd488067..682913cfde4 100644
--- a/src/devices/bus/vip/vp700.cpp
+++ b/src/devices/bus/vip/vp700.cpp
@@ -45,7 +45,7 @@ const tiny_rom_entry *vp700_device::device_rom_region() const
// vp700_device - constructor
//-------------------------------------------------
-vp700_device::vp700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+vp700_device::vp700_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VP700, "VP700", tag, owner, clock, "vp700", __FILE__),
device_vip_expansion_card_interface(mconfig, *this),
m_rom(*this, "vp700")
@@ -66,9 +66,9 @@ void vp700_device::device_start()
// vip_program_r - program read
//-------------------------------------------------
-UINT8 vp700_device::vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh)
+uint8_t vp700_device::vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh)
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (offset < 0x1000)
{
diff --git a/src/devices/bus/vip/vp700.h b/src/devices/bus/vip/vp700.h
index f3e515928a9..b305e27191d 100644
--- a/src/devices/bus/vip/vp700.h
+++ b/src/devices/bus/vip/vp700.h
@@ -28,7 +28,7 @@ class vp700_device : public device_t,
{
public:
// construction/destruction
- vp700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ vp700_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -38,7 +38,7 @@ protected:
virtual void device_start() override;
// device_vip_expansion_card_interface overrides
- virtual UINT8 vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override;
+ virtual uint8_t vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override;
private:
required_memory_region m_rom;
diff --git a/src/devices/bus/vtech/ioexp/ioexp.cpp b/src/devices/bus/vtech/ioexp/ioexp.cpp
index 55671583558..4967e305c31 100644
--- a/src/devices/bus/vtech/ioexp/ioexp.cpp
+++ b/src/devices/bus/vtech/ioexp/ioexp.cpp
@@ -26,7 +26,7 @@ const device_type IOEXP_SLOT = &device_creator<ioexp_slot_device>;
// ioexp_slot_device - constructor
//-------------------------------------------------
-ioexp_slot_device::ioexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ioexp_slot_device::ioexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, IOEXP_SLOT, "Peripheral Expansion Slot", tag, owner, clock, "ioexp_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_io(nullptr),
diff --git a/src/devices/bus/vtech/ioexp/ioexp.h b/src/devices/bus/vtech/ioexp/ioexp.h
index bd98a4aaeb1..e00479761a0 100644
--- a/src/devices/bus/vtech/ioexp/ioexp.h
+++ b/src/devices/bus/vtech/ioexp/ioexp.h
@@ -51,7 +51,7 @@ class ioexp_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- ioexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ioexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~ioexp_slot_device();
void set_io_space(address_space *io);
diff --git a/src/devices/bus/vtech/ioexp/joystick.cpp b/src/devices/bus/vtech/ioexp/joystick.cpp
index 38e9732d17a..c9084f7559c 100644
--- a/src/devices/bus/vtech/ioexp/joystick.cpp
+++ b/src/devices/bus/vtech/ioexp/joystick.cpp
@@ -64,7 +64,7 @@ ioport_constructor joystick_interface_device::device_input_ports() const
// joystick_interface_device - constructor
//-------------------------------------------------
-joystick_interface_device::joystick_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+joystick_interface_device::joystick_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, JOYSTICK_INTERFACE, "Laser/VZ Joystick Interface", tag, owner, clock, "joystick", __FILE__),
device_ioexp_interface(mconfig, *this),
m_joy0(*this, "joystick_0"),
@@ -98,7 +98,7 @@ void joystick_interface_device::device_reset()
READ8_MEMBER( joystick_interface_device::joystick_r )
{
- UINT8 data = 0xff;
+ uint8_t data = 0xff;
if (!BIT(offset, 0)) data &= m_joy0->read();
if (!BIT(offset, 1)) data &= m_joy0_arm->read();
diff --git a/src/devices/bus/vtech/ioexp/joystick.h b/src/devices/bus/vtech/ioexp/joystick.h
index 1575dde42f2..30d1fdb4239 100644
--- a/src/devices/bus/vtech/ioexp/joystick.h
+++ b/src/devices/bus/vtech/ioexp/joystick.h
@@ -28,7 +28,7 @@ class joystick_interface_device : public device_t, public device_ioexp_interface
{
public:
// construction/destruction
- joystick_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ joystick_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER( joystick_r );
diff --git a/src/devices/bus/vtech/ioexp/printer.cpp b/src/devices/bus/vtech/ioexp/printer.cpp
index a122c9fa2c7..a80ab27ebdc 100644
--- a/src/devices/bus/vtech/ioexp/printer.cpp
+++ b/src/devices/bus/vtech/ioexp/printer.cpp
@@ -43,7 +43,7 @@ machine_config_constructor printer_interface_device::device_mconfig_additions()
// printer_interface_device - constructor
//-------------------------------------------------
-printer_interface_device::printer_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+printer_interface_device::printer_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, PRINTER_INTERFACE, "Laser/VZ Printer Interface", tag, owner, clock, "printer", __FILE__),
device_ioexp_interface(mconfig, *this),
m_centronics(*this, "centronics"),
diff --git a/src/devices/bus/vtech/ioexp/printer.h b/src/devices/bus/vtech/ioexp/printer.h
index 0f2b8746400..0b0e8dbe6e1 100644
--- a/src/devices/bus/vtech/ioexp/printer.h
+++ b/src/devices/bus/vtech/ioexp/printer.h
@@ -28,7 +28,7 @@ class printer_interface_device : public device_t, public device_ioexp_interface
{
public:
// construction/destruction
- printer_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ printer_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_WRITE_LINE_MEMBER( busy_w );
DECLARE_READ8_MEMBER( busy_r );
diff --git a/src/devices/bus/vtech/memexp/floppy.cpp b/src/devices/bus/vtech/memexp/floppy.cpp
index 6f3196f64e0..6da28bee463 100644
--- a/src/devices/bus/vtech/memexp/floppy.cpp
+++ b/src/devices/bus/vtech/memexp/floppy.cpp
@@ -67,7 +67,7 @@ machine_config_constructor floppy_controller_device::device_mconfig_additions()
// floppy_controller_device - constructor
//-------------------------------------------------
-floppy_controller_device::floppy_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+floppy_controller_device::floppy_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, FLOPPY_CONTROLLER, "Laser/VZ Floppy Disk Controller", tag, owner, clock, "laserfdc", __FILE__),
device_memexp_interface(mconfig, *this),
m_memexp(*this, "mem"),
@@ -92,7 +92,7 @@ void floppy_controller_device::device_start()
// TODO: save m_write_buffer and rebuild m_floppy after load
- UINT8 *bios = memregion("software")->base();
+ uint8_t *bios = memregion("software")->base();
// Obvious bugs... must have worked by sheer luck and very subtle
// timings. Our current z80 is not subtle enough.
@@ -138,7 +138,7 @@ void floppy_controller_device::device_reset()
WRITE8_MEMBER(floppy_controller_device::latch_w)
{
- UINT8 diff = m_latch ^ data;
+ uint8_t diff = m_latch ^ data;
m_latch = data;
floppy_image_device *newflop = nullptr;
diff --git a/src/devices/bus/vtech/memexp/floppy.h b/src/devices/bus/vtech/memexp/floppy.h
index e12dea6ffb2..9daa4fe2ee7 100644
--- a/src/devices/bus/vtech/memexp/floppy.h
+++ b/src/devices/bus/vtech/memexp/floppy.h
@@ -29,7 +29,7 @@ class floppy_controller_device : public device_t, public device_memexp_interface
{
public:
// construction/destruction
- floppy_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ floppy_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_ADDRESS_MAP(map, 8);
@@ -48,7 +48,7 @@ protected:
required_device<floppy_connector> m_floppy0, m_floppy1;
floppy_image_device *m_floppy;
- UINT8 m_latch, m_shifter;
+ uint8_t m_latch, m_shifter;
bool m_latching_inverter;
int m_current_cyl;
attotime m_last_latching_inverter_update_time;
diff --git a/src/devices/bus/vtech/memexp/memexp.cpp b/src/devices/bus/vtech/memexp/memexp.cpp
index 5b547103645..9415ea68320 100644
--- a/src/devices/bus/vtech/memexp/memexp.cpp
+++ b/src/devices/bus/vtech/memexp/memexp.cpp
@@ -26,7 +26,7 @@ const device_type MEMEXP_SLOT = &device_creator<memexp_slot_device>;
// memexp_slot_device - constructor
//-------------------------------------------------
-memexp_slot_device::memexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+memexp_slot_device::memexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, MEMEXP_SLOT, "Memory Expansion Slot", tag, owner, clock, "memexp_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_program(nullptr),
diff --git a/src/devices/bus/vtech/memexp/memexp.h b/src/devices/bus/vtech/memexp/memexp.h
index 1026ddb2bba..ca2d677c724 100644
--- a/src/devices/bus/vtech/memexp/memexp.h
+++ b/src/devices/bus/vtech/memexp/memexp.h
@@ -67,7 +67,7 @@ class memexp_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- memexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ memexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~memexp_slot_device();
void set_program_space(address_space *program);
diff --git a/src/devices/bus/vtech/memexp/memory.cpp b/src/devices/bus/vtech/memexp/memory.cpp
index 5b4b9d71701..b294f4a8ff8 100644
--- a/src/devices/bus/vtech/memexp/memory.cpp
+++ b/src/devices/bus/vtech/memexp/memory.cpp
@@ -27,7 +27,7 @@ const device_type LASER_64K = &device_creator<laser_64k_device>;
// laser110_16k_device - constructor
//-------------------------------------------------
-laser110_16k_device::laser110_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+laser110_16k_device::laser110_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, LASER110_16K, "Laser 110/200/VZ-200 16k Memory", tag, owner, clock, "laser110_16k", __FILE__),
device_memexp_interface(mconfig, *this)
{
@@ -60,7 +60,7 @@ void laser110_16k_device::device_reset()
// laser210_16k_device - constructor
//-------------------------------------------------
-laser210_16k_device::laser210_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+laser210_16k_device::laser210_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, LASER210_16K, "Laser 210/VZ-200 (DSE) 16k Memory", tag, owner, clock, "laser210_16k", __FILE__),
device_memexp_interface(mconfig, *this)
{
@@ -93,7 +93,7 @@ void laser210_16k_device::device_reset()
// laser310_16k_device - constructor
//-------------------------------------------------
-laser310_16k_device::laser310_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+laser310_16k_device::laser310_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, LASER310_16K, "Laser 310/VZ-300 16k Memory", tag, owner, clock, "laser310_16k", __FILE__),
device_memexp_interface(mconfig, *this)
{
@@ -126,7 +126,7 @@ void laser310_16k_device::device_reset()
// laser_64k_device - constructor
//-------------------------------------------------
-laser_64k_device::laser_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+laser_64k_device::laser_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, LASER_64K, "Laser/VZ 64k Memory", tag, owner, clock, "laser_64k", __FILE__),
device_memexp_interface(mconfig, *this)
{
diff --git a/src/devices/bus/vtech/memexp/memory.h b/src/devices/bus/vtech/memexp/memory.h
index 87518d20123..bfc727d652e 100644
--- a/src/devices/bus/vtech/memexp/memory.h
+++ b/src/devices/bus/vtech/memexp/memory.h
@@ -25,14 +25,14 @@ class laser110_16k_device : public device_t, public device_memexp_interface
{
public:
// construction/destruction
- laser110_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ laser110_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual void device_start() override;
virtual void device_reset() override;
private:
- std::vector<UINT8> m_ram;
+ std::vector<uint8_t> m_ram;
};
// ======================> laser210_16k_device
@@ -41,14 +41,14 @@ class laser210_16k_device : public device_t, public device_memexp_interface
{
public:
// construction/destruction
- laser210_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ laser210_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual void device_start() override;
virtual void device_reset() override;
private:
- std::vector<UINT8> m_ram;
+ std::vector<uint8_t> m_ram;
};
// ======================> laser310_16k_device
@@ -57,14 +57,14 @@ class laser310_16k_device : public device_t, public device_memexp_interface
{
public:
// construction/destruction
- laser310_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ laser310_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual void device_start() override;
virtual void device_reset() override;
private:
- std::vector<UINT8> m_ram;
+ std::vector<uint8_t> m_ram;
};
// ======================> laser_64k_device
@@ -73,7 +73,7 @@ class laser_64k_device : public device_t, public device_memexp_interface
{
public:
// construction/destruction
- laser_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ laser_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_WRITE8_MEMBER( bankswitch_w );
@@ -82,7 +82,7 @@ protected:
virtual void device_reset() override;
private:
- std::vector<UINT8> m_ram;
+ std::vector<uint8_t> m_ram;
};
// device type definition
diff --git a/src/devices/bus/vtech/memexp/rs232.cpp b/src/devices/bus/vtech/memexp/rs232.cpp
index 254664acbf7..1cac4d8212d 100644
--- a/src/devices/bus/vtech/memexp/rs232.cpp
+++ b/src/devices/bus/vtech/memexp/rs232.cpp
@@ -53,7 +53,7 @@ machine_config_constructor rs232_interface_device::device_mconfig_additions() co
// rs232_interface_device - constructor
//-------------------------------------------------
-rs232_interface_device::rs232_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+rs232_interface_device::rs232_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, RS232_INTERFACE, "DSE VZ-200/300 RS-232 Interface", tag, owner, clock, "vz_rs232", __FILE__),
device_memexp_interface(mconfig, *this),
m_rs232(*this, "rs232"),
diff --git a/src/devices/bus/vtech/memexp/rs232.h b/src/devices/bus/vtech/memexp/rs232.h
index eef273da255..f235670bb3d 100644
--- a/src/devices/bus/vtech/memexp/rs232.h
+++ b/src/devices/bus/vtech/memexp/rs232.h
@@ -26,7 +26,7 @@ class rs232_interface_device : public device_t, public device_memexp_interface
{
public:
// construction/destruction
- rs232_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rs232_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_WRITE_LINE_MEMBER( rs232_rx_w );
DECLARE_READ8_MEMBER( receive_data_r );
diff --git a/src/devices/bus/vtech/memexp/rtty.cpp b/src/devices/bus/vtech/memexp/rtty.cpp
index b44a81c370a..b1416fbdad1 100644
--- a/src/devices/bus/vtech/memexp/rtty.cpp
+++ b/src/devices/bus/vtech/memexp/rtty.cpp
@@ -38,7 +38,7 @@ const tiny_rom_entry *rtty_interface_device::device_rom_region() const
// rtty_interface_device - constructor
//-------------------------------------------------
-rtty_interface_device::rtty_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+rtty_interface_device::rtty_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, RTTY_INTERFACE, "DSE VZ-200/300 RTTY Interface", tag, owner, clock, "vz_rtty", __FILE__),
device_memexp_interface(mconfig, *this)
{
diff --git a/src/devices/bus/vtech/memexp/rtty.h b/src/devices/bus/vtech/memexp/rtty.h
index 1b96c611ece..fb65ce1f513 100644
--- a/src/devices/bus/vtech/memexp/rtty.h
+++ b/src/devices/bus/vtech/memexp/rtty.h
@@ -25,7 +25,7 @@ class rtty_interface_device : public device_t, public device_memexp_interface
{
public:
// construction/destruction
- rtty_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ rtty_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER( receive_data_r );
DECLARE_WRITE8_MEMBER( transmit_data_w );
diff --git a/src/devices/bus/vtech/memexp/wordpro.cpp b/src/devices/bus/vtech/memexp/wordpro.cpp
index 1eb51c23d82..570fe3e431d 100644
--- a/src/devices/bus/vtech/memexp/wordpro.cpp
+++ b/src/devices/bus/vtech/memexp/wordpro.cpp
@@ -40,7 +40,7 @@ const tiny_rom_entry *wordpro_device::device_rom_region() const
// wordpro_device - constructor
//-------------------------------------------------
-wordpro_device::wordpro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wordpro_device::wordpro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, WORDPRO, "DSE VZ-300 WordPro", tag, owner, clock, "wordpro", __FILE__),
device_memexp_interface(mconfig, *this)
{
diff --git a/src/devices/bus/vtech/memexp/wordpro.h b/src/devices/bus/vtech/memexp/wordpro.h
index 288a7fb565d..51e5b412ab1 100644
--- a/src/devices/bus/vtech/memexp/wordpro.h
+++ b/src/devices/bus/vtech/memexp/wordpro.h
@@ -25,7 +25,7 @@ class wordpro_device : public device_t, public device_memexp_interface
{
public:
// construction/destruction
- wordpro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wordpro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/wangpc/emb.cpp b/src/devices/bus/wangpc/emb.cpp
index 43e1176e04c..5dbc2627382 100644
--- a/src/devices/bus/wangpc/emb.cpp
+++ b/src/devices/bus/wangpc/emb.cpp
@@ -43,7 +43,7 @@ const device_type WANGPC_EMB = &device_creator<wangpc_emb_device>;
// wangpc_emb_device - constructor
//-------------------------------------------------
-wangpc_emb_device::wangpc_emb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpc_emb_device::wangpc_emb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, WANGPC_EMB, "Wang PC-PM031-B", tag, owner, clock, "wangpc_emb", __FILE__),
device_wangpcbus_card_interface(mconfig, *this),
m_ram(*this, "ram"), m_option(0), m_parity_error(0), m_parity_odd(0)
@@ -83,9 +83,9 @@ void wangpc_emb_device::device_reset()
// wangpcbus_mrdc_r - memory read
//-------------------------------------------------
-UINT16 wangpc_emb_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask)
+uint16_t wangpc_emb_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask)
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
for (int bank = 0; bank < 4; bank++)
{
@@ -103,7 +103,7 @@ UINT16 wangpc_emb_device::wangpcbus_mrdc_r(address_space &space, offs_t offset,
// wangpcbus_amwc_w - memory write
//-------------------------------------------------
-void wangpc_emb_device::wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data)
+void wangpc_emb_device::wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data)
{
for (int bank = 0; bank < 4; bank++)
{
@@ -119,9 +119,9 @@ void wangpc_emb_device::wangpcbus_amwc_w(address_space &space, offs_t offset, UI
// wangpcbus_iorc_r - I/O read
//-------------------------------------------------
-UINT16 wangpc_emb_device::wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask)
+uint16_t wangpc_emb_device::wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask)
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
if (sad(offset))
{
@@ -147,7 +147,7 @@ UINT16 wangpc_emb_device::wangpcbus_iorc_r(address_space &space, offs_t offset,
// wangpcbus_aiowc_w - I/O write
//-------------------------------------------------
-void wangpc_emb_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data)
+void wangpc_emb_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data)
{
if (sad(offset))
{
diff --git a/src/devices/bus/wangpc/emb.h b/src/devices/bus/wangpc/emb.h
index f40f7fe4e1c..bf871947070 100644
--- a/src/devices/bus/wangpc/emb.h
+++ b/src/devices/bus/wangpc/emb.h
@@ -27,7 +27,7 @@ class wangpc_emb_device : public device_t,
{
public:
// construction/destruction
- wangpc_emb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpc_emb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -35,14 +35,14 @@ protected:
virtual void device_reset() override;
// device_wangpcbus_card_interface overrides
- virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask) override;
- virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override;
- virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask) override;
- virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override;
+ virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;
+ virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override;
+ virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;
+ virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override;
private:
- optional_shared_ptr<UINT16> m_ram;
- UINT16 m_option;
+ optional_shared_ptr<uint16_t> m_ram;
+ uint16_t m_option;
int m_parity_error;
int m_parity_odd;
};
diff --git a/src/devices/bus/wangpc/lic.cpp b/src/devices/bus/wangpc/lic.cpp
index c14dce7a5d3..171ab69bf04 100644
--- a/src/devices/bus/wangpc/lic.cpp
+++ b/src/devices/bus/wangpc/lic.cpp
@@ -73,7 +73,7 @@ machine_config_constructor wangpc_lic_device::device_mconfig_additions() const
// wangpc_lic_device - constructor
//-------------------------------------------------
-wangpc_lic_device::wangpc_lic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpc_lic_device::wangpc_lic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, WANGPC_LIC, "Wang PC-PM070", tag, owner, clock, "wangpc_lic", __FILE__),
device_wangpcbus_card_interface(mconfig, *this)
{
@@ -102,9 +102,9 @@ void wangpc_lic_device::device_reset()
// wangpcbus_mrdc_r - memory read
//-------------------------------------------------
-UINT16 wangpc_lic_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask)
+uint16_t wangpc_lic_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask)
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
return data;
}
@@ -114,7 +114,7 @@ UINT16 wangpc_lic_device::wangpcbus_mrdc_r(address_space &space, offs_t offset,
// wangpcbus_amwc_w - memory write
//-------------------------------------------------
-void wangpc_lic_device::wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data)
+void wangpc_lic_device::wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data)
{
}
@@ -123,9 +123,9 @@ void wangpc_lic_device::wangpcbus_amwc_w(address_space &space, offs_t offset, UI
// wangpcbus_iorc_r - I/O read
//-------------------------------------------------
-UINT16 wangpc_lic_device::wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask)
+uint16_t wangpc_lic_device::wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask)
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
if (sad(offset))
{
@@ -145,7 +145,7 @@ UINT16 wangpc_lic_device::wangpcbus_iorc_r(address_space &space, offs_t offset,
// wangpcbus_aiowc_w - I/O write
//-------------------------------------------------
-void wangpc_lic_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data)
+void wangpc_lic_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data)
{
if (sad(offset))
{
diff --git a/src/devices/bus/wangpc/lic.h b/src/devices/bus/wangpc/lic.h
index 071b26dde58..c5b49b6627d 100644
--- a/src/devices/bus/wangpc/lic.h
+++ b/src/devices/bus/wangpc/lic.h
@@ -27,7 +27,7 @@ class wangpc_lic_device : public device_t,
{
public:
// construction/destruction
- wangpc_lic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpc_lic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -39,10 +39,10 @@ protected:
virtual void device_reset() override;
// device_wangpcbus_card_interface overrides
- virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask) override;
- virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override;
- virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask) override;
- virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override;
+ virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;
+ virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override;
+ virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;
+ virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override;
};
diff --git a/src/devices/bus/wangpc/lvc.cpp b/src/devices/bus/wangpc/lvc.cpp
index 7f7e0ebe25b..7fff3142240 100644
--- a/src/devices/bus/wangpc/lvc.cpp
+++ b/src/devices/bus/wangpc/lvc.cpp
@@ -60,7 +60,7 @@ MC6845_UPDATE_ROW( wangpc_lvc_device::crtc_update_row )
for (int column = 0; column < x_count; column++)
{
offs_t addr = scroll_y + (m_scroll & 0x3f) + ((ma / 80) * 0x480) + (((ra & 0x0f) << 7) | (column & 0x7f));
- UINT16 data = m_video_ram[addr & 0x7fff];
+ uint16_t data = m_video_ram[addr & 0x7fff];
for (int bit = 0; bit < 8; bit++)
{
@@ -82,7 +82,7 @@ MC6845_UPDATE_ROW( wangpc_lvc_device::crtc_update_row )
for (int column = 0; column < x_count; column++)
{
- UINT32 data = (m_video_ram[(addr + 1) & 0x7fff] << 16) | m_video_ram[addr & 0x7fff];
+ uint32_t data = (m_video_ram[(addr + 1) & 0x7fff] << 16) | m_video_ram[addr & 0x7fff];
for (int bit = 0; bit < 8; bit++)
{
@@ -166,7 +166,7 @@ inline void wangpc_lvc_device::set_irq(int state)
// wangpc_lvc_device - constructor
//-------------------------------------------------
-wangpc_lvc_device::wangpc_lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpc_lvc_device::wangpc_lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, WANGPC_LVC, "Wang PC Low Resolution Video Card", tag, owner, clock, "wangpc_lvc", __FILE__),
device_wangpcbus_card_interface(mconfig, *this),
m_crtc(*this, MC6845_TAG),
@@ -209,9 +209,9 @@ void wangpc_lvc_device::device_reset()
// wangpcbus_mrdc_r - memory read
//-------------------------------------------------
-UINT16 wangpc_lvc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask)
+uint16_t wangpc_lvc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask)
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
if (OPTION_VRAM && (offset >= 0xe0000/2) && (offset < 0xf0000/2))
{
@@ -228,7 +228,7 @@ UINT16 wangpc_lvc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset,
// wangpcbus_amwc_w - memory write
//-------------------------------------------------
-void wangpc_lvc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data)
+void wangpc_lvc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data)
{
if (OPTION_VRAM && (offset >= 0xe0000/2) && (offset < 0xf0000/2))
{
@@ -243,9 +243,9 @@ void wangpc_lvc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, UI
// wangpcbus_iorc_r - I/O read
//-------------------------------------------------
-UINT16 wangpc_lvc_device::wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask)
+uint16_t wangpc_lvc_device::wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask)
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
if (sad(offset))
{
@@ -276,7 +276,7 @@ UINT16 wangpc_lvc_device::wangpcbus_iorc_r(address_space &space, offs_t offset,
// wangpcbus_aiowc_w - I/O write
//-------------------------------------------------
-void wangpc_lvc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data)
+void wangpc_lvc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data)
{
if (sad(offset))
{
diff --git a/src/devices/bus/wangpc/lvc.h b/src/devices/bus/wangpc/lvc.h
index ada6f261fd3..acd3f1e64cd 100644
--- a/src/devices/bus/wangpc/lvc.h
+++ b/src/devices/bus/wangpc/lvc.h
@@ -28,7 +28,7 @@ class wangpc_lvc_device : public device_t,
{
public:
// construction/destruction
- wangpc_lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpc_lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -43,20 +43,20 @@ protected:
virtual void device_reset() override;
// device_wangpcbus_card_interface overrides
- virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask) override;
- virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override;
- virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask) override;
- virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override;
+ virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;
+ virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override;
+ virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;
+ virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override;
private:
inline void set_irq(int state);
required_device<mc6845_device> m_crtc;
- optional_shared_ptr<UINT16> m_video_ram;
+ optional_shared_ptr<uint16_t> m_video_ram;
rgb_t m_palette[16];
- UINT8 m_option;
- UINT16 m_scroll;
+ uint8_t m_option;
+ uint16_t m_scroll;
int m_irq;
};
diff --git a/src/devices/bus/wangpc/mcc.cpp b/src/devices/bus/wangpc/mcc.cpp
index 37bd21dda25..3f4737e31ee 100644
--- a/src/devices/bus/wangpc/mcc.cpp
+++ b/src/devices/bus/wangpc/mcc.cpp
@@ -102,7 +102,7 @@ inline void wangpc_mcc_device::set_irq(int state)
// wangpc_mcc_device - constructor
//-------------------------------------------------
-wangpc_mcc_device::wangpc_mcc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpc_mcc_device::wangpc_mcc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, WANGPC_MCC, "Wang PC-PM043", tag, owner, clock, "wangpc_mcc", __FILE__),
device_wangpcbus_card_interface(mconfig, *this),
m_sio(*this, Z80SIO2_TAG),
@@ -138,9 +138,9 @@ void wangpc_mcc_device::device_reset()
// wangpcbus_iorc_r - I/O read
//-------------------------------------------------
-UINT16 wangpc_mcc_device::wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask)
+uint16_t wangpc_mcc_device::wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask)
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
if (sad(offset))
{
@@ -207,7 +207,7 @@ UINT16 wangpc_mcc_device::wangpcbus_iorc_r(address_space &space, offs_t offset,
// wangpcbus_aiowc_w - I/O write
//-------------------------------------------------
-void wangpc_mcc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data)
+void wangpc_mcc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data)
{
if (sad(offset) && ACCESSING_BITS_0_7)
{
diff --git a/src/devices/bus/wangpc/mcc.h b/src/devices/bus/wangpc/mcc.h
index 54b0b868e45..6e00086cc1d 100644
--- a/src/devices/bus/wangpc/mcc.h
+++ b/src/devices/bus/wangpc/mcc.h
@@ -28,7 +28,7 @@ class wangpc_mcc_device : public device_t,
{
public:
// construction/destruction
- wangpc_mcc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpc_mcc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -39,8 +39,8 @@ protected:
virtual void device_reset() override;
// device_wangpcbus_card_interface overrides
- virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask) override;
- virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override;
+ virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;
+ virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override;
private:
inline void set_irq(int state);
@@ -48,7 +48,7 @@ private:
required_device<z80dart_device> m_sio;
required_device<z80dart_device> m_dart;
- UINT8 m_option;
+ uint8_t m_option;
int m_irq;
};
diff --git a/src/devices/bus/wangpc/mvc.cpp b/src/devices/bus/wangpc/mvc.cpp
index ac5b09a0466..41643c21b87 100644
--- a/src/devices/bus/wangpc/mvc.cpp
+++ b/src/devices/bus/wangpc/mvc.cpp
@@ -71,7 +71,7 @@ MC6845_UPDATE_ROW( wangpc_mvc_device::crtc_update_row )
for (int sx = 0; sx < 50; sx++)
{
offs_t addr = (y * 50) + sx;
- UINT16 data = m_bitmap_ram[addr];
+ uint16_t data = m_bitmap_ram[addr];
for (int bit = 0; bit < 16; bit++)
{
@@ -86,10 +86,10 @@ MC6845_UPDATE_ROW( wangpc_mvc_device::crtc_update_row )
for (int column = 0; column < x_count; column++)
{
- UINT16 code = m_video_ram[((ma + column) & 0x7ff)];
- UINT8 attr = code & 0xff;
+ uint16_t code = m_video_ram[((ma + column) & 0x7ff)];
+ uint8_t attr = code & 0xff;
- UINT8 new_ra = ra + 1;
+ uint8_t new_ra = ra + 1;
if (ATTR_SUPERSCRIPT)
{
@@ -101,7 +101,7 @@ MC6845_UPDATE_ROW( wangpc_mvc_device::crtc_update_row )
}
offs_t addr = ((code >> 8) << 4) | (new_ra & 0x0f);
- UINT16 data = m_char_ram[addr & 0xfff];
+ uint16_t data = m_char_ram[addr & 0xfff];
if ((column == cursor_x) || (!ra && ATTR_OVERSCORE) || ((ra == 9) && ATTR_UNDERSCORE))
{
@@ -186,7 +186,7 @@ inline void wangpc_mvc_device::set_irq(int state)
// wangpc_mvc_device - constructor
//-------------------------------------------------
-wangpc_mvc_device::wangpc_mvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpc_mvc_device::wangpc_mvc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, WANGPC_MVC, "Wang PC Medium Resolution Video Card", tag, owner, clock, "wangpc_mvc", __FILE__),
device_wangpcbus_card_interface(mconfig, *this),
m_crtc(*this, MC6845_TAG),
@@ -232,9 +232,9 @@ void wangpc_mvc_device::device_reset()
// wangpcbus_mrdc_r - memory read
//-------------------------------------------------
-UINT16 wangpc_mvc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask)
+uint16_t wangpc_mvc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask)
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
if (OPTION_VRAM)
{
@@ -260,7 +260,7 @@ UINT16 wangpc_mvc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset,
// wangpcbus_amwc_w - memory write
//-------------------------------------------------
-void wangpc_mvc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data)
+void wangpc_mvc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data)
{
if (OPTION_VRAM)
{
@@ -284,9 +284,9 @@ void wangpc_mvc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, UI
// wangpcbus_iorc_r - I/O read
//-------------------------------------------------
-UINT16 wangpc_mvc_device::wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask)
+uint16_t wangpc_mvc_device::wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask)
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
if (sad(offset))
{
@@ -308,7 +308,7 @@ UINT16 wangpc_mvc_device::wangpcbus_iorc_r(address_space &space, offs_t offset,
// wangpcbus_aiowc_w - I/O write
//-------------------------------------------------
-void wangpc_mvc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data)
+void wangpc_mvc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data)
{
if (sad(offset) && ACCESSING_BITS_0_7)
{
diff --git a/src/devices/bus/wangpc/mvc.h b/src/devices/bus/wangpc/mvc.h
index eed98d499f0..a71891028e6 100644
--- a/src/devices/bus/wangpc/mvc.h
+++ b/src/devices/bus/wangpc/mvc.h
@@ -28,7 +28,7 @@ class wangpc_mvc_device : public device_t,
{
public:
// construction/destruction
- wangpc_mvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpc_mvc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -43,20 +43,20 @@ protected:
virtual void device_reset() override;
// device_wangpcbus_card_interface overrides
- virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask) override;
- virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override;
- virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask) override;
- virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override;
+ virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;
+ virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override;
+ virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;
+ virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override;
private:
inline void set_irq(int state);
required_device<mc6845_device> m_crtc;
- optional_shared_ptr<UINT16> m_video_ram;
- optional_shared_ptr<UINT16> m_char_ram;
- optional_shared_ptr<UINT16> m_bitmap_ram;
+ optional_shared_ptr<uint16_t> m_video_ram;
+ optional_shared_ptr<uint16_t> m_char_ram;
+ optional_shared_ptr<uint16_t> m_bitmap_ram;
- UINT8 m_option;
+ uint8_t m_option;
int m_irq;
};
diff --git a/src/devices/bus/wangpc/rtc.cpp b/src/devices/bus/wangpc/rtc.cpp
index 6f9ffb171c7..f22e71f4a93 100644
--- a/src/devices/bus/wangpc/rtc.cpp
+++ b/src/devices/bus/wangpc/rtc.cpp
@@ -185,7 +185,7 @@ ioport_constructor wangpc_rtc_device::device_input_ports() const
// wangpc_rtc_device - constructor
//-------------------------------------------------
-wangpc_rtc_device::wangpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpc_rtc_device::wangpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, WANGPC_RTC, "Wang PC-PM040-B", tag, owner, clock, "wangpc_rtc", __FILE__),
device_wangpcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
@@ -221,9 +221,9 @@ void wangpc_rtc_device::device_reset()
// wangpcbus_mrdc_r - memory read
//-------------------------------------------------
-UINT16 wangpc_rtc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask)
+uint16_t wangpc_rtc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask)
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
return data;
}
@@ -233,7 +233,7 @@ UINT16 wangpc_rtc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset,
// wangpcbus_amwc_w - memory write
//-------------------------------------------------
-void wangpc_rtc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data)
+void wangpc_rtc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data)
{
}
@@ -242,9 +242,9 @@ void wangpc_rtc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, UI
// wangpcbus_iorc_r - I/O read
//-------------------------------------------------
-UINT16 wangpc_rtc_device::wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask)
+uint16_t wangpc_rtc_device::wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask)
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
if (sad(offset))
{
@@ -264,7 +264,7 @@ UINT16 wangpc_rtc_device::wangpcbus_iorc_r(address_space &space, offs_t offset,
// wangpcbus_aiowc_w - I/O write
//-------------------------------------------------
-void wangpc_rtc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data)
+void wangpc_rtc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data)
{
if (sad(offset))
{
diff --git a/src/devices/bus/wangpc/rtc.h b/src/devices/bus/wangpc/rtc.h
index 3265e895f72..beb3841107a 100644
--- a/src/devices/bus/wangpc/rtc.h
+++ b/src/devices/bus/wangpc/rtc.h
@@ -31,7 +31,7 @@ class wangpc_rtc_device : public device_t,
{
public:
// construction/destruction
- wangpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -44,10 +44,10 @@ protected:
virtual void device_reset() override;
// device_wangpcbus_card_interface overrides
- virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask) override;
- virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override;
- virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask) override;
- virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override;
+ virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;
+ virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override;
+ virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;
+ virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override;
private:
required_device<cpu_device> m_maincpu;
@@ -55,7 +55,7 @@ private:
required_device<z80ctc_device> m_ctc0;
required_device<z80ctc_device> m_ctc1;
required_device<z80dart_device> m_sio;
- optional_shared_ptr<UINT8> m_char_ram;
+ optional_shared_ptr<uint8_t> m_char_ram;
};
diff --git a/src/devices/bus/wangpc/tig.cpp b/src/devices/bus/wangpc/tig.cpp
index c808ac69622..cc51120f379 100644
--- a/src/devices/bus/wangpc/tig.cpp
+++ b/src/devices/bus/wangpc/tig.cpp
@@ -150,7 +150,7 @@ machine_config_constructor wangpc_tig_device::device_mconfig_additions() const
// wangpc_tig_device - constructor
//-------------------------------------------------
-wangpc_tig_device::wangpc_tig_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpc_tig_device::wangpc_tig_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, WANGPC_TIG, "Wang PC TIG Controller", tag, owner, clock, "wangpc_tig", __FILE__),
device_wangpcbus_card_interface(mconfig, *this),
m_hgdc0(*this, UPD7720_0_TAG),
@@ -188,7 +188,7 @@ void wangpc_tig_device::device_reset()
// screen_update -
//-------------------------------------------------
-UINT32 wangpc_tig_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t wangpc_tig_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
m_hgdc0->screen_update(screen, bitmap, cliprect);
m_hgdc1->screen_update(screen, bitmap, cliprect);
@@ -201,9 +201,9 @@ UINT32 wangpc_tig_device::screen_update(screen_device &screen, bitmap_rgb32 &bit
// wangpcbus_iorc_r - I/O read
//-------------------------------------------------
-UINT16 wangpc_tig_device::wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask)
+uint16_t wangpc_tig_device::wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask)
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
if (sad(offset))
{
@@ -233,7 +233,7 @@ UINT16 wangpc_tig_device::wangpcbus_iorc_r(address_space &space, offs_t offset,
// wangpcbus_aiowc_w - I/O write
//-------------------------------------------------
-void wangpc_tig_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data)
+void wangpc_tig_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data)
{
if (sad(offset) && ACCESSING_BITS_0_7)
{
@@ -280,9 +280,9 @@ void wangpc_tig_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, U
// wangpcbus_dack_r - DMA read
//-------------------------------------------------
-UINT8 wangpc_tig_device::wangpcbus_dack_r(address_space &space, int line)
+uint8_t wangpc_tig_device::wangpcbus_dack_r(address_space &space, int line)
{
- UINT8 data;
+ uint8_t data;
if (DMA_GRAPHICS)
{
@@ -301,7 +301,7 @@ UINT8 wangpc_tig_device::wangpcbus_dack_r(address_space &space, int line)
// wangpcbus_dack_w - DMA write
//-------------------------------------------------
-void wangpc_tig_device::wangpcbus_dack_w(address_space &space, int line, UINT8 data)
+void wangpc_tig_device::wangpcbus_dack_w(address_space &space, int line, uint8_t data)
{
if (DMA_GRAPHICS)
{
diff --git a/src/devices/bus/wangpc/tig.h b/src/devices/bus/wangpc/tig.h
index fd9d3fc12a0..3a954c45ec2 100644
--- a/src/devices/bus/wangpc/tig.h
+++ b/src/devices/bus/wangpc/tig.h
@@ -28,12 +28,12 @@ class wangpc_tig_device : public device_t,
{
public:
// construction/destruction
- wangpc_tig_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpc_tig_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text );
UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels );
@@ -44,10 +44,10 @@ protected:
virtual void device_reset() override;
// device_wangpcbus_card_interface overrides
- virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask) override;
- virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override;
- virtual UINT8 wangpcbus_dack_r(address_space &space, int line) override;
- virtual void wangpcbus_dack_w(address_space &space, int line, UINT8 data) override;
+ virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;
+ virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override;
+ virtual uint8_t wangpcbus_dack_r(address_space &space, int line) override;
+ virtual void wangpcbus_dack_w(address_space &space, int line, uint8_t data) override;
virtual bool wangpcbus_have_dack(int line) override;
private:
@@ -55,9 +55,9 @@ private:
required_device<upd7220_device> m_hgdc0;
required_device<upd7220_device> m_hgdc1;
- UINT8 m_option;
- UINT8 m_attr[16];
- UINT8 m_underline;
+ uint8_t m_option;
+ uint8_t m_attr[16];
+ uint8_t m_underline;
required_device<palette_device> m_palette;
};
diff --git a/src/devices/bus/wangpc/wangpc.cpp b/src/devices/bus/wangpc/wangpc.cpp
index d3aebaf1fac..846ce086756 100644
--- a/src/devices/bus/wangpc/wangpc.cpp
+++ b/src/devices/bus/wangpc/wangpc.cpp
@@ -26,7 +26,7 @@ const device_type WANGPC_BUS_SLOT = &device_creator<wangpcbus_slot_device>;
// wangpcbus_slot_device - constructor
//-------------------------------------------------
-wangpcbus_slot_device::wangpcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpcbus_slot_device::wangpcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, WANGPC_BUS_SLOT, "Wang PC bus slot", tag, owner, clock, "wangpcbus_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_bus(nullptr),
@@ -57,7 +57,7 @@ void wangpcbus_slot_device::device_start()
// wangpcbus_device - constructor
//-------------------------------------------------
-wangpcbus_device::wangpcbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpcbus_device::wangpcbus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, WANGPC_BUS, "Wang PC bus", tag, owner, clock, "wangpcbus", __FILE__),
m_write_irq2(*this),
m_write_irq3(*this),
@@ -112,7 +112,7 @@ void wangpcbus_device::add_card(device_wangpcbus_card_interface *card, int sid)
READ16_MEMBER( wangpcbus_device::mrdc_r )
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
device_wangpcbus_card_interface *entry = m_device_list.first();
@@ -148,7 +148,7 @@ WRITE16_MEMBER( wangpcbus_device::amwc_w )
READ16_MEMBER( wangpcbus_device::sad_r )
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
device_wangpcbus_card_interface *entry = m_device_list.first();
@@ -182,9 +182,9 @@ WRITE16_MEMBER( wangpcbus_device::sad_w )
// dack_r - DMA read
//-------------------------------------------------
-UINT8 wangpcbus_device::dack_r(address_space &space, int line)
+uint8_t wangpcbus_device::dack_r(address_space &space, int line)
{
- UINT8 retVal = 0xff;
+ uint8_t retVal = 0xff;
device_wangpcbus_card_interface *entry = m_device_list.first();
while (entry)
@@ -206,7 +206,7 @@ UINT8 wangpcbus_device::dack_r(address_space &space, int line)
// dack_w - DMA write
//-------------------------------------------------
-void wangpcbus_device::dack_w(address_space &space, int line, UINT8 data)
+void wangpcbus_device::dack_w(address_space &space, int line, uint8_t data)
{
device_wangpcbus_card_interface *entry = m_device_list.first();
diff --git a/src/devices/bus/wangpc/wangpc.h b/src/devices/bus/wangpc/wangpc.h
index e892cc3b880..ddcbe326b57 100644
--- a/src/devices/bus/wangpc/wangpc.h
+++ b/src/devices/bus/wangpc/wangpc.h
@@ -83,7 +83,7 @@ class wangpcbus_slot_device : public device_t,
{
public:
// construction/destruction
- wangpcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -111,7 +111,7 @@ class wangpcbus_device : public device_t
{
public:
// construction/destruction
- wangpcbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpcbus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
~wangpcbus_device() { m_device_list.detach_all(); }
template<class _Object> static devcb_base &set_irq2_wr_callback(device_t &device, _Object object) { return downcast<wangpcbus_device &>(device).m_write_irq2.set_callback(object); }
@@ -134,8 +134,8 @@ public:
DECLARE_READ16_MEMBER( sad_r );
DECLARE_WRITE16_MEMBER( sad_w );
- UINT8 dack_r(address_space &space, int line);
- void dack_w(address_space &space, int line, UINT8 data);
+ uint8_t dack_r(address_space &space, int line);
+ void dack_w(address_space &space, int line, uint8_t data);
DECLARE_READ8_MEMBER( dack0_r ) { return dack_r(space, 0); }
DECLARE_WRITE8_MEMBER( dack0_w ) { dack_w(space, 0, data); }
@@ -199,17 +199,17 @@ public:
device_wangpcbus_card_interface *next() const { return m_next; }
// memory access
- virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask) { return 0; };
- virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) { };
+ virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) { return 0; };
+ virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) { };
// I/O access
- virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask) { return 0; };
- virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) { };
+ virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) { return 0; };
+ virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) { };
bool sad(offs_t offset) { return ((offset & 0xf80) == (0x800 | (m_sid << 7))) ? true : false; }
// DMA
- virtual UINT8 wangpcbus_dack_r(address_space &space, int line) { return 0; }
- virtual void wangpcbus_dack_w(address_space &space, int line, UINT8 data) { }
+ virtual uint8_t wangpcbus_dack_r(address_space &space, int line) { return 0; }
+ virtual void wangpcbus_dack_w(address_space &space, int line, uint8_t data) { }
virtual void wangpcbus_tc_w(int state) { }
virtual bool wangpcbus_have_dack(int line) { return false; }
diff --git a/src/devices/bus/wangpc/wdc.cpp b/src/devices/bus/wangpc/wdc.cpp
index 740a16e5c8c..7bfb7337729 100644
--- a/src/devices/bus/wangpc/wdc.cpp
+++ b/src/devices/bus/wangpc/wdc.cpp
@@ -141,7 +141,7 @@ inline void wangpc_wdc_device::set_irq(int state)
// wangpc_wdc_device - constructor
//-------------------------------------------------
-wangpc_wdc_device::wangpc_wdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+wangpc_wdc_device::wangpc_wdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, WANGPC_WDC, "Wang PC-PM001", tag, owner, clock, "wangpc_wdc", __FILE__),
device_wangpcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
@@ -180,9 +180,9 @@ void wangpc_wdc_device::device_reset()
// wangpcbus_mrdc_r - memory read
//-------------------------------------------------
-UINT16 wangpc_wdc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask)
+uint16_t wangpc_wdc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask)
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
return data;
}
@@ -192,7 +192,7 @@ UINT16 wangpc_wdc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset,
// wangpcbus_amwc_w - memory write
//-------------------------------------------------
-void wangpc_wdc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data)
+void wangpc_wdc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data)
{
}
@@ -201,9 +201,9 @@ void wangpc_wdc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, UI
// wangpcbus_iorc_r - I/O read
//-------------------------------------------------
-UINT16 wangpc_wdc_device::wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask)
+uint16_t wangpc_wdc_device::wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask)
{
- UINT16 data = 0xffff;
+ uint16_t data = 0xffff;
if (sad(offset))
{
@@ -235,7 +235,7 @@ UINT16 wangpc_wdc_device::wangpcbus_iorc_r(address_space &space, offs_t offset,
// wangpcbus_aiowc_w - I/O write
//-------------------------------------------------
-void wangpc_wdc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data)
+void wangpc_wdc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data)
{
if (sad(offset) && ACCESSING_BITS_0_7)
{
@@ -270,7 +270,7 @@ void wangpc_wdc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, U
// wangpcbus_dack_r - DMA acknowledge read
//-------------------------------------------------
-UINT8 wangpc_wdc_device::wangpcbus_dack_r(address_space &space, int line)
+uint8_t wangpc_wdc_device::wangpcbus_dack_r(address_space &space, int line)
{
return 0;
}
@@ -280,7 +280,7 @@ UINT8 wangpc_wdc_device::wangpcbus_dack_r(address_space &space, int line)
// wangpcbus_dack_r - DMA acknowledge write
//-------------------------------------------------
-void wangpc_wdc_device::wangpcbus_dack_w(address_space &space, int line, UINT8 data)
+void wangpc_wdc_device::wangpcbus_dack_w(address_space &space, int line, uint8_t data)
{
}
diff --git a/src/devices/bus/wangpc/wdc.h b/src/devices/bus/wangpc/wdc.h
index 7657c77dfe2..5cf3dbc8092 100644
--- a/src/devices/bus/wangpc/wdc.h
+++ b/src/devices/bus/wangpc/wdc.h
@@ -30,7 +30,7 @@ class wangpc_wdc_device : public device_t,
{
public:
// construction/destruction
- wangpc_wdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ wangpc_wdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -54,12 +54,12 @@ protected:
virtual void device_reset() override;
// device_wangpcbus_card_interface overrides
- virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask) override;
- virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override;
- virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask) override;
- virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override;
- virtual UINT8 wangpcbus_dack_r(address_space &space, int line) override;
- virtual void wangpcbus_dack_w(address_space &space, int line, UINT8 data) override;
+ virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;
+ virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override;
+ virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;
+ virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override;
+ virtual uint8_t wangpcbus_dack_r(address_space &space, int line) override;
+ virtual void wangpcbus_dack_w(address_space &space, int line, uint8_t data) override;
virtual bool wangpcbus_have_dack(int line) override;
private:
@@ -68,8 +68,8 @@ private:
required_device<cpu_device> m_maincpu;
required_device<z80ctc_device> m_ctc;
- UINT8 m_status;
- UINT8 m_option;
+ uint8_t m_status;
+ uint8_t m_option;
int m_irq;
};
diff --git a/src/devices/bus/wswan/rom.cpp b/src/devices/bus/wswan/rom.cpp
index 5dbe1e5c7bf..e95585dd08f 100644
--- a/src/devices/bus/wswan/rom.cpp
+++ b/src/devices/bus/wswan/rom.cpp
@@ -26,7 +26,7 @@ const device_type WS_ROM_SRAM = &device_creator<ws_rom_sram_device>;
const device_type WS_ROM_EEPROM = &device_creator<ws_rom_eeprom_device>;
-ws_rom_device::ws_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ws_rom_device::ws_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_ws_cart_interface(mconfig, *this),
m_base20(0),
@@ -45,7 +45,7 @@ ws_rom_device::ws_rom_device(const machine_config &mconfig, device_type type, co
{
}
-ws_rom_device::ws_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ws_rom_device::ws_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, WS_ROM_STD, "Wonderswan Standard Carts", tag, owner, clock, "ws_rom", __FILE__),
device_ws_cart_interface( mconfig, *this ), m_base20(0),
m_base30(0),
@@ -63,13 +63,13 @@ ws_rom_device::ws_rom_device(const machine_config &mconfig, const char *tag, dev
{
}
-ws_rom_sram_device::ws_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ws_rom_sram_device::ws_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ws_rom_device(mconfig, WS_ROM_SRAM, "Wonderswan Carts w/SRAM", tag, owner, clock, "ws_sram", __FILE__), m_nvram_base(0)
{
}
-ws_rom_eeprom_device::ws_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+ws_rom_eeprom_device::ws_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ws_rom_device(mconfig, WS_ROM_EEPROM, "Wonderswan Carts w/EEPROM", tag, owner, clock, "ws_eeprom", __FILE__), m_eeprom_mode(0),
m_eeprom_address(0), m_eeprom_command(0), m_eeprom_start(0), m_eeprom_write_enabled(0)
{
@@ -238,7 +238,7 @@ READ8_MEMBER(ws_rom_device::read_rom40)
READ8_MEMBER(ws_rom_device::read_io)
{
- UINT8 value = m_io_regs[offset];
+ uint8_t value = m_io_regs[offset];
switch (offset)
{
@@ -381,7 +381,7 @@ WRITE8_MEMBER(ws_rom_sram_device::write_io)
READ8_MEMBER(ws_rom_eeprom_device::read_io)
{
- UINT8 value = m_io_regs[offset];
+ uint8_t value = m_io_regs[offset];
switch (offset)
{
diff --git a/src/devices/bus/wswan/rom.h b/src/devices/bus/wswan/rom.h
index e3a15550e73..9197cf98911 100644
--- a/src/devices/bus/wswan/rom.h
+++ b/src/devices/bus/wswan/rom.h
@@ -13,8 +13,8 @@ class ws_rom_device : public device_t,
{
public:
// construction/destruction
- ws_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- ws_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ws_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ ws_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -29,19 +29,19 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_io) override;
protected:
- UINT8 m_io_regs[0x10];
- UINT32 m_base20, m_base30, m_base40;
+ uint8_t m_io_regs[0x10];
+ uint32_t m_base20, m_base30, m_base40;
// RTC
- UINT8 m_rtc_setting; /* Timer setting byte */
- UINT8 m_rtc_year; /* Year */
- UINT8 m_rtc_month; /* Month */
- UINT8 m_rtc_day; /* Day */
- UINT8 m_rtc_day_of_week; /* Day of the week */
- UINT8 m_rtc_hour; /* Hour, high bit = 0 => AM, high bit = 1 => PM */
- UINT8 m_rtc_minute; /* Minute */
- UINT8 m_rtc_second; /* Second */
- UINT8 m_rtc_index; /* index for reading/writing of current of alarm time */
+ uint8_t m_rtc_setting; /* Timer setting byte */
+ uint8_t m_rtc_year; /* Year */
+ uint8_t m_rtc_month; /* Month */
+ uint8_t m_rtc_day; /* Day */
+ uint8_t m_rtc_day_of_week; /* Day of the week */
+ uint8_t m_rtc_hour; /* Hour, high bit = 0 => AM, high bit = 1 => PM */
+ uint8_t m_rtc_minute; /* Minute */
+ uint8_t m_rtc_second; /* Second */
+ uint8_t m_rtc_index; /* index for reading/writing of current of alarm time */
static const device_timer_id TIMER_RTC = 0;
emu_timer *rtc_timer;
@@ -54,7 +54,7 @@ class ws_rom_sram_device : public ws_rom_device
{
public:
// construction/destruction
- ws_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ws_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -66,7 +66,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_io) override;
private:
- UINT32 m_nvram_base;
+ uint32_t m_nvram_base;
};
@@ -76,7 +76,7 @@ class ws_rom_eeprom_device : public ws_rom_device
{
public:
// construction/destruction
- ws_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ws_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -87,11 +87,11 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_io) override;
private:
- UINT8 m_eeprom_mode; /* eeprom mode */
- UINT16 m_eeprom_address; /* Read/write address */
- UINT8 m_eeprom_command; /* Commands: 00, 01, 02, 03, 04, 08, 0C */
- UINT8 m_eeprom_start; /* start bit */
- UINT8 m_eeprom_write_enabled; /* write enabled yes/no */
+ uint8_t m_eeprom_mode; /* eeprom mode */
+ uint16_t m_eeprom_address; /* Read/write address */
+ uint8_t m_eeprom_command; /* Commands: 00, 01, 02, 03, 04, 08, 0C */
+ uint8_t m_eeprom_start; /* start bit */
+ uint8_t m_eeprom_write_enabled; /* write enabled yes/no */
};
diff --git a/src/devices/bus/wswan/slot.cpp b/src/devices/bus/wswan/slot.cpp
index abfa903a6a3..de0b0393179 100644
--- a/src/devices/bus/wswan/slot.cpp
+++ b/src/devices/bus/wswan/slot.cpp
@@ -48,7 +48,7 @@ device_ws_cart_interface::~device_ws_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_ws_cart_interface::rom_alloc(UINT32 size, const char *tag)
+void device_ws_cart_interface::rom_alloc(uint32_t size, const char *tag)
{
if (m_rom == nullptr)
{
@@ -63,7 +63,7 @@ void device_ws_cart_interface::rom_alloc(UINT32 size, const char *tag)
// nvram_alloc - alloc the space for the ram
//-------------------------------------------------
-void device_ws_cart_interface::nvram_alloc(UINT32 size)
+void device_ws_cart_interface::nvram_alloc(uint32_t size)
{
m_nvram.resize(size);
}
@@ -76,7 +76,7 @@ void device_ws_cart_interface::nvram_alloc(UINT32 size)
//-------------------------------------------------
// ws_cart_slot_device - constructor
//-------------------------------------------------
-ws_cart_slot_device::ws_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ws_cart_slot_device::ws_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, WS_CART_SLOT, "Wonderswan Cartridge Slot", tag, owner, clock, "ws_cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -164,9 +164,9 @@ image_init_result ws_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT8 *ROM;
- UINT32 size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
- UINT32 nvram_size = 0;
+ uint8_t *ROM;
+ uint32_t size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
+ uint32_t nvram_size = 0;
m_cart->rom_alloc(size, tag());
ROM = m_cart->get_rom_base();
@@ -241,7 +241,7 @@ void ws_cart_slot_device::call_unload()
get cart type from cart file
-------------------------------------------------*/
-int ws_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len, UINT32 &nvram_len)
+int ws_cart_slot_device::get_cart_type(uint8_t *ROM, uint32_t len, uint32_t &nvram_len)
{
int chunks = len / 0x10000;
int type = WS_STD;
@@ -300,10 +300,10 @@ std::string ws_cart_slot_device::get_default_card_software()
if (open_image_file(mconfig().options()))
{
const char *slot_string;
- UINT32 size = m_file->size();
- std::vector<UINT8> rom(size);
+ uint32_t size = m_file->size();
+ std::vector<uint8_t> rom(size);
int type;
- UINT32 nvram;
+ uint32_t nvram;
m_file->read(&rom[0], size);
@@ -410,10 +410,10 @@ static const char *const sram_str[] = { "none", "64Kbit SRAM", "256Kbit SRAM", "
static const char *const eeprom_str[] = { "none", "1Kbit EEPROM", "16Kbit EEPROM", "Unknown", "Unknown", "8Kbit EEPROM" };
static const char *const romsize_str[] = { "Unknown", "Unknown", "4Mbit", "8Mbit", "16Mbit", "Unknown", "32Mbit", "Unknown", "64Mbit", "128Mbit" };
-void ws_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 offs, UINT32 len)
+void ws_cart_slot_device::internal_header_logging(uint8_t *ROM, uint32_t offs, uint32_t len)
{
int sum = 0, banks = len / 0x10000;
- UINT8 romsize, ramtype, ramsize;
+ uint8_t romsize, ramtype, ramsize;
romsize = ROM[offs + 0xfffa];
ramtype = (ROM[offs + 0xfffb] & 0xf0) ? 1 : 0; // 1 = EEPROM, 0 = SRAM
ramsize = ramtype ? ((ROM[offs + 0xfffb] & 0xf0) >> 4) : (ROM[offs + 0xfffb] & 0x0f);
diff --git a/src/devices/bus/wswan/slot.h b/src/devices/bus/wswan/slot.h
index 36ac1c43bc6..bdf67a58c3c 100644
--- a/src/devices/bus/wswan/slot.h
+++ b/src/devices/bus/wswan/slot.h
@@ -38,12 +38,12 @@ public:
virtual DECLARE_READ8_MEMBER(read_io) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_io) {}
- void rom_alloc(UINT32 size, const char *tag);
- void nvram_alloc(UINT32 size);
- UINT8* get_rom_base() { return m_rom; }
- UINT8* get_nvram_base() { return &m_nvram[0]; }
- UINT32 get_rom_size() { return m_rom_size; }
- UINT32 get_nvram_size() { return m_nvram.size(); }
+ void rom_alloc(uint32_t size, const char *tag);
+ void nvram_alloc(uint32_t size);
+ uint8_t* get_rom_base() { return m_rom; }
+ uint8_t* get_nvram_base() { return &m_nvram[0]; }
+ uint32_t get_rom_size() { return m_rom_size; }
+ uint32_t get_nvram_size() { return m_nvram.size(); }
void save_nvram() { device().save_item(NAME(m_nvram)); }
void set_has_rtc(bool val) { m_has_rtc = val; }
@@ -52,9 +52,9 @@ public:
protected:
// internal state
- UINT8 *m_rom;
- UINT32 m_rom_size;
- std::vector<UINT8> m_nvram;
+ uint8_t *m_rom;
+ uint32_t m_rom_size;
+ std::vector<uint8_t> m_nvram;
int m_bank_mask;
bool m_has_rtc, m_is_rotated;
@@ -69,7 +69,7 @@ class ws_cart_slot_device : public device_t,
{
public:
// construction/destruction
- ws_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ws_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~ws_cart_slot_device();
// device-level overrides
@@ -83,8 +83,8 @@ public:
int get_type() { return m_type; }
int get_is_rotated() { return m_cart->get_is_rotated(); }
- int get_cart_type(UINT8 *ROM, UINT32 len, UINT32 &nvram_len);
- void internal_header_logging(UINT8 *ROM, UINT32 offs, UINT32 len);
+ int get_cart_type(uint8_t *ROM, uint32_t len, uint32_t &nvram_len);
+ void internal_header_logging(uint8_t *ROM, uint32_t offs, uint32_t len);
void save_nvram() { if (m_cart && m_cart->get_nvram_size()) m_cart->save_nvram(); }
diff --git a/src/devices/bus/x68k/x68k_neptunex.cpp b/src/devices/bus/x68k/x68k_neptunex.cpp
index 1b97427be3e..e8e2c8b8199 100644
--- a/src/devices/bus/x68k/x68k_neptunex.cpp
+++ b/src/devices/bus/x68k/x68k_neptunex.cpp
@@ -28,7 +28,7 @@ machine_config_constructor x68k_neptune_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( x68k_neptunex );
}
-x68k_neptune_device::x68k_neptune_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+x68k_neptune_device::x68k_neptune_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, X68K_NEPTUNEX, "Neptune-X", tag, owner, clock, "x68k_neptunex", __FILE__),
device_x68k_expansion_card_interface(mconfig, *this),
m_slot(nullptr),
@@ -44,7 +44,7 @@ void x68k_neptune_device::device_start()
{
device_t* cpu = machine().device("maincpu");
char mac[7];
- UINT32 num = rand();
+ uint32_t num = rand();
address_space& space = cpu->memory().space(AS_PROGRAM);
m_slot = dynamic_cast<x68k_expansion_slot_device *>(owner());
memset(m_prom, 0x57, 16);
@@ -61,7 +61,7 @@ void x68k_neptune_device::device_reset() {
READ16_MEMBER(x68k_neptune_device::x68k_neptune_port_r)
{
- UINT16 data;
+ uint16_t data;
if(offset >= 0x100+32 || offset < 0x100)
return 0xffff;
diff --git a/src/devices/bus/x68k/x68k_neptunex.h b/src/devices/bus/x68k/x68k_neptunex.h
index 6700f1bea3b..2f6c49bceaf 100644
--- a/src/devices/bus/x68k/x68k_neptunex.h
+++ b/src/devices/bus/x68k/x68k_neptunex.h
@@ -24,7 +24,7 @@ class x68k_neptune_device : public device_t,
{
public:
// construction/destruction
- x68k_neptune_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ x68k_neptune_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -44,8 +44,8 @@ private:
x68k_expansion_slot_device *m_slot;
required_device<dp8390d_device> m_dp8390;
- UINT8 m_board_ram[16*1024];
- UINT8 m_prom[16];
+ uint8_t m_board_ram[16*1024];
+ uint8_t m_prom[16];
};
// device type definition
diff --git a/src/devices/bus/x68k/x68k_scsiext.cpp b/src/devices/bus/x68k/x68k_scsiext.cpp
index e6414a4a9b5..2036fb414e4 100644
--- a/src/devices/bus/x68k/x68k_scsiext.cpp
+++ b/src/devices/bus/x68k/x68k_scsiext.cpp
@@ -56,7 +56,7 @@ machine_config_constructor x68k_scsiext_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( x68k_scsiext );
}
-x68k_scsiext_device::x68k_scsiext_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+x68k_scsiext_device::x68k_scsiext_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, X68K_SCSIEXT, "Sharp CZ-6BS1 SCSI-1", tag, owner, clock, "x68k_cz6bs1", __FILE__),
device_x68k_expansion_card_interface(mconfig, *this), m_slot(nullptr),
m_spc(*this, "mb89352")
@@ -66,7 +66,7 @@ x68k_scsiext_device::x68k_scsiext_device(const machine_config &mconfig, const ch
void x68k_scsiext_device::device_start()
{
device_t* cpu = machine().device("maincpu");
- UINT8* ROM;
+ uint8_t* ROM;
address_space& space = cpu->memory().space(AS_PROGRAM);
m_slot = dynamic_cast<x68k_expansion_slot_device *>(owner());
space.install_read_bank(0xea0020,0xea1fff,"scsi_ext");
diff --git a/src/devices/bus/x68k/x68k_scsiext.h b/src/devices/bus/x68k/x68k_scsiext.h
index 3477daa7ad3..e772ede4d86 100644
--- a/src/devices/bus/x68k/x68k_scsiext.h
+++ b/src/devices/bus/x68k/x68k_scsiext.h
@@ -18,7 +18,7 @@ class x68k_scsiext_device : public device_t,
{
public:
// construction/destruction
- x68k_scsiext_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ x68k_scsiext_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/devices/bus/x68k/x68kexp.cpp b/src/devices/bus/x68k/x68kexp.cpp
index 7019498fa23..94484ac3ea1 100644
--- a/src/devices/bus/x68k/x68kexp.cpp
+++ b/src/devices/bus/x68k/x68kexp.cpp
@@ -33,7 +33,7 @@ device_x68k_expansion_card_interface::~device_x68k_expansion_card_interface()
// LIVE DEVICE
//**************************************************************************
-x68k_expansion_slot_device::x68k_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+x68k_expansion_slot_device::x68k_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, X68K_EXPANSION_SLOT, "Sharp X680x0 expansion slot", tag, owner, clock, "x68k_expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_out_irq2_cb(*this),
diff --git a/src/devices/bus/x68k/x68kexp.h b/src/devices/bus/x68k/x68kexp.h
index b3a07242180..824a5868d42 100644
--- a/src/devices/bus/x68k/x68kexp.h
+++ b/src/devices/bus/x68k/x68kexp.h
@@ -115,7 +115,7 @@ class x68k_expansion_slot_device : public device_t,
{
public:
// construction/destruction
- x68k_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ x68k_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~x68k_expansion_slot_device();
template<class _Object> static devcb_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast<x68k_expansion_slot_device &>(device).m_out_irq2_cb.set_callback(object); }
diff --git a/src/devices/bus/z88/flash.cpp b/src/devices/bus/z88/flash.cpp
index 03b18d98f35..ea6337a9c2f 100644
--- a/src/devices/bus/z88/flash.cpp
+++ b/src/devices/bus/z88/flash.cpp
@@ -41,7 +41,7 @@ MACHINE_CONFIG_END
// z88_1024k_flash_device - constructor
//-------------------------------------------------
-z88_1024k_flash_device::z88_1024k_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z88_1024k_flash_device::z88_1024k_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, Z88_1024K_FLASH, "Z88 1024KB Flash", tag, owner, clock, "z88_1024k_flash", __FILE__),
device_z88cart_interface( mconfig, *this ),
m_flash(*this, FLASH_TAG)
@@ -70,7 +70,7 @@ machine_config_constructor z88_1024k_flash_device::device_mconfig_additions() co
get_cart_base
-------------------------------------------------*/
-UINT8* z88_1024k_flash_device::get_cart_base()
+uint8_t* z88_1024k_flash_device::get_cart_base()
{
return m_flash->base();
}
diff --git a/src/devices/bus/z88/flash.h b/src/devices/bus/z88/flash.h
index 37fe76e2f99..76dc4d18c76 100644
--- a/src/devices/bus/z88/flash.h
+++ b/src/devices/bus/z88/flash.h
@@ -20,7 +20,7 @@ class z88_1024k_flash_device : public device_t,
{
public:
// construction/destruction
- z88_1024k_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z88_1024k_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -32,8 +32,8 @@ protected:
// z88cart_interface overrides
virtual DECLARE_READ8_MEMBER(read) override;
virtual DECLARE_WRITE8_MEMBER(write) override;
- virtual UINT8* get_cart_base() override;
- virtual UINT32 get_cart_size() override { return 0x100000; }
+ virtual uint8_t* get_cart_base() override;
+ virtual uint32_t get_cart_size() override { return 0x100000; }
private:
required_device<intelfsh8_device> m_flash;
diff --git a/src/devices/bus/z88/ram.cpp b/src/devices/bus/z88/ram.cpp
index b9c8cc6cea7..08f70d46b16 100644
--- a/src/devices/bus/z88/ram.cpp
+++ b/src/devices/bus/z88/ram.cpp
@@ -32,13 +32,13 @@ const device_type Z88_1024K_RAM = &device_creator<z88_1024k_ram_device>;
// z88_32k_ram_device - constructor
//-------------------------------------------------
-z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, Z88_32K_RAM, "Z88 32KB RAM", tag, owner, clock, "z88_32k_ram", __FILE__),
device_z88cart_interface( mconfig, *this ), m_ram(nullptr)
{
}
-z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_z88cart_interface( mconfig, *this ), m_ram(nullptr)
{
@@ -48,7 +48,7 @@ z88_32k_ram_device::z88_32k_ram_device(const machine_config &mconfig, device_typ
// z88_128k_ram_device - constructor
//-------------------------------------------------
-z88_128k_ram_device::z88_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z88_128k_ram_device::z88_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: z88_32k_ram_device(mconfig, Z88_128K_RAM, "Z88 128KB RAM", tag, owner, clock, "z88_128k_ram", __FILE__)
{
}
@@ -57,7 +57,7 @@ z88_128k_ram_device::z88_128k_ram_device(const machine_config &mconfig, const ch
// z88_512k_ram_device - constructor
//-------------------------------------------------
-z88_512k_ram_device::z88_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z88_512k_ram_device::z88_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: z88_32k_ram_device(mconfig, Z88_512K_RAM, "Z88 512KB RAM", tag, owner, clock, "z88_512k_ram", __FILE__)
{
}
@@ -66,7 +66,7 @@ z88_512k_ram_device::z88_512k_ram_device(const machine_config &mconfig, const ch
// z88_1024k_ram_device - constructor
//-------------------------------------------------
-z88_1024k_ram_device::z88_1024k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z88_1024k_ram_device::z88_1024k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: z88_32k_ram_device(mconfig, Z88_1024K_RAM, "Z88 1024KB RAM", tag, owner, clock, "z88_1024k_ram", __FILE__)
{
}
@@ -86,7 +86,7 @@ void z88_32k_ram_device::device_start()
get_cart_base
-------------------------------------------------*/
-UINT8* z88_32k_ram_device::get_cart_base()
+uint8_t* z88_32k_ram_device::get_cart_base()
{
return m_ram;
}
diff --git a/src/devices/bus/z88/ram.h b/src/devices/bus/z88/ram.h
index d8515a6b9c0..d30be0a9968 100644
--- a/src/devices/bus/z88/ram.h
+++ b/src/devices/bus/z88/ram.h
@@ -19,8 +19,8 @@ class z88_32k_ram_device : public device_t,
{
public:
// construction/destruction
- z88_32k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- z88_32k_ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ z88_32k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ z88_32k_ram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -29,12 +29,12 @@ protected:
// z88cart_interface overrides
virtual DECLARE_READ8_MEMBER(read) override;
virtual DECLARE_WRITE8_MEMBER(write) override;
- virtual UINT8* get_cart_base() override;
- virtual UINT32 get_cart_size() override { return 0x8000; }
+ virtual uint8_t* get_cart_base() override;
+ virtual uint32_t get_cart_size() override { return 0x8000; }
protected:
// internal state
- UINT8 * m_ram;
+ uint8_t * m_ram;
};
// ======================> z88_128k_ram_device
@@ -43,11 +43,11 @@ class z88_128k_ram_device : public z88_32k_ram_device
{
public:
// construction/destruction
- z88_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z88_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// z88cart_interface overrides
- virtual UINT32 get_cart_size() override { return 0x20000; }
+ virtual uint32_t get_cart_size() override { return 0x20000; }
};
// ======================> z88_512k_ram_device
@@ -56,11 +56,11 @@ class z88_512k_ram_device : public z88_32k_ram_device
{
public:
// construction/destruction
- z88_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z88_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// z88cart_interface overrides
- virtual UINT32 get_cart_size() override { return 0x80000; }
+ virtual uint32_t get_cart_size() override { return 0x80000; }
};
// ======================> z88_1024k_ram_device
@@ -69,11 +69,11 @@ class z88_1024k_ram_device : public z88_32k_ram_device
{
public:
// construction/destruction
- z88_1024k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z88_1024k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// z88cart_interface overrides
- virtual UINT32 get_cart_size() override { return 0x100000; }
+ virtual uint32_t get_cart_size() override { return 0x100000; }
};
// device type definition
diff --git a/src/devices/bus/z88/rom.cpp b/src/devices/bus/z88/rom.cpp
index 08f14011c9d..6ec8fb0b773 100644
--- a/src/devices/bus/z88/rom.cpp
+++ b/src/devices/bus/z88/rom.cpp
@@ -31,13 +31,13 @@ const device_type Z88_256K_ROM = &device_creator<z88_256k_rom_device>;
// z88_32k_rom_device - constructor
//-------------------------------------------------
-z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, Z88_32K_ROM, "Z88 32KB ROM", tag, owner, clock, "z88_32k_rom", __FILE__),
device_z88cart_interface( mconfig, *this ), m_rom(nullptr)
{
}
-z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_z88cart_interface( mconfig, *this ), m_rom(nullptr)
{
@@ -47,7 +47,7 @@ z88_32k_rom_device::z88_32k_rom_device(const machine_config &mconfig, device_typ
// z88_128k_rom_device - constructor
//-------------------------------------------------
-z88_128k_rom_device::z88_128k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z88_128k_rom_device::z88_128k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: z88_32k_rom_device(mconfig, Z88_128K_ROM, "Z88 128KB ROM", tag, owner, clock, "z88_128k_rom", __FILE__)
{
}
@@ -56,7 +56,7 @@ z88_128k_rom_device::z88_128k_rom_device(const machine_config &mconfig, const ch
// z88_256k_rom_device - constructor
//-------------------------------------------------
-z88_256k_rom_device::z88_256k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
+z88_256k_rom_device::z88_256k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: z88_32k_rom_device(mconfig, Z88_256K_ROM, "Z88 256KB ROM", tag, owner, clock, "z88_256k_rom", __FILE__)
{
}
@@ -74,7 +74,7 @@ void z88_32k_rom_device::device_start()
get_cart_base
-------------------------------------------------*/
-UINT8* z88_32k_rom_device::get_cart_base()
+uint8_t* z88_32k_rom_device::get_cart_base()
{
return m_rom;
}
diff --git a/src/devices/bus/z88/rom.h b/src/devices/bus/z88/rom.h
index 8ebc4da3bc8..5997bd47cee 100644
--- a/src/devices/bus/z88/rom.h
+++ b/src/devices/bus/z88/rom.h
@@ -19,8 +19,8 @@ class z88_32k_rom_device : public device_t,
{
public:
// construction/destruction
- z88_32k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- z88_32k_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ z88_32k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ z88_32k_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
// device-level overrides
@@ -28,12 +28,12 @@ protected:
// z88cart_interface overrides
virtual DECLARE_READ8_MEMBER(read) override;
- virtual UINT8* get_cart_base() override;
- virtual UINT32 get_cart_size() override { return 0x8000; }
+ virtual uint8_t* get_cart_base() override;
+ virtual uint32_t get_cart_size() override { return 0x8000; }
protected:
// internal state
- UINT8 * m_rom;
+ uint8_t * m_rom;
};
// ======================> z88_128k_rom_device
@@ -42,11 +42,11 @@ class z88_128k_rom_device : public z88_32k_rom_device
{
public:
// construction/destruction
- z88_128k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z88_128k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// z88cart_interface overrides
- virtual UINT32 get_cart_size() override { return 0x20000; }
+ virtual uint32_t get_cart_size() override { return 0x20000; }
};
// ======================> z88_256k_rom_device
@@ -55,11 +55,11 @@ class z88_256k_rom_device : public z88_32k_rom_device
{
public:
// construction/destruction
- z88_256k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z88_256k_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// z88cart_interface overrides
- virtual UINT32 get_cart_size() override { return 0x200000; }
+ virtual uint32_t get_cart_size() override { return 0x200000; }
};
// device type definition
diff --git a/src/devices/bus/z88/z88.cpp b/src/devices/bus/z88/z88.cpp
index 036aa7c4134..ac6b1b7d101 100644
--- a/src/devices/bus/z88/z88.cpp
+++ b/src/devices/bus/z88/z88.cpp
@@ -55,7 +55,7 @@ device_z88cart_interface::~device_z88cart_interface()
//-------------------------------------------------
// z88cart_slot_device - constructor
//-------------------------------------------------
-z88cart_slot_device::z88cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+z88cart_slot_device::z88cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, Z88CART_SLOT, "Z88 Cartridge Slot", tag, owner, clock, "z88cart_slot", __FILE__),
device_image_interface(mconfig, *this),
device_slot_interface(mconfig, *this),
@@ -121,7 +121,7 @@ image_init_result z88cart_slot_device::call_load()
if (m_cart)
{
offs_t read_length;
- UINT8 *cart_base = m_cart->get_cart_base();
+ uint8_t *cart_base = m_cart->get_cart_base();
if (cart_base != nullptr)
{
diff --git a/src/devices/bus/z88/z88.h b/src/devices/bus/z88/z88.h
index 73d64575976..9d6a76c4edd 100644
--- a/src/devices/bus/z88/z88.h
+++ b/src/devices/bus/z88/z88.h
@@ -73,8 +73,8 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(read) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write) { }
- virtual UINT8* get_cart_base() { return nullptr; }
- virtual UINT32 get_cart_size() { return 0; }
+ virtual uint8_t* get_cart_base() { return nullptr; }
+ virtual uint32_t get_cart_size() { return 0; }
};
@@ -86,7 +86,7 @@ class z88cart_slot_device : public device_t,
{
public:
// construction/destruction
- z88cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ z88cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~z88cart_slot_device();
template<class _Object> static devcb_base &set_out_flp_callback(device_t &device, _Object object) { return downcast<z88cart_slot_device &>(device).m_out_flp_cb.set_callback(object); }