summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2016-01-10 18:41:17 +0100
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2016-01-10 18:41:17 +0100
commitf9f908d48bd3607f8ddf529eb6b83c2b4b0b9790 (patch) (github)
tree5d0008d8b4e1e9eb6acda88b16c81b1883c66e06 /src
parent3e5ad46410db4d3b3d8bd4b4bb84c3cdce2b1bfd (diff)
downloadmame-f9f908d48bd3607f8ddf529eb6b83c2b4b0b9790.tar.bz2
mame-f9f908d48bd3607f8ddf529eb6b83c2b4b0b9790.zip
modernize output_manager (nw)
Diffstat (limited to 'src')
-rw-r--r--src/devices/bus/abckb/abc99.cpp22
-rw-r--r--src/devices/bus/cbmiec/c1541.cpp2
-rw-r--r--src/devices/bus/cbmiec/c1571.cpp2
-rw-r--r--src/devices/bus/cbmiec/c1581.cpp4
-rw-r--r--src/devices/bus/centronics/epson_lx800.cpp4
-rw-r--r--src/devices/bus/centronics/epson_lx810l.cpp2
-rw-r--r--src/devices/bus/dmv/k220.cpp4
-rw-r--r--src/devices/bus/econet/e01.cpp2
-rw-r--r--src/devices/bus/ieee488/c2031.cpp2
-rw-r--r--src/devices/bus/ieee488/c2040.cpp6
-rw-r--r--src/devices/bus/ieee488/c8050.cpp6
-rw-r--r--src/devices/bus/ieee488/c8280.cpp6
-rw-r--r--src/devices/bus/ieee488/d9060.cpp6
-rw-r--r--src/devices/bus/ieee488/hardbox.cpp6
-rw-r--r--src/devices/bus/ieee488/softbox.cpp6
-rw-r--r--src/devices/bus/msx_cart/disk.cpp4
-rw-r--r--src/devices/bus/msx_slot/disk.cpp4
-rw-r--r--src/devices/bus/pc_kbd/pcat84.cpp6
-rw-r--r--src/devices/bus/plus4/c1551.cpp2
-rw-r--r--src/devices/machine/amigafdc.cpp14
-rw-r--r--src/devices/machine/ldpr8210.cpp20
-rw-r--r--src/devices/machine/pckeybrd.cpp12
-rw-r--r--src/devices/machine/roc10937.cpp2
-rw-r--r--src/emu/dioutput.cpp14
-rw-r--r--src/emu/luaengine.cpp4
-rw-r--r--src/emu/machine.cpp2
-rw-r--r--src/emu/machine.h3
-rw-r--r--src/emu/output.cpp239
-rw-r--r--src/emu/output.h150
-rw-r--r--src/emu/rendlay.cpp4
-rw-r--r--src/emu/video.cpp2
-rw-r--r--src/mame/audio/bzone.cpp2
-rw-r--r--src/mame/audio/cinemat.cpp4
-rw-r--r--src/mame/audio/copsnrob.cpp2
-rw-r--r--src/mame/audio/dcs.cpp2
-rw-r--r--src/mame/audio/m79amb.cpp2
-rw-r--r--src/mame/audio/mw8080bw.cpp10
-rw-r--r--src/mame/audio/skyraid.cpp2
-rw-r--r--src/mame/audio/turbo.cpp4
-rw-r--r--src/mame/drivers/24cdjuke.cpp2
-rw-r--r--src/mame/drivers/30test.cpp10
-rw-r--r--src/mame/drivers/4004clk.cpp4
-rw-r--r--src/mame/drivers/acefruit.cpp4
-rw-r--r--src/mame/drivers/aces1.cpp4
-rw-r--r--src/mame/drivers/acrnsys1.cpp2
-rw-r--r--src/mame/drivers/alesis.cpp34
-rw-r--r--src/mame/drivers/allied.cpp42
-rw-r--r--src/mame/drivers/amaticmg.cpp14
-rw-r--r--src/mame/drivers/amico2k.cpp2
-rw-r--r--src/mame/drivers/amiga.cpp2
-rw-r--r--src/mame/drivers/ampoker2.cpp20
-rw-r--r--src/mame/drivers/aristmk4.cpp54
-rw-r--r--src/mame/drivers/asteroid.cpp2
-rw-r--r--src/mame/drivers/astrcorp.cpp28
-rw-r--r--src/mame/drivers/astrocde.cpp88
-rw-r--r--src/mame/drivers/atari_s1.cpp6
-rw-r--r--src/mame/drivers/atari_s2.cpp2
-rw-r--r--src/mame/drivers/atarist.cpp2
-rw-r--r--src/mame/drivers/atarisy1.cpp2
-rw-r--r--src/mame/drivers/atarisy2.cpp4
-rw-r--r--src/mame/drivers/avalnche.cpp6
-rw-r--r--src/mame/drivers/babbage.cpp4
-rw-r--r--src/mame/drivers/baraduke.cpp4
-rw-r--r--src/mame/drivers/barata.cpp29
-rw-r--r--src/mame/drivers/bbusters.cpp10
-rw-r--r--src/mame/drivers/berzerk.cpp10
-rw-r--r--src/mame/drivers/beta.cpp6
-rw-r--r--src/mame/drivers/bfm_sc1.cpp20
-rw-r--r--src/mame/drivers/bfm_sc2.cpp14
-rw-r--r--src/mame/drivers/bfm_sc4h.cpp20
-rw-r--r--src/mame/drivers/bfmsys85.cpp10
-rw-r--r--src/mame/drivers/bladestl.cpp4
-rw-r--r--src/mame/drivers/blitz.cpp10
-rw-r--r--src/mame/drivers/blitz68k.cpp66
-rw-r--r--src/mame/drivers/bob85.cpp2
-rw-r--r--src/mame/drivers/boxer.cpp4
-rw-r--r--src/mame/drivers/bw12.cpp2
-rw-r--r--src/mame/drivers/bwidow.cpp8
-rw-r--r--src/mame/drivers/by17.cpp52
-rw-r--r--src/mame/drivers/by35.cpp54
-rw-r--r--src/mame/drivers/by6803.cpp12
-rw-r--r--src/mame/drivers/c80.cpp2
-rw-r--r--src/mame/drivers/cabaret.cpp2
-rw-r--r--src/mame/drivers/calomega.cpp34
-rw-r--r--src/mame/drivers/canyon.cpp2
-rw-r--r--src/mame/drivers/cardline.cpp16
-rw-r--r--src/mame/drivers/caswin.cpp10
-rw-r--r--src/mame/drivers/cave.cpp58
-rw-r--r--src/mame/drivers/cc40.cpp2
-rw-r--r--src/mame/drivers/ccastles.cpp2
-rw-r--r--src/mame/drivers/centiped.cpp2
-rw-r--r--src/mame/drivers/chance32.cpp26
-rw-r--r--src/mame/drivers/chessmst.cpp20
-rw-r--r--src/mame/drivers/chesstrv.cpp10
-rw-r--r--src/mame/drivers/chexx.cpp18
-rw-r--r--src/mame/drivers/chsuper.cpp20
-rw-r--r--src/mame/drivers/cidelsa.cpp6
-rw-r--r--src/mame/drivers/cischeat.cpp24
-rw-r--r--src/mame/drivers/cliffhgr.cpp2
-rw-r--r--src/mame/drivers/cloak.cpp2
-rw-r--r--src/mame/drivers/cloud9.cpp2
-rw-r--r--src/mame/drivers/cops.cpp48
-rw-r--r--src/mame/drivers/copsnrob.cpp2
-rw-r--r--src/mame/drivers/corona.cpp4
-rw-r--r--src/mame/drivers/cosmicos.cpp26
-rw-r--r--src/mame/drivers/cp1.cpp12
-rw-r--r--src/mame/drivers/cps2.cpp6
-rw-r--r--src/mame/drivers/csc.cpp16
-rw-r--r--src/mame/drivers/cubo.cpp2
-rw-r--r--src/mame/drivers/cvicny.cpp2
-rw-r--r--src/mame/drivers/dacholer.cpp4
-rw-r--r--src/mame/drivers/dblcrown.cpp16
-rw-r--r--src/mame/drivers/ddenlovr.cpp6
-rw-r--r--src/mame/drivers/de_2.cpp16
-rw-r--r--src/mame/drivers/de_3.cpp12
-rw-r--r--src/mame/drivers/decwritr.cpp14
-rw-r--r--src/mame/drivers/destroyr.cpp4
-rw-r--r--src/mame/drivers/digel804.cpp8
-rw-r--r--src/mame/drivers/djmain.cpp24
-rw-r--r--src/mame/drivers/dlair.cpp4
-rw-r--r--src/mame/drivers/dmv.cpp2
-rw-r--r--src/mame/drivers/dolphunk.cpp2
-rw-r--r--src/mame/drivers/dragrace.cpp12
-rw-r--r--src/mame/drivers/dynax.cpp2
-rw-r--r--src/mame/drivers/eacc.cpp4
-rw-r--r--src/mame/drivers/ecoinf2.cpp16
-rw-r--r--src/mame/drivers/ecoinf3.cpp12
-rw-r--r--src/mame/drivers/ecoinfr.cpp10
-rw-r--r--src/mame/drivers/elekscmp.cpp2
-rw-r--r--src/mame/drivers/elf.cpp2
-rw-r--r--src/mame/drivers/enmirage.cpp4
-rw-r--r--src/mame/drivers/eolith.cpp2
-rw-r--r--src/mame/drivers/et3400.cpp4
-rw-r--r--src/mame/drivers/eti660.cpp2
-rw-r--r--src/mame/drivers/fidelz80.cpp74
-rw-r--r--src/mame/drivers/fireball.cpp62
-rw-r--r--src/mame/drivers/firebeat.cpp80
-rw-r--r--src/mame/drivers/firefox.cpp2
-rw-r--r--src/mame/drivers/firetrk.cpp18
-rw-r--r--src/mame/drivers/flicker.cpp2
-rw-r--r--src/mame/drivers/flyball.cpp2
-rw-r--r--src/mame/drivers/foodf.cpp4
-rw-r--r--src/mame/drivers/fortecar.cpp2
-rw-r--r--src/mame/drivers/funworld.cpp16
-rw-r--r--src/mame/drivers/g627.cpp20
-rw-r--r--src/mame/drivers/galaga.cpp4
-rw-r--r--src/mame/drivers/galaxi.cpp12
-rw-r--r--src/mame/drivers/galaxian.cpp2
-rw-r--r--src/mame/drivers/gaplus.cpp4
-rw-r--r--src/mame/drivers/gatron.cpp18
-rw-r--r--src/mame/drivers/gei.cpp30
-rw-r--r--src/mame/drivers/ggconnie.cpp2
-rw-r--r--src/mame/drivers/glasgow.cpp6
-rw-r--r--src/mame/drivers/goldnpkr.cpp10
-rw-r--r--src/mame/drivers/goldstar.cpp44
-rw-r--r--src/mame/drivers/gottlieb.cpp8
-rw-r--r--src/mame/drivers/gp_1.cpp10
-rw-r--r--src/mame/drivers/gp_2.cpp12
-rw-r--r--src/mame/drivers/grchamp.cpp4
-rw-r--r--src/mame/drivers/gridlee.cpp4
-rw-r--r--src/mame/drivers/gts1.cpp8
-rw-r--r--src/mame/drivers/gts3.cpp2
-rw-r--r--src/mame/drivers/gts3a.cpp2
-rw-r--r--src/mame/drivers/gts80.cpp6
-rw-r--r--src/mame/drivers/gts80a.cpp6
-rw-r--r--src/mame/drivers/gts80b.cpp2
-rw-r--r--src/mame/drivers/gunbustr.cpp6
-rw-r--r--src/mame/drivers/h8.cpp12
-rw-r--r--src/mame/drivers/hankin.cpp4
-rw-r--r--src/mame/drivers/hh_cop400.cpp6
-rw-r--r--src/mame/drivers/hh_hmcs40.cpp6
-rw-r--r--src/mame/drivers/hh_melps4.cpp6
-rw-r--r--src/mame/drivers/hh_pic16.cpp6
-rw-r--r--src/mame/drivers/hh_sm510.cpp2
-rw-r--r--src/mame/drivers/hh_tms1k.cpp20
-rw-r--r--src/mame/drivers/hh_ucom4.cpp6
-rw-r--r--src/mame/drivers/highvdeo.cpp12
-rw-r--r--src/mame/drivers/icecold.cpp36
-rw-r--r--src/mame/drivers/ie15.cpp16
-rw-r--r--src/mame/drivers/igs009.cpp14
-rw-r--r--src/mame/drivers/igspoker.cpp14
-rw-r--r--src/mame/drivers/imolagp.cpp2
-rw-r--r--src/mame/drivers/inder.cpp4
-rw-r--r--src/mame/drivers/instruct.cpp6
-rw-r--r--src/mame/drivers/itech32.cpp8
-rw-r--r--src/mame/drivers/jackie.cpp14
-rw-r--r--src/mame/drivers/jankenmn.cpp36
-rw-r--r--src/mame/drivers/jeutel.cpp6
-rw-r--r--src/mame/drivers/joystand.cpp10
-rw-r--r--src/mame/drivers/jp.cpp14
-rw-r--r--src/mame/drivers/jpmimpct.cpp22
-rw-r--r--src/mame/drivers/jpmsys5.cpp6
-rw-r--r--src/mame/drivers/jubilee.cpp18
-rw-r--r--src/mame/drivers/junior.cpp6
-rw-r--r--src/mame/drivers/k1003.cpp4
-rw-r--r--src/mame/drivers/kas89.cpp86
-rw-r--r--src/mame/drivers/kenseim.cpp10
-rw-r--r--src/mame/drivers/kim1.cpp4
-rw-r--r--src/mame/drivers/kingdrby.cpp4
-rw-r--r--src/mame/drivers/konamigx.cpp2
-rw-r--r--src/mame/drivers/kopunch.cpp2
-rw-r--r--src/mame/drivers/ksys573.cpp218
-rw-r--r--src/mame/drivers/kungfur.cpp10
-rw-r--r--src/mame/drivers/lc80.cpp4
-rw-r--r--src/mame/drivers/lethalj.cpp14
-rw-r--r--src/mame/drivers/liberatr.cpp2
-rw-r--r--src/mame/drivers/lockon.cpp2
-rw-r--r--src/mame/drivers/ltd.cpp102
-rw-r--r--src/mame/drivers/luckgrln.cpp24
-rw-r--r--src/mame/drivers/lucky74.cpp24
-rw-r--r--src/mame/drivers/m79amb.cpp2
-rw-r--r--src/mame/drivers/magic10.cpp16
-rw-r--r--src/mame/drivers/mainevt.cpp8
-rw-r--r--src/mame/drivers/majorpkr.cpp26
-rw-r--r--src/mame/drivers/mappy.cpp4
-rw-r--r--src/mame/drivers/maxaflex.cpp28
-rw-r--r--src/mame/drivers/maygay1b.cpp18
-rw-r--r--src/mame/drivers/maygayv1.cpp2
-rw-r--r--src/mame/drivers/mazerbla.cpp12
-rw-r--r--src/mame/drivers/mbdtower.cpp6
-rw-r--r--src/mame/drivers/mcr.cpp22
-rw-r--r--src/mame/drivers/mcr3.cpp14
-rw-r--r--src/mame/drivers/megatech.cpp4
-rw-r--r--src/mame/drivers/mekd2.cpp2
-rw-r--r--src/mame/drivers/mephisto.cpp22
-rw-r--r--src/mame/drivers/merit.cpp20
-rw-r--r--src/mame/drivers/meritm.cpp14
-rw-r--r--src/mame/drivers/meyc8080.cpp22
-rw-r--r--src/mame/drivers/meyc8088.cpp4
-rw-r--r--src/mame/drivers/mgames.cpp18
-rw-r--r--src/mame/drivers/mgavegas.cpp64
-rw-r--r--src/mame/drivers/micropin.cpp12
-rw-r--r--src/mame/drivers/midzeus.cpp6
-rw-r--r--src/mame/drivers/mil4000.cpp14
-rw-r--r--src/mame/drivers/miniboy7.cpp10
-rw-r--r--src/mame/drivers/minicom.cpp4
-rw-r--r--src/mame/drivers/missile.cpp4
-rw-r--r--src/mame/drivers/mk1.cpp4
-rw-r--r--src/mame/drivers/mk14.cpp2
-rw-r--r--src/mame/drivers/mk2.cpp10
-rw-r--r--src/mame/drivers/mkit09.cpp2
-rw-r--r--src/mame/drivers/mmd1.cpp56
-rw-r--r--src/mame/drivers/mmodular.cpp72
-rw-r--r--src/mame/drivers/model1.cpp12
-rw-r--r--src/mame/drivers/monzagp.cpp2
-rw-r--r--src/mame/drivers/mpf1.cpp16
-rw-r--r--src/mame/drivers/mpu3.cpp14
-rw-r--r--src/mame/drivers/mpu4hw.cpp74
-rw-r--r--src/mame/drivers/mpu5hw.cpp4
-rw-r--r--src/mame/drivers/multfish.cpp26
-rw-r--r--src/mame/drivers/mw18w.cpp6
-rw-r--r--src/mame/drivers/mw8080bw.cpp44
-rw-r--r--src/mame/drivers/mwsub.cpp10
-rw-r--r--src/mame/drivers/namcos11.cpp8
-rw-r--r--src/mame/drivers/namcos12.cpp8
-rw-r--r--src/mame/drivers/namcos2.cpp58
-rw-r--r--src/mame/drivers/namcos22.cpp6
-rw-r--r--src/mame/drivers/namcos23.cpp2
-rw-r--r--src/mame/drivers/namcos86.cpp4
-rw-r--r--src/mame/drivers/neogeo.cpp10
-rw-r--r--src/mame/drivers/newbrain.cpp2
-rw-r--r--src/mame/drivers/norautp.cpp24
-rw-r--r--src/mame/drivers/nsm.cpp2
-rw-r--r--src/mame/drivers/omegrace.cpp8
-rw-r--r--src/mame/drivers/orbit.cpp4
-rw-r--r--src/mame/drivers/othunder.cpp4
-rw-r--r--src/mame/drivers/overdriv.cpp2
-rw-r--r--src/mame/drivers/pacland.cpp4
-rw-r--r--src/mame/drivers/pacman.cpp2
-rw-r--r--src/mame/drivers/pc1500.cpp28
-rw-r--r--src/mame/drivers/pc2000.cpp14
-rw-r--r--src/mame/drivers/pce220.cpp70
-rw-r--r--src/mame/drivers/peplus.cpp48
-rw-r--r--src/mame/drivers/peyper.cpp22
-rw-r--r--src/mame/drivers/piggypas.cpp2
-rw-r--r--src/mame/drivers/pmi80.cpp2
-rw-r--r--src/mame/drivers/polepos.cpp4
-rw-r--r--src/mame/drivers/poly880.cpp2
-rw-r--r--src/mame/drivers/pong.cpp6
-rw-r--r--src/mame/drivers/poolshrk.cpp4
-rw-r--r--src/mame/drivers/portrait.cpp6
-rw-r--r--src/mame/drivers/pro80.cpp12
-rw-r--r--src/mame/drivers/prophet600.cpp4
-rw-r--r--src/mame/drivers/pve500.cpp2
-rw-r--r--src/mame/drivers/px4.cpp6
-rw-r--r--src/mame/drivers/px8.cpp6
-rw-r--r--src/mame/drivers/quantum.cpp4
-rw-r--r--src/mame/drivers/quizshow.cpp10
-rw-r--r--src/mame/drivers/rainbow.cpp76
-rw-r--r--src/mame/drivers/rallyx.cpp4
-rw-r--r--src/mame/drivers/ravens.cpp6
-rw-r--r--src/mame/drivers/re900.cpp28
-rw-r--r--src/mame/drivers/roul.cpp4
-rw-r--r--src/mame/drivers/rowamet.cpp4
-rw-r--r--src/mame/drivers/runaway.cpp2
-rw-r--r--src/mame/drivers/s11.cpp10
-rw-r--r--src/mame/drivers/s11a.cpp6
-rw-r--r--src/mame/drivers/s11b.cpp16
-rw-r--r--src/mame/drivers/s3.cpp8
-rw-r--r--src/mame/drivers/s4.cpp8
-rw-r--r--src/mame/drivers/s6.cpp8
-rw-r--r--src/mame/drivers/s6a.cpp8
-rw-r--r--src/mame/drivers/s7.cpp6
-rw-r--r--src/mame/drivers/s8.cpp6
-rw-r--r--src/mame/drivers/s8a.cpp6
-rw-r--r--src/mame/drivers/s9.cpp6
-rw-r--r--src/mame/drivers/sage2.cpp2
-rw-r--r--src/mame/drivers/sanremo.cpp14
-rw-r--r--src/mame/drivers/savia84.cpp4
-rw-r--r--src/mame/drivers/sbrkout.cpp8
-rw-r--r--src/mame/drivers/sc1.cpp8
-rw-r--r--src/mame/drivers/sc2.cpp12
-rw-r--r--src/mame/drivers/sderby.cpp24
-rw-r--r--src/mame/drivers/sdk85.cpp2
-rw-r--r--src/mame/drivers/sdk86.cpp2
-rw-r--r--src/mame/drivers/seabattl.cpp2
-rw-r--r--src/mame/drivers/segahang.cpp4
-rw-r--r--src/mame/drivers/segajw.cpp4
-rw-r--r--src/mame/drivers/segaorun.cpp22
-rw-r--r--src/mame/drivers/segas16a.cpp4
-rw-r--r--src/mame/drivers/segas16b.cpp10
-rw-r--r--src/mame/drivers/segas18.cpp6
-rw-r--r--src/mame/drivers/segas32.cpp82
-rw-r--r--src/mame/drivers/segaufo.cpp16
-rw-r--r--src/mame/drivers/segaxbd.cpp8
-rw-r--r--src/mame/drivers/segaybd.cpp98
-rw-r--r--src/mame/drivers/selz80.cpp2
-rw-r--r--src/mame/drivers/seta.cpp6
-rw-r--r--src/mame/drivers/seta2.cpp28
-rw-r--r--src/mame/drivers/sfbonus.cpp24
-rw-r--r--src/mame/drivers/sigmab52.cpp6
-rw-r--r--src/mame/drivers/sigmab98.cpp24
-rw-r--r--src/mame/drivers/sitcom.cpp6
-rw-r--r--src/mame/drivers/skykid.cpp4
-rw-r--r--src/mame/drivers/slapshot.cpp8
-rw-r--r--src/mame/drivers/slc1.cpp6
-rw-r--r--src/mame/drivers/smsmcorp.cpp20
-rw-r--r--src/mame/drivers/snookr10.cpp28
-rw-r--r--src/mame/drivers/softbox.cpp6
-rw-r--r--src/mame/drivers/spectra.cpp2
-rw-r--r--src/mame/drivers/speedbal.cpp6
-rw-r--r--src/mame/drivers/splus.cpp66
-rw-r--r--src/mame/drivers/spoker.cpp14
-rw-r--r--src/mame/drivers/sprint2.cpp12
-rw-r--r--src/mame/drivers/sprint4.cpp2
-rw-r--r--src/mame/drivers/sspeedr.cpp8
-rw-r--r--src/mame/drivers/st_mp100.cpp12
-rw-r--r--src/mame/drivers/st_mp200.cpp12
-rw-r--r--src/mame/drivers/starshp1.cpp2
-rw-r--r--src/mame/drivers/subsino.cpp32
-rw-r--r--src/mame/drivers/subsino2.cpp52
-rw-r--r--src/mame/drivers/suna16.cpp12
-rw-r--r--src/mame/drivers/suna8.cpp16
-rw-r--r--src/mame/drivers/supercon.cpp26
-rw-r--r--src/mame/drivers/svmu.cpp8
-rw-r--r--src/mame/drivers/sym1.cpp2
-rw-r--r--src/mame/drivers/system16.cpp4
-rw-r--r--src/mame/drivers/taito.cpp4
-rw-r--r--src/mame/drivers/taito_z.cpp36
-rw-r--r--src/mame/drivers/taitojc.cpp8
-rw-r--r--src/mame/drivers/tamag1.cpp6
-rw-r--r--src/mame/drivers/tankbatt.cpp2
-rw-r--r--src/mame/drivers/tec1.cpp4
-rw-r--r--src/mame/drivers/techno.cpp4
-rw-r--r--src/mame/drivers/tecnbras.cpp4
-rw-r--r--src/mame/drivers/tek405x.cpp6
-rw-r--r--src/mame/drivers/tempest.cpp4
-rw-r--r--src/mame/drivers/tetrisp2.cpp32
-rw-r--r--src/mame/drivers/thayers.cpp4
-rw-r--r--src/mame/drivers/thedealr.cpp16
-rw-r--r--src/mame/drivers/ti74.cpp2
-rw-r--r--src/mame/drivers/tiki100.cpp4
-rw-r--r--src/mame/drivers/tispeak.cpp4
-rw-r--r--src/mame/drivers/tk80.cpp4
-rw-r--r--src/mame/drivers/tm990189.cpp4
-rw-r--r--src/mame/drivers/tmc1800.cpp4
-rw-r--r--src/mame/drivers/tmc2000e.cpp2
-rw-r--r--src/mame/drivers/tomcat.cpp8
-rw-r--r--src/mame/drivers/tourtabl.cpp8
-rw-r--r--src/mame/drivers/triplhnt.cpp2
-rw-r--r--src/mame/drivers/tunhunt.cpp2
-rw-r--r--src/mame/drivers/turbo.cpp10
-rw-r--r--src/mame/drivers/twinkle.cpp24
-rw-r--r--src/mame/drivers/ultratnk.cpp4
-rw-r--r--src/mame/drivers/umipoker.cpp12
-rw-r--r--src/mame/drivers/undrfire.cpp22
-rw-r--r--src/mame/drivers/unico.cpp8
-rw-r--r--src/mame/drivers/unixpc.cpp8
-rw-r--r--src/mame/drivers/usgames.cpp10
-rw-r--r--src/mame/drivers/vcs80.cpp2
-rw-r--r--src/mame/drivers/vd.cpp10
-rw-r--r--src/mame/drivers/victory.cpp8
-rw-r--r--src/mame/drivers/videopin.cpp10
-rw-r--r--src/mame/drivers/videopkr.cpp39
-rw-r--r--src/mame/drivers/vip.cpp6
-rw-r--r--src/mame/drivers/vk100.cpp28
-rw-r--r--src/mame/drivers/vt100.cpp28
-rw-r--r--src/mame/drivers/wacky_gator.cpp8
-rw-r--r--src/mame/drivers/wangpc.cpp4
-rw-r--r--src/mame/drivers/warpwarp.cpp12
-rw-r--r--src/mame/drivers/wicat.cpp12
-rw-r--r--src/mame/drivers/wico.cpp10
-rw-r--r--src/mame/drivers/wildfire.cpp4
-rw-r--r--src/mame/drivers/wolfpack.cpp2
-rw-r--r--src/mame/drivers/wpc_95.cpp6
-rw-r--r--src/mame/drivers/wpc_an.cpp4
-rw-r--r--src/mame/drivers/x68k.cpp30
-rw-r--r--src/mame/drivers/xtheball.cpp2
-rw-r--r--src/mame/drivers/z80dev.cpp2
-rw-r--r--src/mame/drivers/zac_1.cpp2
-rw-r--r--src/mame/drivers/zac_2.cpp2
-rw-r--r--src/mame/drivers/zac_proto.cpp6
-rw-r--r--src/mame/drivers/zaccaria.cpp2
-rw-r--r--src/mame/drivers/zapcomputer.cpp12
-rw-r--r--src/mame/includes/namcos2.h5
-rw-r--r--src/mame/machine/aim65.cpp10
-rw-r--r--src/mame/machine/ajax.cpp16
-rw-r--r--src/mame/machine/amiga.cpp4
-rw-r--r--src/mame/machine/amigakbd.cpp2
-rw-r--r--src/mame/machine/apollo.cpp16
-rw-r--r--src/mame/machine/asteroid.cpp6
-rw-r--r--src/mame/machine/atarifb.cpp24
-rw-r--r--src/mame/machine/balsente.cpp2
-rw-r--r--src/mame/machine/bbc.cpp10
-rw-r--r--src/mame/machine/bfm_bd1.cpp2
-rw-r--r--src/mame/machine/bfm_bda.cpp4
-rw-r--r--src/mame/machine/bsktball.cpp4
-rw-r--r--src/mame/machine/compiskb.cpp2
-rw-r--r--src/mame/machine/dec_lk201.cpp8
-rw-r--r--src/mame/machine/esqvfd.cpp2
-rw-r--r--src/mame/machine/galaxold.cpp2
-rw-r--r--src/mame/machine/harddriv.cpp2
-rw-r--r--src/mame/machine/hp48.cpp12
-rw-r--r--src/mame/machine/irobot.cpp4
-rw-r--r--src/mame/machine/kay_kbd.cpp6
-rw-r--r--src/mame/machine/kaypro.cpp8
-rw-r--r--src/mame/machine/llc.cpp2
-rw-r--r--src/mame/machine/mboard.cpp10
-rw-r--r--src/mame/machine/megacd.cpp4
-rw-r--r--src/mame/machine/mhavoc.cpp6
-rw-r--r--src/mame/machine/microtan.cpp4
-rw-r--r--src/mame/machine/midxunit.cpp12
-rw-r--r--src/mame/machine/midyunit.cpp28
-rw-r--r--src/mame/machine/msx.cpp4
-rw-r--r--src/mame/machine/namcos2.cpp2
-rw-r--r--src/mame/machine/nb1413m3.cpp6
-rw-r--r--src/mame/machine/nitedrvr.cpp2
-rw-r--r--src/mame/machine/pc1512kb.cpp4
-rw-r--r--src/mame/machine/pmd85.cpp8
-rw-r--r--src/mame/machine/starwars.cpp6
-rw-r--r--src/mame/machine/subs.cpp4
-rw-r--r--src/mame/machine/svi318.cpp2
-rw-r--r--src/mame/machine/tandy2kb.cpp4
-rw-r--r--src/mame/machine/thomson.cpp2
-rw-r--r--src/mame/machine/ticket.cpp4
-rw-r--r--src/mame/machine/trs80m2kb.cpp4
-rw-r--r--src/mame/machine/ut88.cpp2
-rw-r--r--src/mame/machine/v1050kb.cpp2
-rw-r--r--src/mame/machine/victor9k_fdc.cpp4
-rw-r--r--src/mame/machine/wangpckb.cpp2
-rw-r--r--src/mame/machine/williams.cpp8
-rw-r--r--src/mame/machine/wpc_lamp.cpp2
-rw-r--r--src/mame/machine/wpc_out.cpp4
-rw-r--r--src/mame/machine/x68k_kbd.cpp14
-rw-r--r--src/mame/machine/xevious.cpp4
-rw-r--r--src/mame/machine/z80ne.cpp10
-rw-r--r--src/mame/video/alesis.cpp100
-rw-r--r--src/mame/video/awpvid.cpp8
-rw-r--r--src/mame/video/awpvid.h2
-rw-r--r--src/mame/video/bfm_dm01.cpp2
-rw-r--r--src/mame/video/buggychl.cpp2
-rw-r--r--src/mame/video/cinemat.cpp20
-rw-r--r--src/mame/video/cischeat.cpp18
-rw-r--r--src/mame/video/cps1.cpp6
-rw-r--r--src/mame/video/cvs.cpp4
-rw-r--r--src/mame/video/epos.cpp4
-rw-r--r--src/mame/video/opwolf.cpp4
-rw-r--r--src/mame/video/skydiver.cpp28
-rw-r--r--src/mame/video/stactics.cpp30
-rw-r--r--src/mame/video/starcrus.cpp2
-rw-r--r--src/mame/video/super80.cpp10
-rw-r--r--src/mame/video/taitojc.cpp8
-rw-r--r--src/mame/video/tehkanwc.cpp4
-rw-r--r--src/mame/video/thomson.cpp6
-rw-r--r--src/mame/video/wecleman.cpp4
-rw-r--r--src/osd/sdl/output.cpp2
-rw-r--r--src/osd/windows/ledutil.cpp4
-rw-r--r--src/osd/windows/output.cpp32
-rw-r--r--src/osd/windows/winmain.cpp2
489 files changed, 3150 insertions, 3263 deletions
diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp
index 01fd743d3eb..8dc4d9e75c7 100644
--- a/src/devices/bus/abckb/abc99.cpp
+++ b/src/devices/bus/abckb/abc99.cpp
@@ -588,14 +588,14 @@ WRITE8_MEMBER( abc99_device::z2_led_w )
{
if (m_led_en) return;
- output_set_led_value(LED_1, BIT(data, 0));
- output_set_led_value(LED_2, BIT(data, 1));
- output_set_led_value(LED_3, BIT(data, 2));
- output_set_led_value(LED_4, BIT(data, 3));
- output_set_led_value(LED_5, BIT(data, 4));
- output_set_led_value(LED_6, BIT(data, 5));
- output_set_led_value(LED_7, BIT(data, 6));
- output_set_led_value(LED_8, BIT(data, 7));
+ machine().output().set_led_value(LED_1, BIT(data, 0));
+ machine().output().set_led_value(LED_2, BIT(data, 1));
+ machine().output().set_led_value(LED_3, BIT(data, 2));
+ machine().output().set_led_value(LED_4, BIT(data, 3));
+ machine().output().set_led_value(LED_5, BIT(data, 4));
+ machine().output().set_led_value(LED_6, BIT(data, 5));
+ machine().output().set_led_value(LED_7, BIT(data, 6));
+ machine().output().set_led_value(LED_8, BIT(data, 7));
}
@@ -631,9 +631,9 @@ WRITE8_MEMBER( abc99_device::z2_p1_w )
m_t1_z5 = BIT(data, 2);
// key LEDs
- output_set_led_value(LED_INS, BIT(data, 3));
- output_set_led_value(LED_ALT, BIT(data, 4));
- output_set_led_value(LED_CAPS_LOCK, BIT(data, 5));
+ machine().output().set_led_value(LED_INS, BIT(data, 3));
+ machine().output().set_led_value(LED_ALT, BIT(data, 4));
+ machine().output().set_led_value(LED_CAPS_LOCK, BIT(data, 5));
// speaker output
m_speaker->level_w(!BIT(data, 6));
diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp
index 3259f4aa3ff..6e1be701b64 100644
--- a/src/devices/bus/cbmiec/c1541.cpp
+++ b/src/devices/bus/cbmiec/c1541.cpp
@@ -722,7 +722,7 @@ WRITE8_MEMBER( c1541_base_t::via1_pb_w )
m_ga->stp_w(data & 0x03);
// activity LED
- output_set_led_value(LED_ACT, BIT(data, 3));
+ machine().output().set_led_value(LED_ACT, BIT(data, 3));
// density select
m_ga->ds_w((data >> 5) & 0x03);
diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp
index 82a688abce3..976455387ae 100644
--- a/src/devices/bus/cbmiec/c1571.cpp
+++ b/src/devices/bus/cbmiec/c1571.cpp
@@ -456,7 +456,7 @@ WRITE8_MEMBER( c1571_t::via1_pb_w )
m_ga->stp_w(data & 0x03); // TODO actually STP1=0, STP0=!(PB0^PB1), Y0=PB1, Y2=!PB1
// activity LED
- output_set_led_value(LED_ACT, BIT(data, 3));
+ machine().output().set_led_value(LED_ACT, BIT(data, 3));
// density select
m_ga->ds_w((data >> 5) & 0x03);
diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp
index 60ae856901f..e13317654a2 100644
--- a/src/devices/bus/cbmiec/c1581.cpp
+++ b/src/devices/bus/cbmiec/c1581.cpp
@@ -169,10 +169,10 @@ WRITE8_MEMBER( c1581_t::cia_pa_w )
m_floppy->mon_w(BIT(data, 2));
// power led
- output_set_led_value(LED_POWER, BIT(data, 5));
+ machine().output().set_led_value(LED_POWER, BIT(data, 5));
// activity led
- output_set_led_value(LED_ACT, BIT(data, 6));
+ machine().output().set_led_value(LED_ACT, BIT(data, 6));
}
READ8_MEMBER( c1581_t::cia_pb_r )
diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp
index cfcffb7329c..546c6e9439b 100644
--- a/src/devices/bus/centronics/epson_lx800.cpp
+++ b/src/devices/bus/centronics/epson_lx800.cpp
@@ -295,7 +295,7 @@ WRITE8_MEMBER( epson_lx800_t::portc_w )
logerror("%s: lx800_portc_w(%02x): %02x\n", machine().describe_context(), offset, data);
logerror("--> err: %d, ack: %d, fire: %d, buzzer: %d\n", BIT(data, 4), BIT(data, 5), BIT(data, 6), BIT(data, 7));
- output_set_value("online_led", !BIT(data, 2));
+ machine().output().set_value("online_led", !BIT(data, 2));
m_beep->set_state(!BIT(data, 7));
}
@@ -348,7 +348,7 @@ WRITE_LINE_MEMBER( epson_lx800_t::centronics_pe_w )
WRITE_LINE_MEMBER( epson_lx800_t::paperempty_led_w )
{
logerror("setting paperout led: %d\n", state);
- output_set_value("paperout_led", state);
+ machine().output().set_value("paperout_led", state);
}
WRITE_LINE_MEMBER( epson_lx800_t::reset_w )
diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp
index 56e606d576f..3c599360dd8 100644
--- a/src/devices/bus/centronics/epson_lx810l.cpp
+++ b/src/devices/bus/centronics/epson_lx810l.cpp
@@ -502,7 +502,7 @@ WRITE8_MEMBER( epson_lx810l_t::portc_w )
m_eeprom->clk_write(m_93c06_clk ? ASSERT_LINE : CLEAR_LINE);
m_eeprom->cs_write (m_93c06_cs ? ASSERT_LINE : CLEAR_LINE);
- output_set_value("online_led", !BIT(data, 2));
+ machine().output().set_value("online_led", !BIT(data, 2));
}
diff --git a/src/devices/bus/dmv/k220.cpp b/src/devices/bus/dmv/k220.cpp
index 65e278943e1..cd1c55a39a6 100644
--- a/src/devices/bus/dmv/k220.cpp
+++ b/src/devices/bus/dmv/k220.cpp
@@ -236,8 +236,8 @@ 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 };
- output_set_digit_value(0, bcd2hex[(data >> 4) & 0x0f]);
- output_set_digit_value(1, bcd2hex[data & 0x0f]);
+ 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/econet/e01.cpp b/src/devices/bus/econet/e01.cpp
index 8593dc235c9..ed60ccc2d28 100644
--- a/src/devices/bus/econet/e01.cpp
+++ b/src/devices/bus/econet/e01.cpp
@@ -563,7 +563,7 @@ WRITE8_MEMBER( e01_device::floppy_w )
// TODO floppy test
// mode LED
- output_set_value("led_0", BIT(data, 7));
+ machine().output().set_value("led_0", BIT(data, 7));
}
diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp
index 0cc16925615..0e455c35b67 100644
--- a/src/devices/bus/ieee488/c2031.cpp
+++ b/src/devices/bus/ieee488/c2031.cpp
@@ -259,7 +259,7 @@ WRITE8_MEMBER( c2031_device::via1_pb_w )
m_ga->stp_w(data & 0x03);
// activity LED
- output_set_led_value(LED_ACT, BIT(data, 3));
+ machine().output().set_led_value(LED_ACT, BIT(data, 3));
// density select
m_ga->ds_w((data >> 5) & 0x03);
diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp
index 7b73a31ed2d..55dd8f9a072 100644
--- a/src/devices/bus/ieee488/c2040.cpp
+++ b/src/devices/bus/ieee488/c2040.cpp
@@ -363,13 +363,13 @@ WRITE8_MEMBER( c2040_t::riot1_pb_w )
*/
// activity led 1
- output_set_led_value(LED_ACT1, BIT(data, 3));
+ machine().output().set_led_value(LED_ACT1, BIT(data, 3));
// activity led 0
- output_set_led_value(LED_ACT0, BIT(data, 4));
+ machine().output().set_led_value(LED_ACT0, BIT(data, 4));
// error led
- output_set_led_value(LED_ERR, BIT(data, 5));
+ machine().output().set_led_value(LED_ERR, BIT(data, 5));
}
diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp
index 4884e214bcd..ead9fad37a5 100644
--- a/src/devices/bus/ieee488/c8050.cpp
+++ b/src/devices/bus/ieee488/c8050.cpp
@@ -410,13 +410,13 @@ WRITE8_MEMBER( c8050_t::riot1_pb_w )
*/
// activity led 1
- output_set_led_value(LED_ACT1, BIT(data, 3));
+ machine().output().set_led_value(LED_ACT1, BIT(data, 3));
// activity led 0
- output_set_led_value(LED_ACT0, BIT(data, 4));
+ machine().output().set_led_value(LED_ACT0, BIT(data, 4));
// error led
- output_set_led_value(LED_ERR, BIT(data, 5));
+ machine().output().set_led_value(LED_ERR, BIT(data, 5));
}
WRITE8_MEMBER( c8050_t::via_pb_w )
diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp
index 29ade86c570..05c39c7ffdd 100644
--- a/src/devices/bus/ieee488/c8280.cpp
+++ b/src/devices/bus/ieee488/c8280.cpp
@@ -266,13 +266,13 @@ WRITE8_MEMBER( c8280_t::riot1_pb_w )
*/
// activity led 1
- output_set_led_value(LED_ACT1, BIT(data, 3));
+ machine().output().set_led_value(LED_ACT1, BIT(data, 3));
// activity led 0
- output_set_led_value(LED_ACT0, BIT(data, 4));
+ machine().output().set_led_value(LED_ACT0, BIT(data, 4));
// error led
- output_set_led_value(LED_ERR, BIT(data, 5));
+ machine().output().set_led_value(LED_ERR, BIT(data, 5));
}
static SLOT_INTERFACE_START( c8280_floppies )
diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp
index 3260ab80a08..68b63589ed9 100644
--- a/src/devices/bus/ieee488/d9060.cpp
+++ b/src/devices/bus/ieee488/d9060.cpp
@@ -302,13 +302,13 @@ WRITE8_MEMBER( d9060_base_t::riot1_pb_w )
*/
// ready led
- output_set_led_value(LED_READY, BIT(data, 4));
+ machine().output().set_led_value(LED_READY, BIT(data, 4));
// power led
- output_set_led_value(LED_POWER, BIT(data, 5));
+ machine().output().set_led_value(LED_POWER, BIT(data, 5));
// error led
- output_set_led_value(LED_ERROR, !BIT(data, 5));
+ machine().output().set_led_value(LED_ERROR, !BIT(data, 5));
}
diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp
index 83dc8caa150..c03f147250d 100644
--- a/src/devices/bus/ieee488/hardbox.cpp
+++ b/src/devices/bus/ieee488/hardbox.cpp
@@ -254,9 +254,9 @@ WRITE8_MEMBER( hardbox_device::ppi1_pc_w )
*/
- output_set_led_value(LED_A, !BIT(data, 0));
- output_set_led_value(LED_B, !BIT(data, 1));
- output_set_led_value(LED_READY, !BIT(data, 2));
+ machine().output().set_led_value(LED_A, !BIT(data, 0));
+ machine().output().set_led_value(LED_B, !BIT(data, 1));
+ machine().output().set_led_value(LED_READY, !BIT(data, 2));
}
//-------------------------------------------------
diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp
index 02d75d19a34..0536b4aba07 100644
--- a/src/devices/bus/ieee488/softbox.cpp
+++ b/src/devices/bus/ieee488/softbox.cpp
@@ -212,9 +212,9 @@ WRITE8_MEMBER( softbox_device::ppi1_pc_w )
*/
- output_set_led_value(LED_A, !BIT(data, 0));
- output_set_led_value(LED_B, !BIT(data, 1));
- output_set_led_value(LED_READY, !BIT(data, 2));
+ machine().output().set_led_value(LED_A, !BIT(data, 0));
+ machine().output().set_led_value(LED_B, !BIT(data, 1));
+ machine().output().set_led_value(LED_READY, !BIT(data, 2));
}
static DEVICE_INPUT_DEFAULTS_START( terminal )
diff --git a/src/devices/bus/msx_cart/disk.cpp b/src/devices/bus/msx_cart/disk.cpp
index 5d973a2fd17..11789e0a79f 100644
--- a/src/devices/bus/msx_cart/disk.cpp
+++ b/src/devices/bus/msx_cart/disk.cpp
@@ -335,7 +335,7 @@ void msx_cart_disk_type1::set_control(UINT8 data)
if ((old_m_control ^ m_control) & 0x40)
{
- set_led_status(machine(), 0, !(m_control & 0x40));
+ machine().output().set_led_value(0, !(m_control & 0x40));
}
}
@@ -495,7 +495,7 @@ void msx_cart_disk_type2::set_control(UINT8 data)
if ((old_m_control ^ m_control) & 0x40)
{
- set_led_status(machine(), 0, !(m_control & 0x40));
+ machine().output().set_led_value(0, !(m_control & 0x40));
}
}
diff --git a/src/devices/bus/msx_slot/disk.cpp b/src/devices/bus/msx_slot/disk.cpp
index 24a1b5c95c1..ea4313f6ac5 100644
--- a/src/devices/bus/msx_slot/disk.cpp
+++ b/src/devices/bus/msx_slot/disk.cpp
@@ -200,7 +200,7 @@ void msx_slot_disk1_device::set_control(UINT8 data)
if ((old_m_control ^ m_control) & 0x40)
{
- set_led_status(machine(), 0, !(m_control & 0x40));
+ machine().output().set_led_value(0, !(m_control & 0x40));
}
}
@@ -349,7 +349,7 @@ void msx_slot_disk2_device::set_control(UINT8 data)
if ((old_m_control ^ m_control) & 0x40)
{
- set_led_status(machine(), 0, !(m_control & 0x40));
+ machine().output().set_led_value(0, !(m_control & 0x40));
}
}
diff --git a/src/devices/bus/pc_kbd/pcat84.cpp b/src/devices/bus/pc_kbd/pcat84.cpp
index 471333e9d18..eeaf9494fd3 100644
--- a/src/devices/bus/pc_kbd/pcat84.cpp
+++ b/src/devices/bus/pc_kbd/pcat84.cpp
@@ -580,9 +580,9 @@ WRITE8_MEMBER( ibm_pc_at_84_keyboard_device::p2_w )
*/
- output_set_led_value(LED_SCROLL, BIT(data, 0));
- output_set_led_value(LED_NUM, BIT(data, 1));
- output_set_led_value(LED_CAPS, BIT(data, 2));
+ machine().output().set_led_value(LED_SCROLL, BIT(data, 0));
+ machine().output().set_led_value(LED_NUM, BIT(data, 1));
+ machine().output().set_led_value(LED_CAPS, BIT(data, 2));
m_pc_kbdc->data_write_from_kb(!BIT(data, 7));
m_pc_kbdc->clock_write_from_kb(!BIT(data, 6));
diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp
index 4e10f777702..4e24bb153e9 100644
--- a/src/devices/bus/plus4/c1551.cpp
+++ b/src/devices/bus/plus4/c1551.cpp
@@ -108,7 +108,7 @@ WRITE8_MEMBER( c1551_t::port_w )
m_ga->mtr_w(BIT(data, 2));
// activity LED
- output_set_led_value(LED_ACT, BIT(data, 3));
+ machine().output().set_led_value(LED_ACT, BIT(data, 3));
// density select
m_ga->ds_w((data >> 5) & 0x03);
diff --git a/src/devices/machine/amigafdc.cpp b/src/devices/machine/amigafdc.cpp
index e6cbe2911ae..d71b4f458dc 100644
--- a/src/devices/machine/amigafdc.cpp
+++ b/src/devices/machine/amigafdc.cpp
@@ -432,13 +432,13 @@ void amiga_fdc::setup_leds()
floppy == floppy_devices[2] ? 2 :
3;
- output_set_value("drive_0_led", drive == 0);
- output_set_value("drive_1_led", drive == 1);
- output_set_value("drive_2_led", drive == 2);
- output_set_value("drive_3_led", drive == 3);
+ machine().output().set_value("drive_0_led", drive == 0);
+ machine().output().set_value("drive_1_led", drive == 1);
+ machine().output().set_value("drive_2_led", drive == 2);
+ machine().output().set_value("drive_3_led", drive == 3);
- set_led_status(machine(), 1, drive == 0); /* update internal drive led */
- set_led_status(machine(), 2, drive == 1); /* update external drive led */
+ machine().output().set_led_value(1, drive == 0); /* update internal drive led */
+ machine().output().set_led_value(2, drive == 1); /* update external drive led */
}
}
@@ -471,7 +471,7 @@ WRITE8_MEMBER( amiga_fdc::ciaaprb_w )
floppy->dir_w((data >> 1) & 1);
floppy->stp_w(data & 1);
floppy->mon_w((data >> 7) & 1);
- output_set_value("fdc_led", data & 0x80); // LED directly connected to FDC motor
+ machine().output().set_value("fdc_led", data & 0x80); // LED directly connected to FDC motor
}
if(floppy) {
diff --git a/src/devices/machine/ldpr8210.cpp b/src/devices/machine/ldpr8210.cpp
index 967dac974e7..17b02edf276 100644
--- a/src/devices/machine/ldpr8210.cpp
+++ b/src/devices/machine/ldpr8210.cpp
@@ -563,18 +563,18 @@ WRITE8_MEMBER( pioneer_pr8210_device::i8049_pia_w )
case 0x60:
// these 4 are direct-connect
- output_set_value("pr8210_audio1", (data & 0x01) != 0);
- output_set_value("pr8210_audio2", (data & 0x02) != 0);
- output_set_value("pr8210_clv", (data & 0x04) != 0);
- output_set_value("pr8210_cav", (data & 0x08) != 0);
+ machine().output().set_value("pr8210_audio1", (data & 0x01) != 0);
+ machine().output().set_value("pr8210_audio2", (data & 0x02) != 0);
+ machine().output().set_value("pr8210_clv", (data & 0x04) != 0);
+ machine().output().set_value("pr8210_cav", (data & 0x08) != 0);
// remaining 3 bits select one of 5 LEDs via a mux
value = ((data & 0x40) >> 6) | ((data & 0x20) >> 4) | ((data & 0x10) >> 2);
- output_set_value("pr8210_srev", (value == 0));
- output_set_value("pr8210_sfwd", (value == 1));
- output_set_value("pr8210_play", (value == 2));
- output_set_value("pr8210_step", (value == 3));
- output_set_value("pr8210_pause", (value == 4));
+ machine().output().set_value("pr8210_srev", (value == 0));
+ machine().output().set_value("pr8210_sfwd", (value == 1));
+ machine().output().set_value("pr8210_play", (value == 2));
+ machine().output().set_value("pr8210_step", (value == 3));
+ machine().output().set_value("pr8210_pause", (value == 4));
m_pia.portb = data;
update_audio_squelch();
@@ -724,7 +724,7 @@ WRITE8_MEMBER( pioneer_pr8210_device::i8049_port2_w )
m_i8049_cpu->set_input_line(MCS48_INPUT_IRQ, (data & 0x40) ? CLEAR_LINE : ASSERT_LINE);
// standby LED is set accordingl to bit 4
- output_set_value("pr8210_standby", (data & 0x10) != 0);
+ machine().output().set_value("pr8210_standby", (data & 0x10) != 0);
}
diff --git a/src/devices/machine/pckeybrd.cpp b/src/devices/machine/pckeybrd.cpp
index 6fbee8a0173..0650fc8cea3 100644
--- a/src/devices/machine/pckeybrd.cpp
+++ b/src/devices/machine/pckeybrd.cpp
@@ -357,9 +357,9 @@ void pc_keyboard_device::device_reset()
m_numlock = 0;
m_on = true;
/* set default led state */
- set_led_status(machine(), 2, 0);
- set_led_status(machine(), 0, 0);
- set_led_status(machine(), 1, 0);
+ machine().output().set_led_value(2, 0);
+ machine().output().set_led_value(0, 0);
+ machine().output().set_led_value(1, 0);
m_head = m_tail = 0;
queue_insert(0xaa);
@@ -832,9 +832,9 @@ WRITE8_MEMBER(at_keyboard_device::write)
/* led's in same order as my keyboard leds. */
/* num lock, caps lock, scroll lock */
- set_led_status(machine(), 2, (data & 0x01));
- set_led_status(machine(), 0, ((data & 0x02)>>1));
- set_led_status(machine(), 1, ((data & 0x04)>>2));
+ machine().output().set_led_value(2, (data & 0x01));
+ machine().output().set_led_value(0, ((data & 0x02)>>1));
+ machine().output().set_led_value(1, ((data & 0x04)>>2));
}
break;
diff --git a/src/devices/machine/roc10937.cpp b/src/devices/machine/roc10937.cpp
index fbfda7ce0e8..c76e02f13e6 100644
--- a/src/devices/machine/roc10937.cpp
+++ b/src/devices/machine/roc10937.cpp
@@ -197,7 +197,7 @@ void rocvfd_t::update_display()
for (int i =0; i<16; i++)
{
m_outputs[i] = set_display(m_chars[i]);
- output_set_indexed_value("vfd", (m_port_val*16) + i, m_outputs[i]);
+ machine().output().set_indexed_value("vfd", (m_port_val*16) + i, m_outputs[i]);
}
}
diff --git a/src/emu/dioutput.cpp b/src/emu/dioutput.cpp
index 32e1338d091..176b5c8efc5 100644
--- a/src/emu/dioutput.cpp
+++ b/src/emu/dioutput.cpp
@@ -38,7 +38,7 @@ device_output_interface::~device_output_interface()
void device_output_interface::set_output_value(int value) const
{
if (m_output_name)
- output_set_value(m_output_name, value);
+ device().machine().output().set_value(m_output_name, value);
else
fatalerror("Output name not set!");
}
@@ -46,23 +46,23 @@ void device_output_interface::set_output_value(int value) const
void device_output_interface::set_led_value(int value) const
{
if (m_output_name)
- output_set_value(m_output_name, value);
+ device().machine().output().set_value(m_output_name, value);
else
- output_set_led_value(m_output_index, value);
+ device().machine().output().set_led_value(m_output_index, value);
}
void device_output_interface::set_lamp_value(int value) const
{
if (m_output_name)
- output_set_value(m_output_name, value);
+ device().machine().output().set_value(m_output_name, value);
else
- output_set_lamp_value(m_output_index, value);
+ device().machine().output().set_lamp_value(m_output_index, value);
}
void device_output_interface::set_digit_value(int value) const
{
if (m_output_name)
- output_set_value(m_output_name, value);
+ device().machine().output().set_value(m_output_name, value);
else
- output_set_digit_value(m_output_index, value);
+ device().machine().output().set_digit_value(m_output_index, value);
}
diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp
index aa3b523fbfd..ba7cecc1c95 100644
--- a/src/emu/luaengine.cpp
+++ b/src/emu/luaengine.cpp
@@ -331,7 +331,7 @@ void lua_engine::emu_hook_output(lua_State *L)
hook_output_cb.set(L, 1);
if (!output_notifier_set) {
- output_set_notifier(nullptr, s_output_notifier, this);
+ machine().output().set_notifier(nullptr, s_output_notifier, this);
output_notifier_set = true;
}
}
@@ -357,7 +357,7 @@ void lua_engine::emu_set_hook(lua_State *L)
if (strcmp(hookname, "output") == 0) {
hook_output_cb.set(L, 1);
if (!output_notifier_set) {
- output_set_notifier(nullptr, s_output_notifier, this);
+ machine().output().set_notifier(nullptr, s_output_notifier, this);
output_notifier_set = true;
}
} else if (strcmp(hookname, "frame") == 0) {
diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp
index a48aa0811c6..a858d5df962 100644
--- a/src/emu/machine.cpp
+++ b/src/emu/machine.cpp
@@ -218,7 +218,7 @@ void running_machine::start()
// initialize basic can't-fail systems here
m_configuration = std::make_unique<configuration_manager>(*this);
m_input = std::make_unique<input_manager>(*this);
- output_init(*this);
+ m_output = std::make_unique<output_manager>(*this);
m_render = std::make_unique<render_manager>(*this);
m_bookkeeping = std::make_unique<bookkeeping_manager>(*this);
diff --git a/src/emu/machine.h b/src/emu/machine.h
index 6c2a08c4c15..37db9e89992 100644
--- a/src/emu/machine.h
+++ b/src/emu/machine.h
@@ -88,6 +88,7 @@ class debug_view_manager;
class network_manager;
class bookkeeping_manager;
class configuration_manager;
+class output_manager;
class osd_interface;
enum class config_type;
@@ -169,6 +170,7 @@ public:
network_manager &network() const { assert(m_network != nullptr); return *m_network; }
bookkeeping_manager &bookkeeping() const { assert(m_network != nullptr); return *m_bookkeeping; }
configuration_manager &configuration() const { assert(m_configuration != nullptr); return *m_configuration; }
+ output_manager &output() const { assert(m_output != nullptr); return *m_output; }
ui_manager &ui() const { assert(m_ui != nullptr); return *m_ui; }
tilemap_manager &tilemap() const { assert(m_tilemap != nullptr); return *m_tilemap; }
debug_view_manager &debug_view() const { assert(m_debug_view != nullptr); return *m_debug_view; }
@@ -287,6 +289,7 @@ private:
std::unique_ptr<network_manager> m_network; // internal data from network.c
std::unique_ptr<bookkeeping_manager> m_bookkeeping;// internal data from bookkeeping.c
std::unique_ptr<configuration_manager> m_configuration; // internal data from config.c
+ std::unique_ptr<output_manager> m_output; // internal data from output.c
// system state
machine_phase m_current_phase; // current execution phase
diff --git a/src/emu/output.cpp b/src/emu/output.cpp
index 6e399cb4c97..a1ca5518ef9 100644
--- a/src/emu/output.cpp
+++ b/src/emu/output.cpp
@@ -10,93 +10,33 @@
#include "emu.h"
#include "coreutil.h"
-/***************************************************************************
- CONSTANTS
-***************************************************************************/
-
-#define HASH_SIZE 53
-
-
-
-/***************************************************************************
- TYPE DEFINITIONS
-***************************************************************************/
-
-class output_notify
-{
-public:
- output_notify(output_notifier_func callback, void *param)
- : m_next(nullptr),
- m_notifier(callback),
- m_param(param) { }
-
- output_notify *next() const { return m_next; }
-
- output_notify * m_next; /* link to next item */
- output_notifier_func m_notifier; /* callback to call */
- void * m_param; /* parameter to pass the callback */
-};
-
-
-struct output_item
-{
- output_item * next; /* next item in list */
- std::string name; /* string name of the item */
- UINT32 hash; /* hash for this item name */
- UINT32 id; /* unique ID for this item */
- INT32 value; /* current value */
- simple_list<output_notify> notifylist; /* list of notifier callbacks */
-};
-
-
-
-/***************************************************************************
- GLOBAL VARIABLES
-***************************************************************************/
-
-static output_item *itemtable[HASH_SIZE];
-static simple_list<output_notify> global_notifylist;
-static UINT32 uniqueid = 12345;
-
-
-
-/***************************************************************************
- FUNCTION PROTOTYPES
-***************************************************************************/
-
-static void output_pause(running_machine &machine);
-static void output_resume(running_machine &machine);
-static void output_exit(running_machine &machine);
+//**************************************************************************
+// OUTPUT MANAGER
+//**************************************************************************
+//-------------------------------------------------
+// output_manager - constructor
+//-------------------------------------------------
-
-/***************************************************************************
- INLINE FUNCTIONS
-***************************************************************************/
-
-/*-------------------------------------------------
- get_hash - return the hash of an output value
--------------------------------------------------*/
-
-static inline UINT32 get_hash(const char *string)
+output_manager::output_manager(running_machine &machine)
+ : m_machine(machine),
+ m_uniqueid(12345)
{
- return core_crc32(0, (UINT8 *)string, (UINT32)strlen(string));
+ /* add pause callback */
+ machine.add_notifier(MACHINE_NOTIFY_PAUSE, machine_notify_delegate(FUNC(output_manager::pause), this));
+ machine.add_notifier(MACHINE_NOTIFY_RESUME, machine_notify_delegate(FUNC(output_manager::resume), this));
}
-
/*-------------------------------------------------
find_item - find an item based on a string
-------------------------------------------------*/
-static inline output_item *find_item(const char *string)
+output_manager::output_item* output_manager::find_item(const char *string)
{
- UINT32 hash = get_hash(string);
- output_item *item;
-
/* use the hash as a starting point and find an entry */
- for (item = itemtable[hash % HASH_SIZE]; item != nullptr; item = item->next)
- if (item->hash == hash && strcmp(string, item->name.c_str()) == 0)
- return item;
+ for (auto &item : m_itemtable)
+ if (strcmp(string, item.second.name.c_str()) == 0)
+ return &item.second;
return nullptr;
}
@@ -106,85 +46,32 @@ static inline output_item *find_item(const char *string)
create_new_item - create a new item
-------------------------------------------------*/
-static inline output_item *create_new_item(const char *outname, INT32 value)
+output_manager::output_item *output_manager::create_new_item(const char *outname, INT32 value)
{
- auto item = global_alloc(output_item);
- UINT32 hash = get_hash(outname);
-
+ output_item item;
+
/* fill in the data */
- item->next = itemtable[hash % HASH_SIZE];
- item->name.assign(outname);
- item->hash = hash;
- item->id = uniqueid++;
- item->value = value;
+ item.name = outname;
+ item.id = m_uniqueid++;
+ item.value = value;
/* add us to the hash table */
- itemtable[hash % HASH_SIZE] = item;
- return item;
-}
-
-
-
-/***************************************************************************
- CORE IMPLEMENTATION
-***************************************************************************/
-
-/*-------------------------------------------------
- output_init - initialize everything
--------------------------------------------------*/
-
-void output_init(running_machine &machine)
-{
- /* add pause callback */
- machine.add_notifier(MACHINE_NOTIFY_PAUSE, machine_notify_delegate(FUNC(output_pause), &machine));
- machine.add_notifier(MACHINE_NOTIFY_RESUME, machine_notify_delegate(FUNC(output_resume), &machine));
-
- /* get a callback when done */
- machine.add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(output_exit), &machine));
-
- /* reset the lists */
- memset(itemtable, 0, sizeof(itemtable));
- global_notifylist.reset();
+ m_itemtable.insert(std::pair<std::string, output_item>(outname, item));
+ return &m_itemtable.find(outname)->second;
}
-
/*-------------------------------------------------
output_pause - send pause message
-------------------------------------------------*/
-static void output_pause(running_machine &machine)
-{
- output_set_value("pause", 1);
-}
-
-static void output_resume(running_machine &machine)
+void output_manager::pause()
{
- output_set_value("pause", 0);
+ set_value("pause", 1);
}
-
-/*-------------------------------------------------
- output_exit - cleanup on exit
--------------------------------------------------*/
-
-static void output_exit(running_machine &machine)
+void output_manager::resume()
{
- output_item *item;
- int hash;
-
- /* remove all items */
- for (hash = 0; hash < HASH_SIZE; hash++)
- for (item = itemtable[hash]; item != nullptr; )
- {
- output_item *next = item->next;
-
- /* free the name and the item */
- global_free(item);
- item = next;
- }
-
- /* remove all global notifiers */
- global_notifylist.reset();
+ set_value("pause", 0);
}
@@ -192,7 +79,7 @@ static void output_exit(running_machine &machine)
output_set_value - set the value of an output
-------------------------------------------------*/
-void output_set_value(const char *outname, INT32 value)
+void output_manager::set_value(const char *outname, INT32 value)
{
output_item *item = find_item(outname);
INT32 oldval;
@@ -215,12 +102,12 @@ void output_set_value(const char *outname, INT32 value)
if (oldval != value)
{
/* call the local notifiers first */
- for (output_notify *notify = item->notifylist.first(); notify != nullptr; notify = notify->next())
- (*notify->m_notifier)(outname, value, notify->m_param);
+ for (auto notify : item->notifylist)
+ (*notify.m_notifier)(outname, value, notify.m_param);
/* call the global notifiers next */
- for (output_notify *notify = global_notifylist.first(); notify != nullptr; notify = notify->next())
- (*notify->m_notifier)(outname, value, notify->m_param);
+ for (auto notify : m_global_notifylist)
+ (*notify.m_notifier)(outname, value, notify.m_param);
}
}
@@ -230,7 +117,7 @@ void output_set_value(const char *outname, INT32 value)
indexed output
-------------------------------------------------*/
-void output_set_indexed_value(const char *basename, int index, int value)
+void output_manager::set_indexed_value(const char *basename, int index, int value)
{
char buffer[100];
char *dest = buffer;
@@ -247,7 +134,7 @@ void output_set_indexed_value(const char *basename, int index, int value)
*dest++ = 0;
/* set the value */
- output_set_value(buffer, value);
+ set_value(buffer, value);
}
@@ -256,7 +143,7 @@ void output_set_indexed_value(const char *basename, int index, int value)
output
-------------------------------------------------*/
-INT32 output_get_value(const char *outname)
+INT32 output_manager::get_value(const char *outname)
{
output_item *item = find_item(outname);
@@ -272,7 +159,7 @@ INT32 output_get_value(const char *outname)
indexed output
-------------------------------------------------*/
-INT32 output_get_indexed_value(const char *basename, int index)
+INT32 output_manager::get_indexed_value(const char *basename, int index)
{
char buffer[100];
char *dest = buffer;
@@ -289,7 +176,7 @@ INT32 output_get_indexed_value(const char *basename, int index)
*dest++ = 0;
/* set the value */
- return output_get_value(buffer);
+ return get_value(buffer);
}
@@ -299,8 +186,9 @@ INT32 output_get_indexed_value(const char *basename, int index)
if NULL is specified
-------------------------------------------------*/
-void output_set_notifier(const char *outname, output_notifier_func callback, void *param)
+void output_manager::set_notifier(const char *outname, output_notifier_func callback, void *param)
{
+ output_notify notify(callback, param);
/* if an item is specified, find it */
if (outname != nullptr)
{
@@ -309,10 +197,11 @@ void output_set_notifier(const char *outname, output_notifier_func callback, voi
/* if no item of that name, create a new one */
if (item == nullptr)
item = create_new_item(outname, 0);
- item->notifylist.append(*global_alloc(output_notify(callback, param)));
+
+ item->notifylist.push_back(notify);
}
else
- global_notifylist.append(*global_alloc(output_notify(callback, param)));
+ m_global_notifylist.push_back(notify);
}
@@ -321,15 +210,10 @@ void output_set_notifier(const char *outname, output_notifier_func callback, voi
notifier for all outputs
-------------------------------------------------*/
-void output_notify_all(output_notifier_func callback, void *param)
+void output_manager::notify_all(output_notifier_func callback, void *param)
{
- output_item *item;
- int hash;
-
- /* remove all items */
- for (hash = 0; hash < HASH_SIZE; hash++)
- for (item = itemtable[hash]; item != nullptr; item = item->next)
- (*callback)(item->name.c_str(), item->value, param);
+ for (auto &item : m_itemtable)
+ (*callback)(item.second.name.c_str(), item.second.value, param);
}
@@ -338,7 +222,7 @@ void output_notify_all(output_notifier_func callback, void *param)
a given name
-------------------------------------------------*/
-UINT32 output_name_to_id(const char *outname)
+UINT32 output_manager::name_to_id(const char *outname)
{
output_item *item = find_item(outname);
@@ -354,31 +238,12 @@ UINT32 output_name_to_id(const char *outname)
to a given unique ID
-------------------------------------------------*/
-const char *output_id_to_name(UINT32 id)
+const char *output_manager::id_to_name(UINT32 id)
{
- output_item *item;
- int hash;
+ for (auto &item : m_itemtable)
+ if (item.second.id == id)
+ return item.second.name.c_str();
- /* remove all items */
- for (hash = 0; hash < HASH_SIZE; hash++)
- for (item = itemtable[hash]; item != nullptr; item = item->next)
- if (item->id == id)
- return item->name.c_str();
-
- /* nothing found, return NULL */
+ /* nothing found, return nullptr */
return nullptr;
}
-
-/***************************************************************************
-LED CODE
-***************************************************************************/
-
-/*-------------------------------------------------
-set_led_status - set the state of a given LED
--------------------------------------------------*/
-
-void set_led_status(running_machine &machine, int num, int on)
-{
- output_set_led_value(num, on);
-}
-
diff --git a/src/emu/output.h b/src/emu/output.h
index d4a442f6636..77798c1eaf1 100644
--- a/src/emu/output.h
+++ b/src/emu/output.h
@@ -23,77 +23,83 @@
typedef void (*output_notifier_func)(const char *outname, INT32 value, void *param);
+// ======================> output_manager
-
-/***************************************************************************
- FUNCTION PROTOTYPES
-***************************************************************************/
-
-/* core initialization */
-void output_init(running_machine &machine);
-
-/* set the value for a given output */
-void output_set_value(const char *outname, INT32 value);
-
-/* set an indexed value for an output (concatenates basename + index) */
-void output_set_indexed_value(const char *basename, int index, int value);
-
-/* return the current value for a given output */
-INT32 output_get_value(const char *outname);
-
-/* return the current value for a given indexed output */
-INT32 output_get_indexed_value(const char *outname, int index);
-
-/* set a notifier on a particular output, or globally if NULL */
-void output_set_notifier(const char *outname, output_notifier_func callback, void *param);
-
-/* set a notifier on a particular output, or globally if NULL */
-void output_notify_all(output_notifier_func callback, void *param);
-
-/* map a name to a unique ID */
-UINT32 output_name_to_id(const char *outname);
-
-/* map a unique ID back to a name */
-const char *output_id_to_name(UINT32 id);
-
-/* set the status of an LED */
-void set_led_status(running_machine &machine, int num, int value);
-
-
-/***************************************************************************
- INLINES
-***************************************************************************/
-
-static inline void output_set_led_value(int index, int value)
-{
- output_set_indexed_value("led", index, value ? 1 : 0);
-}
-
-static inline void output_set_lamp_value(int index, int value)
+class output_manager
{
- output_set_indexed_value("lamp", index, value);
-}
-
-static inline void output_set_digit_value(int index, int value)
-{
- output_set_indexed_value("digit", index, value);
-}
-
-
-static inline INT32 output_get_led_value(int index)
-{
- return output_get_indexed_value("led", index);
-}
-
-static inline INT32 output_get_lamp_value(int index)
-{
- return output_get_indexed_value("lamp", index);
-}
-
-static inline INT32 output_get_digit_value(int index)
-{
- return output_get_indexed_value("digit", index);
-}
-
-
-#endif /* __OUTPUT_H__ */
+ class output_notify
+ {
+ public:
+ output_notify(output_notifier_func callback, void *param)
+ : m_notifier(callback),
+ m_param(param) { }
+
+ output_notifier_func m_notifier; // callback to call
+ void * m_param; // parameter to pass the callback
+ };
+
+
+ class output_item
+ {
+ public:
+ std::string name; // string name of the item
+ UINT32 hash; // hash for this item name
+ UINT32 id; // unique ID for this item
+ INT32 value; // current value
+ std::vector<output_notify> notifylist; // list of notifier callbacks
+ };
+
+public:
+ // construction/destruction
+ output_manager(running_machine &machine);
+
+ // getters
+ running_machine &machine() const { return m_machine; }
+
+ // set the value for a given output
+ void set_value(const char *outname, INT32 value);
+
+ // set an indexed value for an output (concatenates basename + index)
+ void set_indexed_value(const char *basename, int index, int value);
+
+ // return the current value for a given output
+ INT32 get_value(const char *outname);
+
+ // return the current value for a given indexed output
+ INT32 get_indexed_value(const char *outname, int index);
+
+ // set a notifier on a particular output, or globally if NULL
+ void set_notifier(const char *outname, output_notifier_func callback, void *param);
+
+ // set a notifier on a particular output, or globally if NULL
+ void notify_all(output_notifier_func callback, void *param);
+
+ // map a name to a unique ID
+ UINT32 name_to_id(const char *outname);
+
+ // map a unique ID back to a name
+ const char *id_to_name(UINT32 id);
+
+
+ // helpers
+ void set_led_value(int index, int value) { set_indexed_value("led", index, value ? 1 : 0); }
+ void set_lamp_value(int index, int value) { set_indexed_value("lamp", index, value); }
+ void set_digit_value(int index, int value) { set_indexed_value("digit", index, value); }
+ INT32 get_led_value(int index) { return get_indexed_value("led", index); }
+ INT32 get_lamp_value(int index) { return get_indexed_value("lamp", index); }
+ INT32 get_digit_value(int index) { return get_indexed_value("digit", index); }
+
+ void pause();
+ void resume();
+private:
+ output_item *find_item(const char *string);
+ output_item *create_new_item(const char *outname, INT32 value);
+
+ // internal state
+ running_machine & m_machine; // reference to our machine
+ std::unordered_map<std::string,output_item> m_itemtable;
+ std::vector<output_notify> m_global_notifylist;
+ UINT32 m_uniqueid;
+};
+
+#endif // __OUTPUT_H__
diff --git a/src/emu/rendlay.cpp b/src/emu/rendlay.cpp
index 582ed75fef2..a69ea831e44 100644
--- a/src/emu/rendlay.cpp
+++ b/src/emu/rendlay.cpp
@@ -2364,7 +2364,7 @@ layout_view::item::item(running_machine &machine, xml_data_node &itemnode, simpl
}
m_input_mask = xml_get_attribute_int_with_subst(machine, itemnode, "inputmask", 0);
if (m_output_name[0] != 0 && m_element != nullptr)
- output_set_value(m_output_name.c_str(), m_element->default_state());
+ machine.output().set_value(m_output_name.c_str(), m_element->default_state());
parse_bounds(machine, xml_get_sibling(itemnode.child, "bounds"), m_rawbounds);
parse_color(machine, xml_get_sibling(itemnode.child, "color"), m_color);
parse_orientation(machine, xml_get_sibling(itemnode.child, "orientation"), m_orientation);
@@ -2420,7 +2420,7 @@ int layout_view::item::state() const
// if configured to an output, fetch the output value
if (m_output_name[0] != 0)
- state = output_get_value(m_output_name.c_str());
+ state = m_element->machine().output().get_value(m_output_name.c_str());
// if configured to an input, fetch the input value
else if (m_input_tag[0] != 0)
diff --git a/src/emu/video.cpp b/src/emu/video.cpp
index 1d7c9096b3a..cf26d809c7e 100644
--- a/src/emu/video.cpp
+++ b/src/emu/video.cpp
@@ -164,7 +164,7 @@ video_manager::video_manager(running_machine &machine)
{
m_screenless_frame_timer = machine.scheduler().timer_alloc(timer_expired_delegate(FUNC(video_manager::screenless_update_callback), this));
m_screenless_frame_timer->adjust(screen_device::DEFAULT_FRAME_PERIOD, 0, screen_device::DEFAULT_FRAME_PERIOD);
- output_set_notifier(nullptr, video_notifier_callback, this);
+ machine.output().set_notifier(nullptr, video_notifier_callback, this);
}
}
diff --git a/src/mame/audio/bzone.cpp b/src/mame/audio/bzone.cpp
index 26bd5321a67..33f2bbcf1d7 100644
--- a/src/mame/audio/bzone.cpp
+++ b/src/mame/audio/bzone.cpp
@@ -389,7 +389,7 @@ WRITE8_MEMBER(bzone_state::bzone_sounds_w)
{
m_discrete->write(space, BZ_INPUT, data);
- output_set_value("startled", (data >> 6) & 1);
+ machine().output().set_value("startled", (data >> 6) & 1);
machine().sound().system_enable(data & 0x20);
}
diff --git a/src/mame/audio/cinemat.cpp b/src/mame/audio/cinemat.cpp
index 9f144915f47..b921957cda7 100644
--- a/src/mame/audio/cinemat.cpp
+++ b/src/mame/audio/cinemat.cpp
@@ -266,7 +266,7 @@ void cinemat_state::speedfrk_sound_w(UINT8 sound_val, UINT8 bits_changed)
m_samples->stop(0);
/* start LED is controlled by bit 0x02 */
- set_led_status(machine(), 0, ~sound_val & 0x02);
+ machine().output().set_led_value(0, ~sound_val & 0x02);
}
SOUND_RESET_MEMBER( cinemat_state, speedfrk )
@@ -476,7 +476,7 @@ void cinemat_state::tailg_sound_w(UINT8 sound_val, UINT8 bits_changed)
m_samples->start(5, 5);
/* LED */
- set_led_status(machine(), 0, m_current_shift & 0x40);
+ machine().output().set_led_value(0, m_current_shift & 0x40);
/* remember the previous value */
m_last_shift = m_current_shift;
diff --git a/src/mame/audio/copsnrob.cpp b/src/mame/audio/copsnrob.cpp
index 392b983a211..ef9eb5d6b86 100644
--- a/src/mame/audio/copsnrob.cpp
+++ b/src/mame/audio/copsnrob.cpp
@@ -729,7 +729,7 @@ WRITE8_MEMBER(copsnrob_state::copsnrob_misc_w)
case 0x06:
/* One Start */
- set_led_status(machine(), 0, !special_data);
+ machine().output().set_led_value(0, !special_data);
break;
case 0x07:
diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp
index 356314adeee..3d0369dce77 100644
--- a/src/mame/audio/dcs.cpp
+++ b/src/mame/audio/dcs.cpp
@@ -1006,7 +1006,7 @@ WRITE16_MEMBER( dcs_audio_device::dcs_data_bank_select_w )
/* bit 11 = sound board led */
#if 0
if (m_rev != 15)
- set_led_status(machine(), 2, data & 0x800);
+ machine().output().set_led_value(2, data & 0x800);
#endif
}
diff --git a/src/mame/audio/m79amb.cpp b/src/mame/audio/m79amb.cpp
index a89331f881e..491021bf78a 100644
--- a/src/mame/audio/m79amb.cpp
+++ b/src/mame/audio/m79amb.cpp
@@ -336,7 +336,7 @@ WRITE8_MEMBER(m79amb_state::m79amb_8003_w)
{
/* Self Test goes low on reset and lights LED */
/* LED goes off on pass */
- output_set_value("SELF_TEST", data & 0x01);
+ machine().output().set_value("SELF_TEST", data & 0x01);
m_discrete->write(space, M79AMB_MC_REV_EN, data & 0x02);
m_discrete->write(space, M79AMB_MC_CONTROL_EN, data & 0x04);
m_discrete->write(space, M79AMB_TANK_TRUCK_JEEP_EN, data & 0x08);
diff --git a/src/mame/audio/mw8080bw.cpp b/src/mame/audio/mw8080bw.cpp
index 16a337a6be0..4636f06e8c2 100644
--- a/src/mame/audio/mw8080bw.cpp
+++ b/src/mame/audio/mw8080bw.cpp
@@ -1272,7 +1272,7 @@ WRITE8_MEMBER(mw8080bw_state::desertgu_audio_2_w)
m_discrete->write(space, DESERTGU_TRIGGER_CLICK_EN, (data >> 1) & 0x01);
- output_set_value("Player1_Gun_Recoil", (data >> 2) & 0x01);
+ machine().output().set_value("Player1_Gun_Recoil", (data >> 2) & 0x01);
m_desertgun_controller_select = (data >> 3) & 0x01;
@@ -1581,14 +1581,14 @@ WRITE8_MEMBER(mw8080bw_state::gmissile_audio_1_w)
if (rising_bits & 0x10) m_samples2->start(0, 0);
/* if (data & 0x20) enable LEFT EXPLOSION sound (goes to left speaker) */
- output_set_value("L_EXP_LIGHT", (data >> 5) & 0x01);
+ machine().output().set_value("L_EXP_LIGHT", (data >> 5) & 0x01);
if (rising_bits & 0x20) m_samples1->start(0, 1);
/* if (data & 0x40) enable LEFT MISSILE sound (goes to left speaker) */
if (rising_bits & 0x40) m_samples1->start(0, 0);
/* if (data & 0x80) enable RIGHT EXPLOSION sound (goes to right speaker) */
- output_set_value("R_EXP_LIGHT", (data >> 7) & 0x01);
+ machine().output().set_value("R_EXP_LIGHT", (data >> 7) & 0x01);
if (rising_bits & 0x80) m_samples2->start(0, 1);
m_port_1_last = data;
@@ -3242,7 +3242,7 @@ WRITE8_MEMBER(mw8080bw_state::spcenctr_audio_3_w)
m_spcenctr_strobe_state = (data >> 2) & 0x01;
- output_set_value("LAMP", (data >> 3) & 0x01);
+ machine().output().set_value("LAMP", (data >> 3) & 0x01);
m_discrete->write(space, SPCENCTR_BONUS_EN, (data >> 4) & 0x01);
@@ -3309,7 +3309,7 @@ WRITE8_MEMBER(mw8080bw_state::phantom2_audio_2_w)
/* if (data & 0x08) enable EXPLOSION sound */
if (rising_bits & 0x08) m_samples->start(1, 1);
- output_set_value("EXPLAMP", (data >> 4) & 0x01);
+ machine().output().set_value("EXPLAMP", (data >> 4) & 0x01);
/* set JET SOUND FREQ((data >> 5) & 0x07) 0, if no jet sound */
diff --git a/src/mame/audio/skyraid.cpp b/src/mame/audio/skyraid.cpp
index b52a6d05781..c1e0250e986 100644
--- a/src/mame/audio/skyraid.cpp
+++ b/src/mame/audio/skyraid.cpp
@@ -297,7 +297,7 @@ WRITE8_MEMBER(skyraid_state::skyraid_sound_w)
m_discrete->write(space, SKYRAID_PLANE_SWEEP_EN, data & 0x01);
m_discrete->write(space, SKYRAID_MISSILE_EN, data & 0x02);
m_discrete->write(space, SKYRAID_EXPLOSION_EN, data & 0x04);
- set_led_status(machine(), 0, !(data & 0x08));
+ machine().output().set_led_value(0, !(data & 0x08));
m_discrete->write(space, SKYRAID_PLANE_ON_EN, data & 0x10);
m_discrete->write(space, SKYRAID_ATTRACT_EN, data & 0x20);
}
diff --git a/src/mame/audio/turbo.cpp b/src/mame/audio/turbo.cpp
index cb24f3234a9..87e95f55a3c 100644
--- a/src/mame/audio/turbo.cpp
+++ b/src/mame/audio/turbo.cpp
@@ -129,7 +129,7 @@ WRITE8_MEMBER(turbo_state::turbo_sound_b_w)
/* ACC0-ACC5 */
m_turbo_accel = data & 0x3f;
- output_set_value("tachometer", m_turbo_accel);
+ machine().output().set_value("tachometer", m_turbo_accel);
/* /AMBU: channel 4 */
if ((diff & 0x40) && !(data & 0x40) && !m_samples->playing(4)) m_samples->start(4, 8, true);
@@ -152,7 +152,7 @@ WRITE8_MEMBER(turbo_state::turbo_sound_c_w)
m_turbo_bsel = (data >> 2) & 3;
/* SPEED0-3 */
- output_set_value("speed", (data >> 4) & 0x0f);
+ machine().output().set_value("speed", (data >> 4) & 0x0f);
/* update any samples */
turbo_update_samples();
diff --git a/src/mame/drivers/24cdjuke.cpp b/src/mame/drivers/24cdjuke.cpp
index 605f480542c..2390c41974a 100644
--- a/src/mame/drivers/24cdjuke.cpp
+++ b/src/mame/drivers/24cdjuke.cpp
@@ -118,7 +118,7 @@ WRITE8_MEMBER(midcoin24cdjuke_state::digit_w)
char_data = BITSWAP16(char_data, 13,11,9,15,14,10,12,8,7,6,5,4,3,2,1,0);
- output_set_digit_value(offset, char_data ^ 0xffff);
+ machine().output().set_digit_value(offset, char_data ^ 0xffff);
}
diff --git a/src/mame/drivers/30test.cpp b/src/mame/drivers/30test.cpp
index 61ce6d7b005..b161af4a278 100644
--- a/src/mame/drivers/30test.cpp
+++ b/src/mame/drivers/30test.cpp
@@ -80,21 +80,21 @@ static const UINT8 led_map[16] =
WRITE8_MEMBER(namco_30test_state::namco_30test_led_w)
{
- output_set_digit_value(0 + offset * 2, led_map[(data & 0xf0) >> 4]);
- output_set_digit_value(1 + offset * 2, led_map[(data & 0x0f) >> 0]);
+ machine().output().set_digit_value(0 + offset * 2, led_map[(data & 0xf0) >> 4]);
+ machine().output().set_digit_value(1 + offset * 2, led_map[(data & 0x0f) >> 0]);
}
WRITE8_MEMBER(namco_30test_state::namco_30test_led_rank_w)
{
- output_set_digit_value(64 + offset * 2, led_map[(data & 0xf0) >> 4]);
- output_set_digit_value(65 + offset * 2, led_map[(data & 0x0f) >> 0]);
+ machine().output().set_digit_value(64 + offset * 2, led_map[(data & 0xf0) >> 4]);
+ machine().output().set_digit_value(65 + offset * 2, led_map[(data & 0x0f) >> 0]);
}
WRITE8_MEMBER(namco_30test_state::namco_30test_lamps_w)
{
// d0-d5: ranking, d6: game over, d7: assume marquee lamp
for (int i = 0; i < 8; i++)
- output_set_lamp_value(i, data >> i & 1);
+ machine().output().set_lamp_value(i, data >> i & 1);
}
READ8_MEMBER(namco_30test_state::namco_30test_mux_r)
diff --git a/src/mame/drivers/4004clk.cpp b/src/mame/drivers/4004clk.cpp
index b62ec3794e9..71813d8c606 100644
--- a/src/mame/drivers/4004clk.cpp
+++ b/src/mame/drivers/4004clk.cpp
@@ -61,12 +61,12 @@ UINT8 nixieclock_state::nixie_to_num(UINT16 val)
inline void nixieclock_state::output_set_nixie_value(int index, int value)
{
- output_set_indexed_value("nixie", index, value);
+ machine().output().set_indexed_value("nixie", index, value);
}
inline void nixieclock_state::output_set_neon_value(int index, int value)
{
- output_set_indexed_value("neon", index, value);
+ machine().output().set_indexed_value("neon", index, value);
}
WRITE8_MEMBER(nixieclock_state::nixie_w)
diff --git a/src/mame/drivers/acefruit.cpp b/src/mame/drivers/acefruit.cpp
index 336e9ff8d43..0a341f57466 100644
--- a/src/mame/drivers/acefruit.cpp
+++ b/src/mame/drivers/acefruit.cpp
@@ -274,7 +274,7 @@ WRITE8_MEMBER(acefruit_state::acefruit_lamp_w)
for( i = 0; i < 8; i++ )
{
- output_set_lamp_value( ( offset * 8 ) + i, ( data >> i ) & 1 );
+ machine().output().set_lamp_value( ( offset * 8 ) + i, ( data >> i ) & 1 );
}
}
@@ -284,7 +284,7 @@ WRITE8_MEMBER(acefruit_state::acefruit_solenoid_w)
for( i = 0; i < 8; i++ )
{
- output_set_indexed_value( "solenoid", i, ( data >> i ) & 1 );
+ machine().output().set_indexed_value( "solenoid", i, ( data >> i ) & 1 );
}
}
diff --git a/src/mame/drivers/aces1.cpp b/src/mame/drivers/aces1.cpp
index 765e151b034..81aa8e72f58 100644
--- a/src/mame/drivers/aces1.cpp
+++ b/src/mame/drivers/aces1.cpp
@@ -105,7 +105,7 @@ public:
{
if (m_led_strobe != m_input_strobe)
{
- output_set_digit_value(m_input_strobe,data);
+ machine().output().set_digit_value(m_input_strobe,data);
m_led_strobe = m_input_strobe;
}
}
@@ -122,7 +122,7 @@ public:
for (i = 0; i < 8; i++)
{
- output_set_lamp_value((8*m_input_strobe)+i, ((data & (1 << i)) !=0));
+ machine().output().set_lamp_value((8*m_input_strobe)+i, ((data & (1 << i)) !=0));
}
m_lamp_strobe = m_input_strobe;
}
diff --git a/src/mame/drivers/acrnsys1.cpp b/src/mame/drivers/acrnsys1.cpp
index 23d35f2807a..25ed480c31c 100644
--- a/src/mame/drivers/acrnsys1.cpp
+++ b/src/mame/drivers/acrnsys1.cpp
@@ -151,7 +151,7 @@ WRITE8_MEMBER( acrnsys1_state::acrnsys1_led_segment_w )
{
UINT8 key_line = m_ttl74145->read();
- output_set_digit_value(key_line, data);
+ machine().output().set_digit_value(key_line, data);
}
diff --git a/src/mame/drivers/alesis.cpp b/src/mame/drivers/alesis.cpp
index 605305b6b64..eb3c9f01679 100644
--- a/src/mame/drivers/alesis.cpp
+++ b/src/mame/drivers/alesis.cpp
@@ -44,15 +44,15 @@ READ8_MEMBER( alesis_state::kb_r )
WRITE8_MEMBER( alesis_state::led_w )
{
- output_set_value("patt_led", data & 0x01 ? 1 : 0);
- output_set_value("song_led", data & 0x01 ? 0 : 1);
- output_set_value("play_led", data & 0x02 ? 0 : 1);
- output_set_value("record_led",data & 0x04 ? 0 : 1);
- output_set_value("voice_led", data & 0x08 ? 0 : 1);
- output_set_value("tune_led", data & 0x10 ? 0 : 1);
- output_set_value("mix_led", data & 0x20 ? 0 : 1);
- output_set_value("tempo_led", data & 0x40 ? 0 : 1);
- output_set_value("midi_led", data & 0x80 ? 0 : 1);
+ machine().output().set_value("patt_led", data & 0x01 ? 1 : 0);
+ machine().output().set_value("song_led", data & 0x01 ? 0 : 1);
+ machine().output().set_value("play_led", data & 0x02 ? 0 : 1);
+ machine().output().set_value("record_led",data & 0x04 ? 0 : 1);
+ machine().output().set_value("voice_led", data & 0x08 ? 0 : 1);
+ machine().output().set_value("tune_led", data & 0x10 ? 0 : 1);
+ machine().output().set_value("mix_led", data & 0x20 ? 0 : 1);
+ machine().output().set_value("tempo_led", data & 0x40 ? 0 : 1);
+ machine().output().set_value("midi_led", data & 0x80 ? 0 : 1);
}
READ8_MEMBER( alesis_state::p3_r )
@@ -76,13 +76,13 @@ WRITE8_MEMBER( alesis_state::sr16_lcd_w )
WRITE8_MEMBER( alesis_state::mmt8_led_w )
{
- output_set_value("play_led", data & 0x01 ? 0 : 1);
- output_set_value("record_led" , data & 0x02 ? 0 : 1);
- output_set_value("part_led", data & 0x04 ? 0 : 1);
- output_set_value("edit_led", data & 0x08 ? 0 : 1);
- output_set_value("song_led", data & 0x10 ? 0 : 1);
- output_set_value("echo_led", data & 0x20 ? 0 : 1);
- output_set_value("loop_led", data & 0x40 ? 0 : 1);
+ machine().output().set_value("play_led", data & 0x01 ? 0 : 1);
+ machine().output().set_value("record_led" , data & 0x02 ? 0 : 1);
+ machine().output().set_value("part_led", data & 0x04 ? 0 : 1);
+ machine().output().set_value("edit_led", data & 0x08 ? 0 : 1);
+ machine().output().set_value("song_led", data & 0x10 ? 0 : 1);
+ machine().output().set_value("echo_led", data & 0x20 ? 0 : 1);
+ machine().output().set_value("loop_led", data & 0x40 ? 0 : 1);
m_leds = data;
}
@@ -95,7 +95,7 @@ READ8_MEMBER( alesis_state::mmt8_led_r )
WRITE8_MEMBER( alesis_state::track_led_w )
{
for (int i=0; i<8; i++)
- output_set_indexed_value("track_led", i + 1, BIT(data, i));
+ machine().output().set_indexed_value("track_led", i + 1, BIT(data, i));
}
READ8_MEMBER( alesis_state::mmt8_p3_r )
diff --git a/src/mame/drivers/allied.cpp b/src/mame/drivers/allied.cpp
index c34ecd51e3d..bda1e53fb2d 100644
--- a/src/mame/drivers/allied.cpp
+++ b/src/mame/drivers/allied.cpp
@@ -408,34 +408,34 @@ WRITE8_MEMBER( allied_state::ic4_b_w )
{
if (!BIT(data, i+4))
{
- output_set_digit_value(i*10, patterns[0]);
+ machine().output().set_digit_value(i*10, patterns[0]);
segment = (m_player_score[i] >> 0) & 15;
- output_set_digit_value(i*10+1, patterns[segment]);
+ machine().output().set_digit_value(i*10+1, patterns[segment]);
segment = (m_player_score[i] >> 4) & 15;
- output_set_digit_value(i*10+2, patterns[segment]);
+ machine().output().set_digit_value(i*10+2, patterns[segment]);
segment = (m_player_score[i] >> 8) & 15;
- output_set_digit_value(i*10+3, patterns[segment]);
+ machine().output().set_digit_value(i*10+3, patterns[segment]);
segment = (m_player_score[i] >> 12) & 15;
- output_set_digit_value(i*10+4, patterns[segment]);
+ machine().output().set_digit_value(i*10+4, patterns[segment]);
segment = (m_player_score[i] >> 16) & 15;
- output_set_digit_value(i*10+5, patterns[segment]);
+ machine().output().set_digit_value(i*10+5, patterns[segment]);
}
else
{
- output_set_digit_value(i*10, 0);
- output_set_digit_value(i*10+1, 0);
- output_set_digit_value(i*10+2, 0);
- output_set_digit_value(i*10+3, 0);
- output_set_digit_value(i*10+4, 0);
- output_set_digit_value(i*10+5, 0);
+ machine().output().set_digit_value(i*10, 0);
+ machine().output().set_digit_value(i*10+1, 0);
+ machine().output().set_digit_value(i*10+2, 0);
+ machine().output().set_digit_value(i*10+3, 0);
+ machine().output().set_digit_value(i*10+4, 0);
+ machine().output().set_digit_value(i*10+5, 0);
}
}
// doesn't seem to be a strobe for the credits display
segment = (m_player_score[4] >> 0) & 15;
- output_set_digit_value(40, patterns[segment]);
+ machine().output().set_digit_value(40, patterns[segment]);
segment = (m_player_score[4] >> 4) & 15;
- output_set_digit_value(41, patterns[segment]);
+ machine().output().set_digit_value(41, patterns[segment]);
// PB0-3 - player 1-4 LED - to do
}
@@ -569,12 +569,12 @@ WRITE8_MEMBER( allied_state::ic8_a_w )
// PB0-4 = ball 1-5 LED; PB5 = shoot again lamp
WRITE8_MEMBER( allied_state::ic8_b_w )
{
- output_set_value("led1", !BIT(data, 0));
- output_set_value("led2", !BIT(data, 1));
- output_set_value("led3", !BIT(data, 2));
- output_set_value("led4", !BIT(data, 3));
- output_set_value("led5", !BIT(data, 4));
- output_set_value("led6", !BIT(data, 5));
+ machine().output().set_value("led1", !BIT(data, 0));
+ machine().output().set_value("led2", !BIT(data, 1));
+ machine().output().set_value("led3", !BIT(data, 2));
+ machine().output().set_value("led4", !BIT(data, 3));
+ machine().output().set_value("led5", !BIT(data, 4));
+ machine().output().set_value("led6", !BIT(data, 5));
}
// this line not emulated in PinMAME, maybe it isn't needed
@@ -604,7 +604,7 @@ void allied_state::machine_reset()
m_ic6a2 = 0;
m_ic6b4 = 0;
m_ic6b7 = 0;
- output_set_value("led0", 1); //1=off
+ machine().output().set_value("led0", 1); //1=off
}
static MACHINE_CONFIG_START( allied, allied_state )
diff --git a/src/mame/drivers/amaticmg.cpp b/src/mame/drivers/amaticmg.cpp
index bc4e6ce7f32..f486379afb6 100644
--- a/src/mame/drivers/amaticmg.cpp
+++ b/src/mame/drivers/amaticmg.cpp
@@ -594,10 +594,10 @@ WRITE8_MEMBER(amaticmg_state::out_a_w)
-x-- ---- HOLD4
*/
- output_set_lamp_value(0, (data >> 3) & 1); /* START */
- output_set_lamp_value(1, (data >> 4) & 1); /* BET */
- output_set_lamp_value(2, (data >> 5) & 1); /* HOLD3 */
- output_set_lamp_value(3, (data >> 6) & 1); /* HOLD4 */
+ machine().output().set_lamp_value(0, (data >> 3) & 1); /* START */
+ machine().output().set_lamp_value(1, (data >> 4) & 1); /* BET */
+ machine().output().set_lamp_value(2, (data >> 5) & 1); /* HOLD3 */
+ machine().output().set_lamp_value(3, (data >> 6) & 1); /* HOLD4 */
logerror("port A: %2X\n", data);
}
@@ -615,9 +615,9 @@ WRITE8_MEMBER(amaticmg_state::out_c_w)
x--- ---- Hopper motor
--x- x--- (unknown)
*/
- output_set_lamp_value(4, (data >> 1) & 1); /* HOLD1 */
- output_set_lamp_value(5, (data >> 4) & 1); /* HOLD2 */
- output_set_lamp_value(6, (data >> 6) & 1); /* CANCEL */
+ machine().output().set_lamp_value(4, (data >> 1) & 1); /* HOLD1 */
+ machine().output().set_lamp_value(5, (data >> 4) & 1); /* HOLD2 */
+ machine().output().set_lamp_value(6, (data >> 6) & 1); /* CANCEL */
// machine().bookkeeping().coin_counter_w(0, data & 0x04); /* Coin In */
// machine().bookkeeping().coin_counter_w(1, data & 0x01); /* Coin Out */
diff --git a/src/mame/drivers/amico2k.cpp b/src/mame/drivers/amico2k.cpp
index 3d692b34082..856dc4c23ec 100644
--- a/src/mame/drivers/amico2k.cpp
+++ b/src/mame/drivers/amico2k.cpp
@@ -106,7 +106,7 @@ TIMER_CALLBACK_MEMBER(amico2k_state::led_refresh)
{
if (m_ls145_p > 3)
{
- output_set_digit_value(m_ls145_p - 4, m_segment);
+ machine().output().set_digit_value(m_ls145_p - 4, m_segment);
}
}
diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp
index 047ef2929c8..9687d2de485 100644
--- a/src/mame/drivers/amiga.cpp
+++ b/src/mame/drivers/amiga.cpp
@@ -909,7 +909,7 @@ WRITE8_MEMBER( cd32_state::akiko_cia_0_port_a_write )
m_cdda->set_output_gain(0, BIT(data, 0) ? 0.0 : 1.0);
// bit 1, power led
- set_led_status(machine(), 0, BIT(data, 1) ? 0 : 1);
+ machine().output().set_led_value(0, BIT(data, 1) ? 0 : 1);
handle_cd32_joystick_cia(machine(), data, m_cia_0->read(space, 2));
}
diff --git a/src/mame/drivers/ampoker2.cpp b/src/mame/drivers/ampoker2.cpp
index 3092d7f0101..38846ee54b2 100644
--- a/src/mame/drivers/ampoker2.cpp
+++ b/src/mame/drivers/ampoker2.cpp
@@ -479,10 +479,10 @@ WRITE8_MEMBER(ampoker2_state::ampoker2_port31_w)
BIT 4 = TWL_YELL ;Tower Light YELLOW
--------------------------------------------------*/
{
- output_set_lamp_value(1, ((data >> 1) & 1)); /* Lamp 1 - BET/RED */
- output_set_lamp_value(6, ((data >> 2) & 1)); /* Lamp 6 - HOLD 4 */
- output_set_lamp_value(4, ((data >> 3) & 1)); /* Lamp 4 - HOLD 2 */
- output_set_lamp_value(8, ((data >> 4) & 1)); /* Lamp 8 - TWR.YELLOW */
+ machine().output().set_lamp_value(1, ((data >> 1) & 1)); /* Lamp 1 - BET/RED */
+ machine().output().set_lamp_value(6, ((data >> 2) & 1)); /* Lamp 6 - HOLD 4 */
+ machine().output().set_lamp_value(4, ((data >> 3) & 1)); /* Lamp 4 - HOLD 2 */
+ machine().output().set_lamp_value(8, ((data >> 4) & 1)); /* Lamp 8 - TWR.YELLOW */
}
@@ -497,7 +497,7 @@ WRITE8_MEMBER(ampoker2_state::ampoker2_port32_w)
BIT 4 =
--------------------------------------------------*/
{
- output_set_lamp_value(5, ((data >> 3) & 1)); /* Lamp 5 - HOLD 3 */
+ machine().output().set_lamp_value(5, ((data >> 3) & 1)); /* Lamp 5 - HOLD 3 */
}
@@ -526,7 +526,7 @@ WRITE8_MEMBER(ampoker2_state::ampoker2_port34_w)
BIT 4 = LAMP_2 ;Lamp 3 (BLACK)
--------------------------------------------------*/
{
- output_set_lamp_value(2, ((data >> 4) & 1)); /* Lamp 2 - BLACK */
+ machine().output().set_lamp_value(2, ((data >> 4) & 1)); /* Lamp 2 - BLACK */
}
@@ -555,10 +555,10 @@ WRITE8_MEMBER(ampoker2_state::ampoker2_port36_w)
BIT 4 = LAMP_3 ;Lamp 3 (HOLD1)
--------------------------------------------------*/
{
- output_set_lamp_value(9, (data & 1)); /* Lamp 9 - TWR.GREEN */
- output_set_lamp_value(7, ((data >> 2) & 1)); /* Lamp 7 - HOLD 5 */
- output_set_lamp_value(0, ((data >> 3) & 1)); /* Lamp 0 - DEAL */
- output_set_lamp_value(3, ((data >> 4) & 1)); /* Lamp 3 - HOLD 1 */
+ machine().output().set_lamp_value(9, (data & 1)); /* Lamp 9 - TWR.GREEN */
+ machine().output().set_lamp_value(7, ((data >> 2) & 1)); /* Lamp 7 - HOLD 5 */
+ machine().output().set_lamp_value(0, ((data >> 3) & 1)); /* Lamp 0 - DEAL */
+ machine().output().set_lamp_value(3, ((data >> 4) & 1)); /* Lamp 3 - HOLD 1 */
}
diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp
index 502fa6b24a3..4bca0fe9f17 100644
--- a/src/mame/drivers/aristmk4.cpp
+++ b/src/mame/drivers/aristmk4.cpp
@@ -540,8 +540,8 @@ READ8_MEMBER(aristmk4_state::u3_p2)
int u3_p2_ret= ioport("5002")->read();
int u3_p3_ret= ioport("5003")->read();
- output_set_lamp_value(19, (u3_p2_ret >> 4) & 1); //auditkey light
- output_set_lamp_value(20, (u3_p3_ret >> 2) & 1); //jackpotkey light
+ machine().output().set_lamp_value(19, (u3_p2_ret >> 4) & 1); //auditkey light
+ machine().output().set_lamp_value(20, (u3_p3_ret >> 2) & 1); //jackpotkey light
if (m_u3_p0_w&0x20) // DOPTE on
{
@@ -695,10 +695,10 @@ WRITE8_MEMBER(aristmk4_state::mkiv_pia_outb)
switch(i+1)
{
case 4:
- output_set_value("creditspendmeter", emet[i]);
+ machine().output().set_value("creditspendmeter", emet[i]);
break;
case 5:
- output_set_value("creditoutmeter", emet[i]);
+ machine().output().set_value("creditoutmeter", emet[i]);
break;
default:
printf("Unhandled Mechanical meter %d pulse: %02d\n",i+1, emet[i]);
@@ -713,10 +713,10 @@ WRITE8_MEMBER(aristmk4_state::mkiv_pia_outb)
switch(i+1)
{
case 4:
- output_set_value("creditspendmeter", 0);
+ machine().output().set_value("creditspendmeter", 0);
break;
case 5:
- output_set_value("creditoutmeter", 0);
+ machine().output().set_value("creditoutmeter", 0);
break;
default:
break;
@@ -748,7 +748,7 @@ TIMER_CALLBACK_MEMBER(aristmk4_state::coin_input_reset)
TIMER_CALLBACK_MEMBER(aristmk4_state::hopper_reset)
{
m_hopper_motor = 0x01;
- output_set_value("hopper_motor", m_hopper_motor);
+ machine().output().set_value("hopper_motor", m_hopper_motor);
}
// Port A read (SW1)
@@ -808,7 +808,7 @@ READ8_MEMBER(aristmk4_state::via_b_r)
ret=ret^0x40;
machine().scheduler().timer_set(attotime::from_msec(175), timer_expired_delegate(FUNC(aristmk4_state::hopper_reset),this));
m_hopper_motor=0x02;
- output_set_value("hopper_motor", m_hopper_motor);
+ machine().output().set_value("hopper_motor", m_hopper_motor);
break;
case 0x01:
break; //default
@@ -918,42 +918,42 @@ WRITE_LINE_MEMBER(aristmk4_state::via_cb2_w)
else if (m_hopper_motor<0x02)
m_hopper_motor=state;
- output_set_value("hopper_motor", m_hopper_motor); // stop motor
+ machine().output().set_value("hopper_motor", m_hopper_motor); // stop motor
}
// Lamp output
WRITE8_MEMBER(aristmk4_state::pblp_out)
{
- output_set_lamp_value(1, (data) & 1);
- output_set_lamp_value(5, (data >> 1) & 1);
- output_set_lamp_value(9, (data >> 2) & 1);
- output_set_lamp_value(11,(data >> 3) & 1);
- output_set_lamp_value(3, (data >> 4) & 1);
- output_set_lamp_value(4, (data >> 5) & 1);
- output_set_lamp_value(2, (data >> 6) & 1);
- output_set_lamp_value(10,(data >> 7) & 1);
+ machine().output().set_lamp_value(1, (data) & 1);
+ machine().output().set_lamp_value(5, (data >> 1) & 1);
+ machine().output().set_lamp_value(9, (data >> 2) & 1);
+ machine().output().set_lamp_value(11,(data >> 3) & 1);
+ machine().output().set_lamp_value(3, (data >> 4) & 1);
+ machine().output().set_lamp_value(4, (data >> 5) & 1);
+ machine().output().set_lamp_value(2, (data >> 6) & 1);
+ machine().output().set_lamp_value(10,(data >> 7) & 1);
//logerror("Lights port A %02X\n",data);
}
WRITE8_MEMBER(aristmk4_state::pbltlp_out)
{
- output_set_lamp_value(8, (data) & 1);
- output_set_lamp_value(12, (data >> 1) & 1);
- output_set_lamp_value(6, (data >> 2) & 1);
- output_set_lamp_value(7, (data >> 3) & 1);
- output_set_lamp_value(14, (data >> 4) & 1); // light tower
- output_set_lamp_value(15, (data >> 5) & 1); // light tower
- output_set_lamp_value(16, (data >> 6) & 1); // light tower
- output_set_lamp_value(17, (data >> 7) & 1); // light tower
+ machine().output().set_lamp_value(8, (data) & 1);
+ machine().output().set_lamp_value(12, (data >> 1) & 1);
+ machine().output().set_lamp_value(6, (data >> 2) & 1);
+ machine().output().set_lamp_value(7, (data >> 3) & 1);
+ machine().output().set_lamp_value(14, (data >> 4) & 1); // light tower
+ machine().output().set_lamp_value(15, (data >> 5) & 1); // light tower
+ machine().output().set_lamp_value(16, (data >> 6) & 1); // light tower
+ machine().output().set_lamp_value(17, (data >> 7) & 1); // light tower
//logerror("Lights port B: %02X\n",data);
}
WRITE8_MEMBER(aristmk4_state::mlamps)
{
/* TAKE WIN AND GAMBLE LAMPS */
- output_set_lamp_value(18, (data >> 5) & 1);
- output_set_lamp_value(13, (data >> 6) & 1);
+ machine().output().set_lamp_value(18, (data >> 5) & 1);
+ machine().output().set_lamp_value(13, (data >> 6) & 1);
}
WRITE8_MEMBER(aristmk4_state::zn434_w)
diff --git a/src/mame/drivers/asteroid.cpp b/src/mame/drivers/asteroid.cpp
index 6000e75da2c..d4ae1124954 100644
--- a/src/mame/drivers/asteroid.cpp
+++ b/src/mame/drivers/asteroid.cpp
@@ -226,7 +226,7 @@ WRITE8_MEMBER(asteroid_state::llander_led_w)
};
for (int i = 0; i < 5; i++)
- output_set_value(lampname[i], (data >> (4 - i)) & 1);
+ machine().output().set_value(lampname[i], (data >> (4 - i)) & 1);
}
diff --git a/src/mame/drivers/astrcorp.cpp b/src/mame/drivers/astrcorp.cpp
index e542baf282c..0295bf31840 100644
--- a/src/mame/drivers/astrcorp.cpp
+++ b/src/mame/drivers/astrcorp.cpp
@@ -224,17 +224,17 @@ WRITE16_MEMBER(astrocorp_state::showhand_outputs_w)
if (ACCESSING_BITS_0_7)
{
machine().bookkeeping().coin_counter_w(0, (data & 0x0004)); // coin counter
- set_led_status(machine(), 0, (data & 0x0008)); // you win
+ machine().output().set_led_value(0, (data & 0x0008)); // you win
if ((data & 0x0010)) machine().bookkeeping().increment_dispensed_tickets(1); // coin out
- set_led_status(machine(), 1, (data & 0x0020)); // coin/hopper jam
+ machine().output().set_led_value(1, (data & 0x0020)); // coin/hopper jam
}
if (ACCESSING_BITS_8_15)
{
- set_led_status(machine(), 2, (data & 0x0100)); // bet
- set_led_status(machine(), 3, (data & 0x0800)); // start
- set_led_status(machine(), 4, (data & 0x1000)); // ? select/choose
- set_led_status(machine(), 5, (data & 0x2000)); // ? select/choose
- set_led_status(machine(), 6, (data & 0x4000)); // look
+ machine().output().set_led_value(2, (data & 0x0100)); // bet
+ machine().output().set_led_value(3, (data & 0x0800)); // start
+ machine().output().set_led_value(4, (data & 0x1000)); // ? select/choose
+ machine().output().set_led_value(5, (data & 0x2000)); // ? select/choose
+ machine().output().set_led_value(6, (data & 0x4000)); // look
}
// popmessage("%04X",data);
}
@@ -264,18 +264,18 @@ WRITE16_MEMBER(astrocorp_state::skilldrp_outputs_w)
machine().bookkeeping().coin_counter_w(1, (data & 0x0004)); // key out |
machine().device<ticket_dispenser_device>("hopper")->write(space, 0, (data & 0x0008)<<4); // hopper motor?
// (data & 0x0010) // hopper?
- set_led_status(machine(), 0, (data & 0x0020)); // error lamp (coin/hopper jam: "call attendant")
+ machine().output().set_led_value(0, (data & 0x0020)); // error lamp (coin/hopper jam: "call attendant")
machine().device<ticket_dispenser_device>("ticket")->write(space, 0, data & 0x0080); // ticket motor?
}
if (ACCESSING_BITS_8_15)
{
// lamps:
- set_led_status(machine(), 1, (data & 0x0100)); // select
- set_led_status(machine(), 2, (data & 0x0400)); // take
- set_led_status(machine(), 3, (data & 0x0800)); // bet
- set_led_status(machine(), 4, (data & 0x1000)); // start
- set_led_status(machine(), 5, (data & 0x4000)); // win / test
- set_led_status(machine(), 6, (data & 0x8000)); // ticket?
+ machine().output().set_led_value(1, (data & 0x0100)); // select
+ machine().output().set_led_value(2, (data & 0x0400)); // take
+ machine().output().set_led_value(3, (data & 0x0800)); // bet
+ machine().output().set_led_value(4, (data & 0x1000)); // start
+ machine().output().set_led_value(5, (data & 0x4000)); // win / test
+ machine().output().set_led_value(6, (data & 0x8000)); // ticket?
}
// popmessage("%04X",data);
diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp
index 18e73057126..71f8dd0b2f6 100644
--- a/src/mame/drivers/astrocde.cpp
+++ b/src/mame/drivers/astrocde.cpp
@@ -170,13 +170,13 @@ WRITE8_MEMBER(astrocde_state::seawolf2_lamps_w)
/* ------x- torpedo 3 available */
/* -------x torpedo 4 available */
- output_set_lamp_value((offset ^ 1) * 7 + 0, ( data >> 5) & 1); /* 0/7 = hit lamp */
- output_set_lamp_value((offset ^ 1) * 7 + 1, (~data >> 4) & 1); /* 1/8 = reload lamp */
- output_set_lamp_value((offset ^ 1) * 7 + 2, ( data >> 4) & 1); /* 2/9 = ready lamp */
- output_set_lamp_value((offset ^ 1) * 7 + 3, ( data >> 3) & 1); /* 3/10 = torpedo 1 lamp */
- output_set_lamp_value((offset ^ 1) * 7 + 4, ( data >> 2) & 1); /* 4/11 = torpedo 2 lamp */
- output_set_lamp_value((offset ^ 1) * 7 + 5, ( data >> 1) & 1); /* 5/12 = torpedo 3 lamp */
- output_set_lamp_value((offset ^ 1) * 7 + 6, ( data >> 0) & 1); /* 6/13 = torpedo 4 lamp */
+ machine().output().set_lamp_value((offset ^ 1) * 7 + 0, ( data >> 5) & 1); /* 0/7 = hit lamp */
+ machine().output().set_lamp_value((offset ^ 1) * 7 + 1, (~data >> 4) & 1); /* 1/8 = reload lamp */
+ machine().output().set_lamp_value((offset ^ 1) * 7 + 2, ( data >> 4) & 1); /* 2/9 = ready lamp */
+ machine().output().set_lamp_value((offset ^ 1) * 7 + 3, ( data >> 3) & 1); /* 3/10 = torpedo 1 lamp */
+ machine().output().set_lamp_value((offset ^ 1) * 7 + 4, ( data >> 2) & 1); /* 4/11 = torpedo 2 lamp */
+ machine().output().set_lamp_value((offset ^ 1) * 7 + 5, ( data >> 1) & 1); /* 5/12 = torpedo 3 lamp */
+ machine().output().set_lamp_value((offset ^ 1) * 7 + 6, ( data >> 0) & 1); /* 6/13 = torpedo 4 lamp */
}
@@ -330,12 +330,12 @@ READ8_MEMBER(astrocde_state::gorf_io_2_r)
switch ((offset >> 9) & 7)
{
- case 0: output_set_lamp_value(0, data); break;
- case 1: output_set_lamp_value(1, data); break;
- case 2: output_set_lamp_value(2, data); break;
- case 3: output_set_lamp_value(3, data); break;
- case 4: output_set_lamp_value(4, data); break;
- case 5: output_set_lamp_value(5, data); break;
+ case 0: machine().output().set_lamp_value(0, data); break;
+ case 1: machine().output().set_lamp_value(1, data); break;
+ case 2: machine().output().set_lamp_value(2, data); break;
+ case 3: machine().output().set_lamp_value(3, data); break;
+ case 4: machine().output().set_lamp_value(4, data); break;
+ case 5: machine().output().set_lamp_value(5, data); break;
case 6: /* n/c */ break;
case 7: osd_printf_debug("io_2:%d\n", data); break;
}
@@ -359,8 +359,8 @@ READ8_MEMBER(astrocde_state::robby_io_r)
case 0: machine().bookkeeping().coin_counter_w(0, data); break;
case 1: machine().bookkeeping().coin_counter_w(1, data); break;
case 2: machine().bookkeeping().coin_counter_w(2, data); break;
- case 6: set_led_status(machine(), 0, data); break;
- case 7: set_led_status(machine(), 1, data); break;
+ case 6: machine().output().set_led_value(0, data); break;
+ case 7: machine().output().set_led_value(1, data); break;
}
return 0xff;
}
@@ -377,20 +377,20 @@ READ8_MEMBER(astrocde_state::profpac_io_1_r)
{
machine().bookkeeping().coin_counter_w(0, (offset >> 8) & 1);
machine().bookkeeping().coin_counter_w(1, (offset >> 9) & 1);
- set_led_status(machine(), 0, (offset >> 10) & 1);
- set_led_status(machine(), 1, (offset >> 11) & 1);
+ machine().output().set_led_value(0, (offset >> 10) & 1);
+ machine().output().set_led_value(1, (offset >> 11) & 1);
return 0xff;
}
READ8_MEMBER(astrocde_state::profpac_io_2_r)
{
- output_set_lamp_value(0, (offset >> 8) & 1); /* left lamp A */
- output_set_lamp_value(1, (offset >> 9) & 1); /* left lamp B */
- output_set_lamp_value(2, (offset >> 10) & 1); /* left lamp C */
- output_set_lamp_value(3, (offset >> 12) & 1); /* right lamp A */
- output_set_lamp_value(4, (offset >> 13) & 1); /* right lamp B */
- output_set_lamp_value(5, (offset >> 14) & 1); /* right lamp C */
+ machine().output().set_lamp_value(0, (offset >> 8) & 1); /* left lamp A */
+ machine().output().set_lamp_value(1, (offset >> 9) & 1); /* left lamp B */
+ machine().output().set_lamp_value(2, (offset >> 10) & 1); /* left lamp C */
+ machine().output().set_lamp_value(3, (offset >> 12) & 1); /* right lamp A */
+ machine().output().set_lamp_value(4, (offset >> 13) & 1); /* right lamp B */
+ machine().output().set_lamp_value(5, (offset >> 14) & 1); /* right lamp C */
return 0xff;
}
@@ -431,8 +431,8 @@ READ8_MEMBER(astrocde_state::demndrgn_io_r)
{
machine().bookkeeping().coin_counter_w(0, (offset >> 8) & 1);
machine().bookkeeping().coin_counter_w(1, (offset >> 9) & 1);
- set_led_status(machine(), 0, (offset >> 10) & 1);
- set_led_status(machine(), 1, (offset >> 11) & 1);
+ machine().output().set_led_value(0, (offset >> 10) & 1);
+ machine().output().set_led_value(1, (offset >> 11) & 1);
m_input_select = (offset >> 12) & 1;
return 0xff;
}
@@ -472,19 +472,19 @@ WRITE8_MEMBER(astrocde_state::tenpindx_lamp_w)
/* lamps */
if (offset == 0)
{
- output_set_lamp_value(0, (data >> 2) & 1);
- output_set_lamp_value(1, (data >> 3) & 1);
- output_set_lamp_value(2, (data >> 4) & 1);
- output_set_lamp_value(3, (data >> 5) & 1);
- output_set_lamp_value(4, (data >> 6) & 1);
- output_set_lamp_value(5, (data >> 7) & 1);
+ machine().output().set_lamp_value(0, (data >> 2) & 1);
+ machine().output().set_lamp_value(1, (data >> 3) & 1);
+ machine().output().set_lamp_value(2, (data >> 4) & 1);
+ machine().output().set_lamp_value(3, (data >> 5) & 1);
+ machine().output().set_lamp_value(4, (data >> 6) & 1);
+ machine().output().set_lamp_value(5, (data >> 7) & 1);
}
else
{
- output_set_lamp_value(6, (data >> 0) & 1);
- output_set_lamp_value(7, (data >> 1) & 1);
- output_set_lamp_value(8, (data >> 2) & 1);
- output_set_lamp_value(9, (data >> 3) & 1);
+ machine().output().set_lamp_value(6, (data >> 0) & 1);
+ machine().output().set_lamp_value(7, (data >> 1) & 1);
+ machine().output().set_lamp_value(8, (data >> 2) & 1);
+ machine().output().set_lamp_value(9, (data >> 3) & 1);
}
}
@@ -501,15 +501,15 @@ WRITE8_MEMBER(astrocde_state::tenpindx_lights_w)
/* "flashlights" */
int which = data >> 4;
- output_set_lamp_value(10, (which == 1));
- output_set_lamp_value(11, (which == 2));
- output_set_lamp_value(12, (which == 3));
- output_set_lamp_value(13, (which == 4));
- output_set_lamp_value(14, (which == 5));
- output_set_lamp_value(15, (which == 6));
- output_set_lamp_value(16, (which == 7));
- output_set_lamp_value(17, (which == 8));
- output_set_lamp_value(18, (which == 9));
+ machine().output().set_lamp_value(10, (which == 1));
+ machine().output().set_lamp_value(11, (which == 2));
+ machine().output().set_lamp_value(12, (which == 3));
+ machine().output().set_lamp_value(13, (which == 4));
+ machine().output().set_lamp_value(14, (which == 5));
+ machine().output().set_lamp_value(15, (which == 6));
+ machine().output().set_lamp_value(16, (which == 7));
+ machine().output().set_lamp_value(17, (which == 8));
+ machine().output().set_lamp_value(18, (which == 9));
}
diff --git a/src/mame/drivers/atari_s1.cpp b/src/mame/drivers/atari_s1.cpp
index 69439f81b12..f0a181f24e0 100644
--- a/src/mame/drivers/atari_s1.cpp
+++ b/src/mame/drivers/atari_s1.cpp
@@ -372,13 +372,13 @@ TIMER_DEVICE_CALLBACK_MEMBER( atari_s1_state::nmi )
// Player number
char wordnum[8];
sprintf(wordnum,"text%d",m_out_offs>>2);
- output_set_value(wordnum, !BIT(patterns[m_p_ram[m_out_offs]&15], 6)); // uses 'g' segment
+ machine().output().set_value(wordnum, !BIT(patterns[m_p_ram[m_out_offs]&15], 6)); // uses 'g' segment
}
else
{
// Digits
- output_set_digit_value(m_out_offs << 1, patterns[m_p_ram[m_out_offs]>>4]);
- output_set_digit_value((m_out_offs << 1)+1, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(m_out_offs << 1, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value((m_out_offs << 1)+1, patterns[m_p_ram[m_out_offs]&15]);
}
}
diff --git a/src/mame/drivers/atari_s2.cpp b/src/mame/drivers/atari_s2.cpp
index 71b2c5035f4..79a4be2b3cb 100644
--- a/src/mame/drivers/atari_s2.cpp
+++ b/src/mame/drivers/atari_s2.cpp
@@ -350,7 +350,7 @@ WRITE8_MEMBER( atari_s2_state::display_w )
{
data &= 7;
for (UINT8 i = 0; i < 7; i++)
- output_set_digit_value(i * 10 + data, m_segment[i]);
+ machine().output().set_digit_value(i * 10 + data, m_segment[i]);
}
}
diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp
index 053d68c4b61..9cd68458f2f 100644
--- a/src/mame/drivers/atarist.cpp
+++ b/src/mame/drivers/atarist.cpp
@@ -623,7 +623,7 @@ WRITE8_MEMBER( st_state::ikbd_port3_w )
*/
// caps lock led
- set_led_status(machine(), 1, BIT(data, 0));
+ machine().output().set_led_value(1, BIT(data, 0));
// keyboard row select
m_ikbd_keylatch = (m_ikbd_keylatch & 0xff00) | data;
diff --git a/src/mame/drivers/atarisy1.cpp b/src/mame/drivers/atarisy1.cpp
index 0d674b89268..81f2e7c1313 100644
--- a/src/mame/drivers/atarisy1.cpp
+++ b/src/mame/drivers/atarisy1.cpp
@@ -415,7 +415,7 @@ READ8_MEMBER(atarisy1_state::via_pb_r)
WRITE8_MEMBER(atarisy1_state::led_w)
{
- set_led_status(machine(), offset, ~data & 1);
+ machine().output().set_led_value(offset, ~data & 1);
}
diff --git a/src/mame/drivers/atarisy2.cpp b/src/mame/drivers/atarisy2.cpp
index 8bf4d0e3216..5013f11da5d 100644
--- a/src/mame/drivers/atarisy2.cpp
+++ b/src/mame/drivers/atarisy2.cpp
@@ -338,8 +338,8 @@ READ8_MEMBER(atarisy2_state::switch_6502_r)
WRITE8_MEMBER(atarisy2_state::switch_6502_w)
{
- set_led_status(machine(), 0, data & 0x04);
- set_led_status(machine(), 1, data & 0x08);
+ machine().output().set_led_value(0, data & 0x04);
+ machine().output().set_led_value(1, data & 0x08);
if (m_has_tms5220)
{
data = 12 | ((data >> 5) & 1);
diff --git a/src/mame/drivers/avalnche.cpp b/src/mame/drivers/avalnche.cpp
index aed559b2b7d..cba018b5abb 100644
--- a/src/mame/drivers/avalnche.cpp
+++ b/src/mame/drivers/avalnche.cpp
@@ -97,17 +97,17 @@ WRITE8_MEMBER(avalnche_state::catch_coin_counter_w)
WRITE8_MEMBER(avalnche_state::avalance_credit_1_lamp_w)
{
- set_led_status(machine(), 0, data & 1);
+ machine().output().set_led_value(0, data & 1);
}
WRITE8_MEMBER(avalnche_state::avalance_credit_2_lamp_w)
{
- set_led_status(machine(), 1, data & 1);
+ machine().output().set_led_value(1, data & 1);
}
WRITE8_MEMBER(avalnche_state::avalance_start_lamp_w)
{
- set_led_status(machine(), 2, data & 1);
+ machine().output().set_led_value(2, data & 1);
}
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, avalnche_state )
diff --git a/src/mame/drivers/babbage.cpp b/src/mame/drivers/babbage.cpp
index 8812456ac39..33accaaf998 100644
--- a/src/mame/drivers/babbage.cpp
+++ b/src/mame/drivers/babbage.cpp
@@ -161,7 +161,7 @@ WRITE8_MEMBER( babbage_state::pio1_b_w )
for (int i = 0; i < 8; i++)
{
sprintf(ledname,"led%d",i);
- output_set_value(ledname, BIT(data, i));
+ machine().output().set_value(ledname, BIT(data, i));
}
}
@@ -182,7 +182,7 @@ WRITE8_MEMBER( babbage_state::pio2_b_w )
m_step = true;
}
else
- output_set_digit_value(data, m_segment);
+ machine().output().set_digit_value(data, m_segment);
}
static const z80_daisy_config babbage_daisy_chain[] =
diff --git a/src/mame/drivers/baraduke.cpp b/src/mame/drivers/baraduke.cpp
index 16ff40e3e88..c2912159596 100644
--- a/src/mame/drivers/baraduke.cpp
+++ b/src/mame/drivers/baraduke.cpp
@@ -150,8 +150,8 @@ READ8_MEMBER(baraduke_state::inputport_r)
WRITE8_MEMBER(baraduke_state::baraduke_lamps_w)
{
- set_led_status(machine(), 0,data & 0x08);
- set_led_status(machine(), 1,data & 0x10);
+ machine().output().set_led_value(0,data & 0x08);
+ machine().output().set_led_value(1,data & 0x10);
}
WRITE8_MEMBER(baraduke_state::baraduke_irq_ack_w)
diff --git a/src/mame/drivers/barata.cpp b/src/mame/drivers/barata.cpp
index 0953db8959d..a3484b9c81b 100644
--- a/src/mame/drivers/barata.cpp
+++ b/src/mame/drivers/barata.cpp
@@ -53,6 +53,8 @@ public:
DECLARE_WRITE8_MEMBER(port0_w);
DECLARE_WRITE8_MEMBER(port2_w);
DECLARE_READ8_MEMBER(port2_r);
+ void fpga_send(unsigned char cmd);
+
required_device<cpu_device> m_maincpu;
required_device<dac_device> m_dac;
private:
@@ -153,26 +155,27 @@ const char* mode_strings[] = {
"Set counter values"
};
-static void fpga_send(device_t *device, unsigned char cmd){
+void barata_state::fpga_send(unsigned char cmd)
+{
static unsigned char byte = 0;
static unsigned char mode = FPGA_WAITING_FOR_NEW_CMD;
static unsigned char lamp_data = 0;
- device->logerror("FPGA CMD: %d\n", cmd);
+ logerror("FPGA CMD: %d\n", cmd);
if (mode == FPGA_WAITING_FOR_NEW_CMD){
if (cmd < FPGA_WAITING_FOR_NEW_CMD){
mode = cmd;
byte=1;
- device->logerror("SET FPGA MODE: %s\n", mode_strings[mode]);
+ logerror("SET FPGA MODE: %s\n", mode_strings[mode]);
if (mode == FPGA_PLAY_BGM){
- device->logerror("PLAY_BGM.\n");
+ logerror("PLAY_BGM.\n");
mode = FPGA_WAITING_FOR_NEW_CMD;
}
if (mode == FPGA_STOP_BGM){
- device->logerror("STOP_BGM.\n");
+ logerror("STOP_BGM.\n");
mode = FPGA_WAITING_FOR_NEW_CMD;
}
}
@@ -195,10 +198,10 @@ static void fpga_send(device_t *device, unsigned char cmd){
if (erase_all){
// logerror("LED: ERASE ALL\n");
for (int i=0; i<16; i++){
- output_set_led_value(i, 1);
+ machine().output().set_led_value(i, 1);
}
} else {
- output_set_led_value(lamp_index, state ? 0 : 1);
+ machine().output().set_led_value(lamp_index, state ? 0 : 1);
}
default:
mode = FPGA_WAITING_FOR_NEW_CMD;
@@ -226,11 +229,11 @@ static void fpga_send(device_t *device, unsigned char cmd){
counter_data = (counter_data << 3) | cmd;
if (counter_state){
- output_set_digit_value(2*counter_bank, 0);
- output_set_digit_value(2*counter_bank+1, 0);
+ machine().output().set_digit_value(2*counter_bank, 0);
+ machine().output().set_digit_value(2*counter_bank+1, 0);
} else {
- output_set_digit_value(2*counter_bank, dec_7seg(counter_data/10));
- output_set_digit_value(2*counter_bank+1, dec_7seg(counter_data%10));
+ machine().output().set_digit_value(2*counter_bank, dec_7seg(counter_data/10));
+ machine().output().set_digit_value(2*counter_bank+1, dec_7seg(counter_data%10));
}
default:
mode = FPGA_WAITING_FOR_NEW_CMD;
@@ -248,7 +251,7 @@ static void fpga_send(device_t *device, unsigned char cmd){
break;
case 2:
sample_index = (sample_index << 3) | cmd;
- device->logerror("PLAY_SAMPLE #%d.\n", sample_index);
+ logerror("PLAY_SAMPLE #%d.\n", sample_index);
default:
mode = FPGA_WAITING_FOR_NEW_CMD;
break;
@@ -263,7 +266,7 @@ WRITE8_MEMBER(barata_state::fpga_w)
static unsigned char old_data = 0;
if (!BIT(old_data, 5) && BIT(data, 5)){
//process the command sent to the FPGA
- fpga_send(this, (data >> 2) & 7);
+ fpga_send((data >> 2) & 7);
}
old_data = data;
}
diff --git a/src/mame/drivers/bbusters.cpp b/src/mame/drivers/bbusters.cpp
index f3cde4a2359..5830aadfad4 100644
--- a/src/mame/drivers/bbusters.cpp
+++ b/src/mame/drivers/bbusters.cpp
@@ -292,15 +292,15 @@ WRITE16_MEMBER(bbusters_state::gun_select_w)
WRITE16_MEMBER(bbusters_state::two_gun_output_w)
{
- output_set_value("Player1_Gun_Recoil",(data & 0x01));
- output_set_value("Player2_Gun_Recoil",(data & 0x02)>>1);
+ machine().output().set_value("Player1_Gun_Recoil",(data & 0x01));
+ machine().output().set_value("Player2_Gun_Recoil",(data & 0x02)>>1);
}
WRITE16_MEMBER(bbusters_state::three_gun_output_w)
{
- output_set_value("Player1_Gun_Recoil",(data & 0x01));
- output_set_value("Player2_Gun_Recoil",(data & 0x02)>>1);
- output_set_value("Player3_Gun_Recoil",(data & 0x04)>>2);
+ machine().output().set_value("Player1_Gun_Recoil",(data & 0x01));
+ machine().output().set_value("Player2_Gun_Recoil",(data & 0x02)>>1);
+ machine().output().set_value("Player3_Gun_Recoil",(data & 0x04)>>2);
}
READ16_MEMBER(bbusters_state::kludge_r)
diff --git a/src/mame/drivers/berzerk.cpp b/src/mame/drivers/berzerk.cpp
index 81d28ee6c4c..6c04fc832a2 100644
--- a/src/mame/drivers/berzerk.cpp
+++ b/src/mame/drivers/berzerk.cpp
@@ -124,7 +124,7 @@ static const UINT8 nmi_trigger_v256s [NMIS_PER_FRAME] = { 0x00, 0x00, 0x00, 0x00
READ8_MEMBER(berzerk_state::led_on_r)
{
- set_led_status(machine(), 0, 1);
+ machine().output().set_led_value(0, 1);
return 0;
}
@@ -132,13 +132,13 @@ READ8_MEMBER(berzerk_state::led_on_r)
WRITE8_MEMBER(berzerk_state::led_on_w)
{
- set_led_status(machine(), 0, 1);
+ machine().output().set_led_value(0, 1);
}
READ8_MEMBER(berzerk_state::led_off_r)
{
- set_led_status(machine(), 0, 0);
+ machine().output().set_led_value(0, 0);
return 0;
}
@@ -146,7 +146,7 @@ READ8_MEMBER(berzerk_state::led_off_r)
WRITE8_MEMBER(berzerk_state::led_off_w)
{
- set_led_status(machine(), 0, 0);
+ machine().output().set_led_value(0, 0);
}
@@ -355,7 +355,7 @@ void berzerk_state::machine_reset()
{
m_irq_enabled = 0;
m_nmi_enabled = 0;
- set_led_status(machine(), 0, 0);
+ machine().output().set_led_value(0, 0);
m_magicram_control = 0;
start_irq_timer();
diff --git a/src/mame/drivers/beta.cpp b/src/mame/drivers/beta.cpp
index 89e0f7209d6..48504cb85bc 100644
--- a/src/mame/drivers/beta.cpp
+++ b/src/mame/drivers/beta.cpp
@@ -155,7 +155,7 @@ TIMER_CALLBACK_MEMBER(beta_state::led_refresh)
{
if (m_ls145_p < 6)
{
- output_set_digit_value(m_ls145_p, m_segment);
+ machine().output().set_digit_value(m_ls145_p, m_segment);
}
}
@@ -253,10 +253,10 @@ WRITE8_MEMBER( beta_state::riot_pb_w )
m_speaker->level_w(!BIT(data, 4));
/* address led */
- output_set_led_value(0, BIT(data, 5));
+ machine().output().set_led_value(0, BIT(data, 5));
/* data led */
- output_set_led_value(1, !BIT(data, 5));
+ machine().output().set_led_value(1, !BIT(data, 5));
/* EPROM address shift */
if (!BIT(m_old_data, 5) && BIT(data, 5))
diff --git a/src/mame/drivers/bfm_sc1.cpp b/src/mame/drivers/bfm_sc1.cpp
index 4b0e084f452..8e4deae0b95 100644
--- a/src/mame/drivers/bfm_sc1.cpp
+++ b/src/mame/drivers/bfm_sc1.cpp
@@ -297,8 +297,8 @@ WRITE8_MEMBER(bfm_sc1_state::reel12_w)
m_reel0->update((data>>4)&0x0f);
m_reel1->update( data &0x0f);
}
- awp_draw_reel("reel1", m_reel0);
- awp_draw_reel("reel2", m_reel1);
+ awp_draw_reel(machine(),"reel1", m_reel0);
+ awp_draw_reel(machine(),"reel2", m_reel1);
}
///////////////////////////////////////////////////////////////////////////
@@ -314,8 +314,8 @@ WRITE8_MEMBER(bfm_sc1_state::reel34_w)
m_reel2->update((data>>4)&0x0f);
m_reel3->update( data &0x0f);
}
- awp_draw_reel("reel3", m_reel2);
- awp_draw_reel("reel4", m_reel3);
+ awp_draw_reel(machine(),"reel3", m_reel2);
+ awp_draw_reel(machine(),"reel4", m_reel3);
}
///////////////////////////////////////////////////////////////////////////
@@ -325,8 +325,8 @@ WRITE8_MEMBER(bfm_sc1_state::reel56_w)
m_reel4->update((data>>4)&0x0f);
m_reel5->update( data &0x0f);
- awp_draw_reel("reel5", m_reel4);
- awp_draw_reel("reel6", m_reel5);
+ awp_draw_reel(machine(),"reel5", m_reel4);
+ awp_draw_reel(machine(),"reel6", m_reel5);
}
///////////////////////////////////////////////////////////////////////////
@@ -459,8 +459,8 @@ WRITE8_MEMBER(bfm_sc1_state::mux1latch_w)
for ( i = 0; i < 8; i++ )
{
- output_set_lamp_value(BFM_strcnv[offset ], (m_mux1_datalo & pattern?1:0) );
- output_set_lamp_value(BFM_strcnv[offset+8], (m_mux1_datahi & pattern?1:0) );
+ machine().output().set_lamp_value(BFM_strcnv[offset ], (m_mux1_datalo & pattern?1:0) );
+ machine().output().set_lamp_value(BFM_strcnv[offset+8], (m_mux1_datahi & pattern?1:0) );
pattern<<=1;
offset++;
}
@@ -532,8 +532,8 @@ WRITE8_MEMBER(bfm_sc1_state::mux2latch_w)
for ( i = 0; i < 8; i++ )
{
- output_set_lamp_value(BFM_strcnv[offset ], (m_mux2_datalo & pattern?1:0) );
- output_set_lamp_value(BFM_strcnv[offset+8], (m_mux2_datahi & pattern?1:0) );
+ machine().output().set_lamp_value(BFM_strcnv[offset ], (m_mux2_datalo & pattern?1:0) );
+ machine().output().set_lamp_value(BFM_strcnv[offset+8], (m_mux2_datahi & pattern?1:0) );
pattern<<=1;
offset++;
}
diff --git a/src/mame/drivers/bfm_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp
index 0e35eb6e90c..32a0725d256 100644
--- a/src/mame/drivers/bfm_sc2.cpp
+++ b/src/mame/drivers/bfm_sc2.cpp
@@ -554,8 +554,8 @@ WRITE8_MEMBER(bfm_sc2_state::reel12_w)
m_reel0->update( data &0x0f);
m_reel1->update((data>>4)&0x0f);
- awp_draw_reel("reel1", m_reel0);
- awp_draw_reel("reel2", m_reel1);
+ awp_draw_reel(machine(),"reel1", m_reel0);
+ awp_draw_reel(machine(),"reel2", m_reel1);
}
WRITE8_MEMBER(bfm_sc2_state::reel34_w)
@@ -565,8 +565,8 @@ WRITE8_MEMBER(bfm_sc2_state::reel34_w)
m_reel2->update( data &0x0f);
m_reel3->update((data>>4)&0x0f);
- awp_draw_reel("reel3", m_reel2);
- awp_draw_reel("reel4", m_reel3);
+ awp_draw_reel(machine(),"reel3", m_reel2);
+ awp_draw_reel(machine(),"reel4", m_reel3);
}
///////////////////////////////////////////////////////////////////////////
@@ -578,8 +578,8 @@ WRITE8_MEMBER(bfm_sc2_state::reel56_w)
m_reel4->update( data &0x0f);
m_reel5->update((data>>4)&0x0f);
- awp_draw_reel("reel5", m_reel4);
- awp_draw_reel("reel6", m_reel5);
+ awp_draw_reel(machine(),"reel5", m_reel4);
+ awp_draw_reel(machine(),"reel6", m_reel5);
}
@@ -617,7 +617,7 @@ WRITE8_MEMBER(bfm_sc2_state::mux_output_w)
int off = offset<<3;
for (i=0; i<8; i++)
- output_set_lamp_value(off+i, ((data & (1 << i)) != 0));
+ machine().output().set_lamp_value(off+i, ((data & (1 << i)) != 0));
}
diff --git a/src/mame/drivers/bfm_sc4h.cpp b/src/mame/drivers/bfm_sc4h.cpp
index 4a52131e01a..18cc3d4a765 100644
--- a/src/mame/drivers/bfm_sc4h.cpp
+++ b/src/mame/drivers/bfm_sc4h.cpp
@@ -255,10 +255,10 @@ WRITE8_MEMBER(bfm_sc45_state::mux_output_w)
int off = offset<<3;
for (i=0; i<8; i++)
- output_set_lamp_value(off+i, ((data & (1 << i)) != 0));
+ machine().output().set_lamp_value(off+i, ((data & (1 << i)) != 0));
- output_set_indexed_value("matrix", off+i, ((data & (1 << i)) != 0));
+ machine().output().set_indexed_value("matrix", off+i, ((data & (1 << i)) != 0));
}
WRITE8_MEMBER(bfm_sc45_state::mux_output2_w)
@@ -269,14 +269,14 @@ WRITE8_MEMBER(bfm_sc45_state::mux_output2_w)
// some games use this as a matrix port (luckb etc.)
for (i=0; i<8; i++)
{
- output_set_indexed_value("matrix", off+i, ((data & (1 << i)) != 0));
+ machine().output().set_indexed_value("matrix", off+i, ((data & (1 << i)) != 0));
}
// others drive 7-segs with it.. so rendering it there as well in our debug layouts
// todo: reorder properly!
UINT8 bf7segdata = BITSWAP8(data,7,6,5,4,3,2,1,0);
- output_set_digit_value(offset, bf7segdata);
+ machine().output().set_digit_value(offset, bf7segdata);
}
WRITE16_MEMBER(sc4_state::sc4_mem_w)
@@ -518,13 +518,13 @@ void sc4_state::bfm_sc4_68307_porta_w(address_space &space, bool dedicated, UINT
if(m_reel1)
{
m_reel1->update( data &0x0f);
- awp_draw_reel("reel1", m_reel1);
+ awp_draw_reel(machine(),"reel1", m_reel1);
}
if (m_reel2)
{
m_reel2->update((data>>4)&0x0f);
- awp_draw_reel("reel2", m_reel2);
+ awp_draw_reel(machine(),"reel2", m_reel2);
}
}
@@ -535,7 +535,7 @@ WRITE8_MEMBER( sc4_state::bfm_sc4_reel3_w )
if(m_reel3)
{
m_reel3->update( data &0x0f);
- awp_draw_reel("reel3", m_reel3);
+ awp_draw_reel(machine(),"reel3", m_reel3);
}
}
@@ -546,7 +546,7 @@ WRITE8_MEMBER( sc4_state::bfm_sc4_reel4_w )
if(m_reel4)
{
m_reel4->update( data &0x0f);
- awp_draw_reel("reel4", m_reel4);
+ awp_draw_reel(machine(),"reel4", m_reel4);
}
}
@@ -640,13 +640,13 @@ WRITE8_MEMBER(sc4_state::bfm_sc4_duart_output_w)
if(m_reel5)
{
m_reel5->update( data &0x0f);
- awp_draw_reel("reel5", m_reel5);
+ awp_draw_reel(machine(),"reel5", m_reel5);
}
if (m_reel6)
{
m_reel6->update((data>>4)&0x0f);
- awp_draw_reel("reel6", m_reel6);
+ awp_draw_reel(machine(),"reel6", m_reel6);
}
}
diff --git a/src/mame/drivers/bfmsys85.cpp b/src/mame/drivers/bfmsys85.cpp
index 32b7922402b..48baa09c548 100644
--- a/src/mame/drivers/bfmsys85.cpp
+++ b/src/mame/drivers/bfmsys85.cpp
@@ -211,8 +211,8 @@ WRITE8_MEMBER(bfmsys85_state::reel12_w)
m_reel0->update((data>>4)&0x0f);
m_reel1->update( data &0x0f);
- awp_draw_reel("reel1", m_reel0);
- awp_draw_reel("reel2", m_reel1);
+ awp_draw_reel(machine(),"reel1", m_reel0);
+ awp_draw_reel(machine(),"reel2", m_reel1);
}
///////////////////////////////////////////////////////////////////////////
@@ -222,8 +222,8 @@ WRITE8_MEMBER(bfmsys85_state::reel34_w)
m_reel2->update((data>>4)&0x0f);
m_reel3->update( data &0x0f);
- awp_draw_reel("reel3", m_reel2);
- awp_draw_reel("reel4", m_reel3);
+ awp_draw_reel(machine(),"reel3", m_reel2);
+ awp_draw_reel(machine(),"reel4", m_reel3);
}
///////////////////////////////////////////////////////////////////////////
@@ -312,7 +312,7 @@ WRITE8_MEMBER(bfmsys85_state::mux_data_w)
for ( i = 0; i < 8; i++ )
{
- output_set_lamp_value(off, (data & pattern ? 1 : 0));
+ machine().output().set_lamp_value(off, (data & pattern ? 1 : 0));
pattern <<= 1;
off++;
}
diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp
index 9b24bc3340d..8b1ee26cf5d 100644
--- a/src/mame/drivers/bladestl.cpp
+++ b/src/mame/drivers/bladestl.cpp
@@ -69,8 +69,8 @@ WRITE8_MEMBER(bladestl_state::bladestl_bankswitch_w)
machine().bookkeeping().coin_counter_w(1,data & 0x02);
/* bits 2 & 3 = lamps */
- set_led_status(machine(), 0,data & 0x04);
- set_led_status(machine(), 1,data & 0x08);
+ machine().output().set_led_value(0,data & 0x04);
+ machine().output().set_led_value(1,data & 0x08);
/* bit 4 = relay (???) */
diff --git a/src/mame/drivers/blitz.cpp b/src/mame/drivers/blitz.cpp
index fc14d4c0c70..c30bde4a282 100644
--- a/src/mame/drivers/blitz.cpp
+++ b/src/mame/drivers/blitz.cpp
@@ -419,11 +419,11 @@ WRITE8_MEMBER(blitz_state::mux_w)
WRITE8_MEMBER(blitz_state::lamps_a_w)
{
-// output_set_lamp_value(0, 1 - ((data) & 1)); /* Lamp 0 */
-// output_set_lamp_value(1, 1 - ((data >> 1) & 1)); /* Lamp 1 */
-// output_set_lamp_value(2, 1 - ((data >> 2) & 1)); /* Lamp 2 */
-// output_set_lamp_value(3, 1 - ((data >> 3) & 1)); /* Lamp 3 */
-// output_set_lamp_value(4, 1 - ((data >> 4) & 1)); /* Lamp 4 */
+// machine().output().set_lamp_value(0, 1 - ((data) & 1)); /* Lamp 0 */
+// machine().output().set_lamp_value(1, 1 - ((data >> 1) & 1)); /* Lamp 1 */
+// machine().output().set_lamp_value(2, 1 - ((data >> 2) & 1)); /* Lamp 2 */
+// machine().output().set_lamp_value(3, 1 - ((data >> 3) & 1)); /* Lamp 3 */
+// machine().output().set_lamp_value(4, 1 - ((data >> 4) & 1)); /* Lamp 4 */
// popmessage("written : %02X", data);
// machine().bookkeeping().coin_counter_w(0, data & 0x40); /* counter1 */
diff --git a/src/mame/drivers/blitz68k.cpp b/src/mame/drivers/blitz68k.cpp
index 7130e2ae742..e794f58bf7e 100644
--- a/src/mame/drivers/blitz68k.cpp
+++ b/src/mame/drivers/blitz68k.cpp
@@ -843,13 +843,13 @@ WRITE16_MEMBER(blitz68k_state::cjffruit_leds1_w)
if (ACCESSING_BITS_8_15)
{
machine().bookkeeping().coin_counter_w(0, data & 0x0100); // coin in
- set_led_status(machine(), 0, data & 0x0200); // win???
+ machine().output().set_led_value(0, data & 0x0200); // win???
// 1 data & 0x0400 // win???
- set_led_status(machine(), 2, data & 0x0800); // small
- set_led_status(machine(), 3, data & 0x1000); // big
- set_led_status(machine(), 4, data & 0x2000); // take
- set_led_status(machine(), 5, data & 0x4000); // double up
- set_led_status(machine(), 6, data & 0x8000); // cancel
+ machine().output().set_led_value(2, data & 0x0800); // small
+ machine().output().set_led_value(3, data & 0x1000); // big
+ machine().output().set_led_value(4, data & 0x2000); // take
+ machine().output().set_led_value(5, data & 0x4000); // double up
+ machine().output().set_led_value(6, data & 0x8000); // cancel
show_leds123();
}
}
@@ -859,14 +859,14 @@ WRITE16_MEMBER(blitz68k_state::cjffruit_leds2_w)
data = COMBINE_DATA(m_leds1);
if (ACCESSING_BITS_8_15)
{
- set_led_status(machine(), 7, data & 0x0100); // start
- set_led_status(machine(), 8, data & 0x0200); // bet
- set_led_status(machine(), 9, data & 0x0400); // hold 5
- set_led_status(machine(), 10, data & 0x0800); // hold 4
- set_led_status(machine(), 11, data & 0x1000); // hold 3
- set_led_status(machine(), 12, data & 0x2000); // hold 2
- set_led_status(machine(), 13, data & 0x4000); // collect
- set_led_status(machine(), 14, data & 0x8000); // call attendant
+ machine().output().set_led_value( 7, data & 0x0100); // start
+ machine().output().set_led_value( 8, data & 0x0200); // bet
+ machine().output().set_led_value( 9, data & 0x0400); // hold 5
+ machine().output().set_led_value(10, data & 0x0800); // hold 4
+ machine().output().set_led_value(11, data & 0x1000); // hold 3
+ machine().output().set_led_value(12, data & 0x2000); // hold 2
+ machine().output().set_led_value(13, data & 0x4000); // collect
+ machine().output().set_led_value(14, data & 0x8000); // call attendant
show_leds123();
}
}
@@ -876,8 +876,8 @@ WRITE16_MEMBER(blitz68k_state::cjffruit_leds3_w)
data = COMBINE_DATA(m_leds2);
if (ACCESSING_BITS_8_15)
{
- set_led_status(machine(), 15, data & 0x0100); // hopper coins?
- set_led_status(machine(), 16, data & 0x0400); // coin out?
+ machine().output().set_led_value(15, data & 0x0100); // hopper coins?
+ machine().output().set_led_value(16, data & 0x0400); // coin out?
show_leds123();
}
}
@@ -983,13 +983,13 @@ WRITE16_MEMBER(blitz68k_state::deucesw2_leds1_w)
if (ACCESSING_BITS_8_15)
{
machine().bookkeeping().coin_counter_w(0, data & 0x0100); // coin in
- set_led_status(machine(), 0, data & 0x0200); // win???
+ machine().output().set_led_value(0, data & 0x0200); // win???
// 1 data & 0x0400 // win???
- set_led_status(machine(), 2, data & 0x0800); // small
- set_led_status(machine(), 3, data & 0x1000); // big
- set_led_status(machine(), 4, data & 0x2000); // take
- set_led_status(machine(), 5, data & 0x4000); // double up
- set_led_status(machine(), 6, data & 0x8000); // cancel
+ machine().output().set_led_value(2, data & 0x0800); // small
+ machine().output().set_led_value(3, data & 0x1000); // big
+ machine().output().set_led_value(4, data & 0x2000); // take
+ machine().output().set_led_value(5, data & 0x4000); // double up
+ machine().output().set_led_value(6, data & 0x8000); // cancel
show_leds123();
}
}
@@ -999,14 +999,14 @@ WRITE16_MEMBER(blitz68k_state::deucesw2_leds2_w)
data = COMBINE_DATA(m_leds1);
if (ACCESSING_BITS_8_15)
{
- set_led_status(machine(), 7, data & 0x0100); // start
- set_led_status(machine(), 8, data & 0x0200); // bet
- set_led_status(machine(), 9, data & 0x0400); // hold 5
- set_led_status(machine(), 10, data & 0x0800); // hold 4
- set_led_status(machine(), 11, data & 0x1000); // hold 3
- set_led_status(machine(), 12, data & 0x2000); // hold 2
- set_led_status(machine(), 13, data & 0x4000); // hold 1
- set_led_status(machine(), 14, data & 0x8000); // call attendant
+ machine().output().set_led_value( 7, data & 0x0100); // start
+ machine().output().set_led_value( 8, data & 0x0200); // bet
+ machine().output().set_led_value( 9, data & 0x0400); // hold 5
+ machine().output().set_led_value(10, data & 0x0800); // hold 4
+ machine().output().set_led_value(11, data & 0x1000); // hold 3
+ machine().output().set_led_value(12, data & 0x2000); // hold 2
+ machine().output().set_led_value(13, data & 0x4000); // hold 1
+ machine().output().set_led_value(14, data & 0x8000); // call attendant
show_leds123();
}
}
@@ -1016,8 +1016,8 @@ WRITE16_MEMBER(blitz68k_state::deucesw2_leds3_w)
data = COMBINE_DATA(m_leds2);
if (ACCESSING_BITS_8_15)
{
- set_led_status(machine(), 15, data & 0x0100); // hopper coins?
- set_led_status(machine(), 16, data & 0x0400); // coin out?
+ machine().output().set_led_value(15, data & 0x0100); // hopper coins?
+ machine().output().set_led_value(16, data & 0x0400); // coin out?
show_leds123();
}
}
@@ -1182,7 +1182,7 @@ WRITE16_MEMBER(blitz68k_state::hermit_leds2_w)
data = COMBINE_DATA(m_leds1);
if (ACCESSING_BITS_8_15)
{
- set_led_status(machine(), 7, data & 0x0100); // button
+ machine().output().set_led_value( 7, data & 0x0100); // button
show_leds12();
}
}
diff --git a/src/mame/drivers/bob85.cpp b/src/mame/drivers/bob85.cpp
index 71f28bd5ad4..9ca5b8e416d 100644
--- a/src/mame/drivers/bob85.cpp
+++ b/src/mame/drivers/bob85.cpp
@@ -137,7 +137,7 @@ READ8_MEMBER(bob85_state::bob85_keyboard_r)
WRITE8_MEMBER(bob85_state::bob85_7seg_w)
{
- output_set_digit_value(offset, BITSWAP8( data,3,2,1,0,7,6,5,4 ));
+ machine().output().set_digit_value(offset, BITSWAP8( data,3,2,1,0,7,6,5,4 ));
}
static ADDRESS_MAP_START( bob85_mem, AS_PROGRAM, 8, bob85_state )
diff --git a/src/mame/drivers/boxer.cpp b/src/mame/drivers/boxer.cpp
index 4fd0d093052..ce864a7c5c1 100644
--- a/src/mame/drivers/boxer.cpp
+++ b/src/mame/drivers/boxer.cpp
@@ -322,8 +322,8 @@ WRITE8_MEMBER(boxer_state::boxer_crowd_w)
WRITE8_MEMBER(boxer_state::boxer_led_w)
{
- set_led_status(machine(), 1, !(data & 1));
- set_led_status(machine(), 0, !(data & 2));
+ machine().output().set_led_value(1, !(data & 1));
+ machine().output().set_led_value(0, !(data & 2));
}
diff --git a/src/mame/drivers/bw12.cpp b/src/mame/drivers/bw12.cpp
index 3f2db33ab16..45eeec3babd 100644
--- a/src/mame/drivers/bw12.cpp
+++ b/src/mame/drivers/bw12.cpp
@@ -123,7 +123,7 @@ void bw12_state::ls259_w(int address, int data)
break;
case 4: /* CAP LOCK */
- output_set_led_value(0, data);
+ machine().output().set_led_value(0, data);
break;
case 5: /* MOTOR 0 */
diff --git a/src/mame/drivers/bwidow.cpp b/src/mame/drivers/bwidow.cpp
index c60baa7b024..75ac68d31c7 100644
--- a/src/mame/drivers/bwidow.cpp
+++ b/src/mame/drivers/bwidow.cpp
@@ -333,8 +333,8 @@ WRITE8_MEMBER(bwidow_state::bwidow_misc_w)
*/
if (data == m_lastdata) return;
- set_led_status(machine(), 0,~data & 0x10);
- set_led_status(machine(), 1,~data & 0x20);
+ machine().output().set_led_value(0,~data & 0x10);
+ machine().output().set_led_value(1,~data & 0x20);
machine().bookkeeping().coin_counter_w(0, data & 0x01);
machine().bookkeeping().coin_counter_w(1, data & 0x02);
m_lastdata = data;
@@ -343,8 +343,8 @@ WRITE8_MEMBER(bwidow_state::bwidow_misc_w)
WRITE8_MEMBER(bwidow_state::spacduel_coin_counter_w)
{
if (data == m_lastdata) return;
- set_led_status(machine(), 0, !BIT(data,5)); // start lamp
- set_led_status(machine(), 1, !BIT(data,4)); // select lamp
+ machine().output().set_led_value(0, !BIT(data,5)); // start lamp
+ machine().output().set_led_value(1, !BIT(data,4)); // select lamp
machine().bookkeeping().coin_lockout_w(0, !BIT(data,3));
machine().bookkeeping().coin_lockout_w(1, !BIT(data,3));
machine().bookkeeping().coin_lockout_w(2, !BIT(data,3));
diff --git a/src/mame/drivers/by17.cpp b/src/mame/drivers/by17.cpp
index 9d2fec2ace3..7bb852a20f0 100644
--- a/src/mame/drivers/by17.cpp
+++ b/src/mame/drivers/by17.cpp
@@ -533,11 +533,11 @@ WRITE_LINE_MEMBER( by17_state::u10_ca2_w )
for (digit=1; digit<=8; digit++)
{
- output_set_digit_value(10+digit, 0);
- output_set_digit_value(20+digit, 0);
- output_set_digit_value(30+digit, 0);
- output_set_digit_value(40+digit, 0);
- output_set_digit_value(50+digit, 0);
+ machine().output().set_digit_value(10+digit, 0);
+ machine().output().set_digit_value(20+digit, 0);
+ machine().output().set_digit_value(30+digit, 0);
+ machine().output().set_digit_value(40+digit, 0);
+ machine().output().set_digit_value(50+digit, 0);
}
}
#endif
@@ -557,7 +557,7 @@ WRITE_LINE_MEMBER( by17_state::u10_cb2_w )
WRITE_LINE_MEMBER( by17_state::u11_ca2_w )
{
- output_set_value("led0", state);
+ machine().output().set_value("led0", state);
}
READ_LINE_MEMBER( by17_state::u11_ca1_r )
@@ -605,10 +605,10 @@ WRITE8_MEMBER( by17_state::u10_a_w )
{
if ((m_lamp_decode & 0x0f) < 0x0f)
{
- if (output_get_indexed_value("lamp", ((m_lamp_decode & 0x0f)+00) ) ==0 ) output_set_indexed_value("lamp", ((m_lamp_decode & 0x0f)+00), ((data & 0x10) ? FALSE : TRUE));
- if (output_get_indexed_value("lamp", ((m_lamp_decode & 0x0f)+15) ) ==0 ) output_set_indexed_value("lamp", ((m_lamp_decode & 0x0f)+15), ((data & 0x20) ? FALSE : TRUE));
- if (output_get_indexed_value("lamp", ((m_lamp_decode & 0x0f)+30) ) ==0 ) output_set_indexed_value("lamp", ((m_lamp_decode & 0x0f)+30), ((data & 0x40) ? FALSE : TRUE));
- if (output_get_indexed_value("lamp", ((m_lamp_decode & 0x0f)+45) ) ==0 ) output_set_indexed_value("lamp", ((m_lamp_decode & 0x0f)+45), ((data & 0x80) ? FALSE : TRUE));
+ if (machine().output().get_indexed_value("lamp", ((m_lamp_decode & 0x0f)+00) ) ==0 ) machine().output().set_indexed_value("lamp", ((m_lamp_decode & 0x0f)+00), ((data & 0x10) ? FALSE : TRUE));
+ if (machine().output().get_indexed_value("lamp", ((m_lamp_decode & 0x0f)+15) ) ==0 ) machine().output().set_indexed_value("lamp", ((m_lamp_decode & 0x0f)+15), ((data & 0x20) ? FALSE : TRUE));
+ if (machine().output().get_indexed_value("lamp", ((m_lamp_decode & 0x0f)+30) ) ==0 ) machine().output().set_indexed_value("lamp", ((m_lamp_decode & 0x0f)+30), ((data & 0x40) ? FALSE : TRUE));
+ if (machine().output().get_indexed_value("lamp", ((m_lamp_decode & 0x0f)+45) ) ==0 ) machine().output().set_indexed_value("lamp", ((m_lamp_decode & 0x0f)+45), ((data & 0x80) ? FALSE : TRUE));
}
else
{
@@ -698,11 +698,11 @@ WRITE8_MEMBER( by17_state::u11_a_w )
{
static const UINT8 patterns[16] = { 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7d,0x07,0x7f,0x6f,0,0,0,0,0,0 }; // MC14543 - BCD to 7 Segment Display Decoder
- output_set_digit_value(10+m_digit, patterns[m_segment[1]]);
- output_set_digit_value(20+m_digit, patterns[m_segment[2]]);
- output_set_digit_value(30+m_digit, patterns[m_segment[3]]);
- output_set_digit_value(40+m_digit, patterns[m_segment[4]]);
- output_set_digit_value(50+m_digit, patterns[m_segment[5]]);
+ machine().output().set_digit_value(10+m_digit, patterns[m_segment[1]]);
+ machine().output().set_digit_value(20+m_digit, patterns[m_segment[2]]);
+ machine().output().set_digit_value(30+m_digit, patterns[m_segment[3]]);
+ machine().output().set_digit_value(40+m_digit, patterns[m_segment[4]]);
+ machine().output().set_digit_value(50+m_digit, patterns[m_segment[5]]);
}
@@ -715,7 +715,7 @@ WRITE8_MEMBER( by17_state::u11_b_w )
{
if ((data & 0x0f) < 0x0f) // Momentary Solenoids
{
- output_set_indexed_value( "solenoid", (data & 0x0f), TRUE);
+ machine().output().set_indexed_value( "solenoid", (data & 0x0f), TRUE);
if (m_solenoid_features[(data & 0x0f)][3]) // Reset/release relevant switch after firing Solenoid
m_io_hold_x[(m_solenoid_features[(data & 0x0f)][2])] &= (m_solenoid_features[(data & 0x0f)][3]);
@@ -727,7 +727,7 @@ WRITE8_MEMBER( by17_state::u11_b_w )
{
for (int i=0; i<15; i++)
{
- output_set_indexed_value( "solenoid", i, FALSE);
+ machine().output().set_indexed_value( "solenoid", i, FALSE);
}
}
}
@@ -735,49 +735,49 @@ WRITE8_MEMBER( by17_state::u11_b_w )
if ((m_u11b & 0x10) && ((data & 0x10)==0))
{
- output_set_value("solenoid16", TRUE);
+ machine().output().set_value("solenoid16", TRUE);
if (m_solenoid_features[16][0] != 0xff)
m_samples->start(m_solenoid_features[16][0], m_solenoid_features[16][1]);
}
else if ((data & 0x10) && ((m_u11b & 0x10)==0))
{
- output_set_value("solenoid16", FALSE);
+ machine().output().set_value("solenoid16", FALSE);
if (m_solenoid_features[16][0] != 0xff)
m_samples->start(m_solenoid_features[16][0], m_solenoid_features[16][2]);
}
if ((m_u11b & 0x20) && ((data & 0x20)==0))
{
- output_set_value("solenoid17", TRUE); // Coin Lockout Coil engage
+ machine().output().set_value("solenoid17", TRUE); // Coin Lockout Coil engage
if (m_solenoid_features[17][0] != 0xff)
m_samples->start(m_solenoid_features[17][0], m_solenoid_features[17][1]);
}
else if ((data & 0x20) && ((m_u11b & 0x20)==0))
{
- output_set_value("solenoid17", FALSE); // Coin Lockout Coil release
+ machine().output().set_value("solenoid17", FALSE); // Coin Lockout Coil release
if (m_solenoid_features[17][0] != 0xff)
m_samples->start(m_solenoid_features[17][0], m_solenoid_features[17][2]);
}
if ((m_u11b & 0x40) && ((data & 0x40)==0))
{
- output_set_value("solenoid18", TRUE); // Flipper Enable Relay engage
+ machine().output().set_value("solenoid18", TRUE); // Flipper Enable Relay engage
if (m_solenoid_features[18][0] != 0xff)
m_samples->start(m_solenoid_features[18][0], m_solenoid_features[18][1]);
}
else if ((data & 0x40) && ((m_u11b & 0x40)==0))
{
- output_set_value("solenoid18", FALSE); // Flipper Enable Relay release
+ machine().output().set_value("solenoid18", FALSE); // Flipper Enable Relay release
if (m_solenoid_features[18][0] != 0xff)
m_samples->start(m_solenoid_features[18][0], m_solenoid_features[18][2]);
}
if ((m_u11b & 0x80) && ((data & 0x80)==0))
{
- output_set_value("solenoid19", TRUE);
+ machine().output().set_value("solenoid19", TRUE);
if (m_solenoid_features[19][0] != 0xff)
m_samples->start(m_solenoid_features[19][0], m_solenoid_features[19][1]);
}
else if ((data & 0x80) && ((m_u11b & 0x80)==0))
{
- output_set_value("solenoid19", FALSE);
+ machine().output().set_value("solenoid19", FALSE);
if (m_solenoid_features[19][0] != 0xff)
m_samples->start(m_solenoid_features[19][0], m_solenoid_features[19][2]);
}
@@ -809,7 +809,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( by17_state::timer_z_freq )
for (int i=0; i<60; i++)
{
- output_set_indexed_value( "lamp", i, 0 );
+ machine().output().set_indexed_value( "lamp", i, 0 );
}
}
diff --git a/src/mame/drivers/by35.cpp b/src/mame/drivers/by35.cpp
index 923b11470fb..a282cb453d7 100644
--- a/src/mame/drivers/by35.cpp
+++ b/src/mame/drivers/by35.cpp
@@ -521,11 +521,11 @@ WRITE_LINE_MEMBER( by35_state::u10_ca2_w )
for (digit=1; digit<=8; digit++)
{
- output_set_digit_value(10+digit, 0);
- output_set_digit_value(20+digit, 0);
- output_set_digit_value(30+digit, 0);
- output_set_digit_value(40+digit, 0);
- output_set_digit_value(50+digit, 0);
+ machine().output().set_digit_value(10+digit, 0);
+ machine().output().set_digit_value(20+digit, 0);
+ machine().output().set_digit_value(30+digit, 0);
+ machine().output().set_digit_value(40+digit, 0);
+ machine().output().set_digit_value(50+digit, 0);
}
}
#endif
@@ -545,7 +545,7 @@ WRITE_LINE_MEMBER( by35_state::u10_cb2_w )
WRITE_LINE_MEMBER( by35_state::u11_ca2_w )
{
- output_set_value("led0", state);
+ machine().output().set_value("led0", state);
}
READ_LINE_MEMBER( by35_state::u11_ca1_r )
@@ -609,10 +609,10 @@ WRITE8_MEMBER( by35_state::u10_a_w )
{
if ((m_lamp_decode & 0x0f) < 0x0f)
{
- if (output_get_indexed_value("lamp", ((m_lamp_decode & 0x0f)+00) ) ==0 ) output_set_indexed_value("lamp", ((m_lamp_decode & 0x0f)+00), ((data & 0x10) ? FALSE : TRUE));
- if (output_get_indexed_value("lamp", ((m_lamp_decode & 0x0f)+15) ) ==0 ) output_set_indexed_value("lamp", ((m_lamp_decode & 0x0f)+15), ((data & 0x20) ? FALSE : TRUE));
- if (output_get_indexed_value("lamp", ((m_lamp_decode & 0x0f)+30) ) ==0 ) output_set_indexed_value("lamp", ((m_lamp_decode & 0x0f)+30), ((data & 0x40) ? FALSE : TRUE));
- if (output_get_indexed_value("lamp", ((m_lamp_decode & 0x0f)+45) ) ==0 ) output_set_indexed_value("lamp", ((m_lamp_decode & 0x0f)+45), ((data & 0x80) ? FALSE : TRUE));
+ if (machine().output().get_indexed_value("lamp", ((m_lamp_decode & 0x0f)+00) ) ==0 ) machine().output().set_indexed_value("lamp", ((m_lamp_decode & 0x0f)+00), ((data & 0x10) ? FALSE : TRUE));
+ if (machine().output().get_indexed_value("lamp", ((m_lamp_decode & 0x0f)+15) ) ==0 ) machine().output().set_indexed_value("lamp", ((m_lamp_decode & 0x0f)+15), ((data & 0x20) ? FALSE : TRUE));
+ if (machine().output().get_indexed_value("lamp", ((m_lamp_decode & 0x0f)+30) ) ==0 ) machine().output().set_indexed_value("lamp", ((m_lamp_decode & 0x0f)+30), ((data & 0x40) ? FALSE : TRUE));
+ if (machine().output().get_indexed_value("lamp", ((m_lamp_decode & 0x0f)+45) ) ==0 ) machine().output().set_indexed_value("lamp", ((m_lamp_decode & 0x0f)+45), ((data & 0x80) ? FALSE : TRUE));
}
else
{
@@ -705,11 +705,11 @@ WRITE8_MEMBER( by35_state::u11_a_w )
{
static const UINT8 patterns[16] = { 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7d,0x07,0x7f,0x6f,0,0,0,0,0,0 }; // MC14543 - BCD to 7 Segment Display Decoder
- output_set_digit_value(10+m_digit, patterns[m_segment[1]]);
- output_set_digit_value(20+m_digit, patterns[m_segment[2]]);
- output_set_digit_value(30+m_digit, patterns[m_segment[3]]);
- output_set_digit_value(40+m_digit, patterns[m_segment[4]]);
- output_set_digit_value(50+m_digit, patterns[m_segment[5]]);
+ machine().output().set_digit_value(10+m_digit, patterns[m_segment[1]]);
+ machine().output().set_digit_value(20+m_digit, patterns[m_segment[2]]);
+ machine().output().set_digit_value(30+m_digit, patterns[m_segment[3]]);
+ machine().output().set_digit_value(40+m_digit, patterns[m_segment[4]]);
+ machine().output().set_digit_value(50+m_digit, patterns[m_segment[5]]);
}
@@ -723,11 +723,11 @@ WRITE8_MEMBER( by35_state::u11_b_w )
if ((data & 0x0f) < 0x0f) // Momentary Solenoids
{
if (m_solenoid_features[(data & 0x0f)][0] != 0xff) { // Play solenoid audio sample
- if (output_get_indexed_value("solenoid", (data & 0x0f)) == FALSE)
+ if (machine().output().get_indexed_value("solenoid", (data & 0x0f)) == FALSE)
m_samples->start(m_solenoid_features[(data & 0x0f)][0], m_solenoid_features[(data & 0x0f)][1]);
}
- output_set_indexed_value( "solenoid", (data & 0x0f), TRUE);
+ machine().output().set_indexed_value( "solenoid", (data & 0x0f), TRUE);
if (m_solenoid_features[(data & 0x0f)][3]) // Reset/release relevant switch after firing Solenoid
m_io_hold_x[(m_solenoid_features[(data & 0x0f)][2])] &= (m_solenoid_features[(data & 0x0f)][3]);
@@ -736,7 +736,7 @@ WRITE8_MEMBER( by35_state::u11_b_w )
{
for (int i=0; i<15; i++)
{
- output_set_indexed_value( "solenoid", i, FALSE);
+ machine().output().set_indexed_value( "solenoid", i, FALSE);
}
}
}
@@ -744,49 +744,49 @@ WRITE8_MEMBER( by35_state::u11_b_w )
if ((m_u11b & 0x10) && ((data & 0x10)==0))
{
- output_set_value("solenoid16", TRUE);
+ machine().output().set_value("solenoid16", TRUE);
if (m_solenoid_features[16][0] != 0xff)
m_samples->start(m_solenoid_features[16][0], m_solenoid_features[16][1]);
}
else if ((data & 0x10) && ((m_u11b & 0x10)==0))
{
- output_set_value("solenoid16", FALSE);
+ machine().output().set_value("solenoid16", FALSE);
if (m_solenoid_features[16][0] != 0xff)
m_samples->start(m_solenoid_features[16][0], m_solenoid_features[16][2]);
}
if ((m_u11b & 0x20) && ((data & 0x20)==0))
{
- output_set_value("solenoid17", TRUE); // Coin Lockout Coil engage
+ machine().output().set_value("solenoid17", TRUE); // Coin Lockout Coil engage
if (m_solenoid_features[17][0] != 0xff)
m_samples->start(m_solenoid_features[17][0], m_solenoid_features[17][1]);
}
else if ((data & 0x20) && ((m_u11b & 0x20)==0))
{
- output_set_value("solenoid17", FALSE); // Coin Lockout Coil release
+ machine().output().set_value("solenoid17", FALSE); // Coin Lockout Coil release
if (m_solenoid_features[17][0] != 0xff)
m_samples->start(m_solenoid_features[17][0], m_solenoid_features[17][2]);
}
if ((m_u11b & 0x40) && ((data & 0x40)==0))
{
- output_set_value("solenoid18", TRUE); // Flipper Enable Relay engage
+ machine().output().set_value("solenoid18", TRUE); // Flipper Enable Relay engage
if (m_solenoid_features[18][0] != 0xff)
m_samples->start(m_solenoid_features[18][0], m_solenoid_features[18][1]);
}
else if ((data & 0x40) && ((m_u11b & 0x40)==0))
{
- output_set_value("solenoid18", FALSE); // Flipper Enable Relay release
+ machine().output().set_value("solenoid18", FALSE); // Flipper Enable Relay release
if (m_solenoid_features[18][0] != 0xff)
m_samples->start(m_solenoid_features[18][0], m_solenoid_features[18][2]);
}
if ((m_u11b & 0x80) && ((data & 0x80)==0))
{
- output_set_value("solenoid19", TRUE);
+ machine().output().set_value("solenoid19", TRUE);
if (m_solenoid_features[19][0] != 0xff)
m_samples->start(m_solenoid_features[19][0], m_solenoid_features[19][1]);
}
else if ((data & 0x80) && ((m_u11b & 0x80)==0))
{
- output_set_value("solenoid19", FALSE);
+ machine().output().set_value("solenoid19", FALSE);
if (m_solenoid_features[19][0] != 0xff)
m_samples->start(m_solenoid_features[19][0], m_solenoid_features[19][2]);
}
@@ -823,7 +823,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( by35_state::timer_z_freq )
for (int i=0; i<60; i++)
{
- output_set_indexed_value( "lamp", i, 0 );
+ machine().output().set_indexed_value( "lamp", i, 0 );
}
}
diff --git a/src/mame/drivers/by6803.cpp b/src/mame/drivers/by6803.cpp
index e2a9e1da262..1f551052064 100644
--- a/src/mame/drivers/by6803.cpp
+++ b/src/mame/drivers/by6803.cpp
@@ -186,7 +186,7 @@ READ8_MEMBER( by6803_state::port2_r )
WRITE8_MEMBER( by6803_state::port2_w )
{
m_port2 = data;
- output_set_value("led0", BIT(data, 2)); // P22 drives LED
+ machine().output().set_value("led0", BIT(data, 2)); // P22 drives LED
}
// display latch strobes; display blanking
@@ -222,19 +222,19 @@ WRITE8_MEMBER( by6803_state::pia0_a_w )
switch (m_pia0_a)
{
case 0x10: // wrong
- output_set_digit_value(m_digit, m_segment);
+ machine().output().set_digit_value(m_digit, m_segment);
break;
case 0x1d:
- output_set_digit_value(8+m_digit, m_segment);
+ machine().output().set_digit_value(8+m_digit, m_segment);
break;
case 0x1b:
- output_set_digit_value(16+m_digit, m_segment);
+ machine().output().set_digit_value(16+m_digit, m_segment);
break;
case 0x07:
- output_set_digit_value(24+m_digit, m_segment);
+ machine().output().set_digit_value(24+m_digit, m_segment);
break;
case 0x0f:
- output_set_digit_value(32+m_digit, m_segment);
+ machine().output().set_digit_value(32+m_digit, m_segment);
break;
default:
break;
diff --git a/src/mame/drivers/c80.cpp b/src/mame/drivers/c80.cpp
index 028bcb5c803..894e3e161ad 100644
--- a/src/mame/drivers/c80.cpp
+++ b/src/mame/drivers/c80.cpp
@@ -202,7 +202,7 @@ WRITE8_MEMBER( c80_state::pio1_pb_w )
if (!m_pio1_a5)
{
- output_set_digit_value(m_digit, data);
+ machine().output().set_digit_value(m_digit, data);
}
m_keylatch = data;
diff --git a/src/mame/drivers/cabaret.cpp b/src/mame/drivers/cabaret.cpp
index 5141f26ea1b..c73fa696229 100644
--- a/src/mame/drivers/cabaret.cpp
+++ b/src/mame/drivers/cabaret.cpp
@@ -159,7 +159,7 @@ WRITE8_MEMBER(cabaret_state::cabaret_nmi_and_coins_w)
machine().bookkeeping().coin_counter_w(2, data & 0x08); // key in
machine().bookkeeping().coin_counter_w(3, data & 0x10); // coin m_out mech
- set_led_status(machine(), 6, data & 0x40); // led for coin m_out / hopper active
+ machine().output().set_led_value(6, data & 0x40); // led for coin m_out / hopper active
m_nmi_enable = data; // data & 0x80 // nmi enable?
diff --git a/src/mame/drivers/calomega.cpp b/src/mame/drivers/calomega.cpp
index 553d8b0d2e6..980291929d4 100644
--- a/src/mame/drivers/calomega.cpp
+++ b/src/mame/drivers/calomega.cpp
@@ -784,33 +784,33 @@ WRITE8_MEMBER(calomega_state::pia1_bout_w)
WRITE8_MEMBER(calomega_state::lamps_903a_w)
{
/* First 5 bits of PIA0 port B */
- output_set_lamp_value(1, 1-((data) & 1)); /* L1 (Hold 1) */
- output_set_lamp_value(2, 1-((data >> 1) & 1)); /* L2 (Hold 2) */
- output_set_lamp_value(3, 1-((data >> 2) & 1)); /* L3 (Hold 3) */
- output_set_lamp_value(4, 1-((data >> 3) & 1)); /* L4 (Hold 4) */
- output_set_lamp_value(5, 1-((data >> 4) & 1)); /* L5 (Hold 5) */
+ machine().output().set_lamp_value(1, 1-((data) & 1)); /* L1 (Hold 1) */
+ machine().output().set_lamp_value(2, 1-((data >> 1) & 1)); /* L2 (Hold 2) */
+ machine().output().set_lamp_value(3, 1-((data >> 2) & 1)); /* L3 (Hold 3) */
+ machine().output().set_lamp_value(4, 1-((data >> 3) & 1)); /* L4 (Hold 4) */
+ machine().output().set_lamp_value(5, 1-((data >> 4) & 1)); /* L5 (Hold 5) */
}
WRITE8_MEMBER(calomega_state::lamps_903b_w)
{
/* First 4 bits of PIA1 port A */
- output_set_lamp_value(6, 1-((data) & 1)); /* L6 (Cancel) */
- output_set_lamp_value(7, 1-((data >> 1) & 1)); /* L7 (Bet) */
- output_set_lamp_value(8, 1-((data >> 2) & 1)); /* L8 (Take) */
- output_set_lamp_value(9, 1-((data >> 3) & 1)); /* L9 (Door?) */
+ machine().output().set_lamp_value(6, 1-((data) & 1)); /* L6 (Cancel) */
+ machine().output().set_lamp_value(7, 1-((data >> 1) & 1)); /* L7 (Bet) */
+ machine().output().set_lamp_value(8, 1-((data >> 2) & 1)); /* L8 (Take) */
+ machine().output().set_lamp_value(9, 1-((data >> 3) & 1)); /* L9 (Door?) */
}
WRITE8_MEMBER(calomega_state::lamps_905_w)
{
/* Whole 8 bits of PIA0 port B */
- output_set_lamp_value(1, 1-((data) & 1)); /* L1 (Hold 1) */
- output_set_lamp_value(2, 1-((data >> 1) & 1)); /* L2 (Hold 2) */
- output_set_lamp_value(3, 1-((data >> 2) & 1)); /* L3 (Hold 3) */
- output_set_lamp_value(4, 1-((data >> 3) & 1)); /* L4 (Hold 4) */
- output_set_lamp_value(5, 1-((data >> 4) & 1)); /* L5 (Hold 5) */
- output_set_lamp_value(6, 1-((data >> 5) & 1)); /* L6 (unknown) */
- output_set_lamp_value(7, 1-((data >> 6) & 1)); /* L7 (unknown) */
- output_set_lamp_value(8, 1-((data >> 7) & 1)); /* L8 (unknown) */
+ machine().output().set_lamp_value(1, 1-((data) & 1)); /* L1 (Hold 1) */
+ machine().output().set_lamp_value(2, 1-((data >> 1) & 1)); /* L2 (Hold 2) */
+ machine().output().set_lamp_value(3, 1-((data >> 2) & 1)); /* L3 (Hold 3) */
+ machine().output().set_lamp_value(4, 1-((data >> 3) & 1)); /* L4 (Hold 4) */
+ machine().output().set_lamp_value(5, 1-((data >> 4) & 1)); /* L5 (Hold 5) */
+ machine().output().set_lamp_value(6, 1-((data >> 5) & 1)); /* L6 (unknown) */
+ machine().output().set_lamp_value(7, 1-((data >> 6) & 1)); /* L7 (unknown) */
+ machine().output().set_lamp_value(8, 1-((data >> 7) & 1)); /* L8 (unknown) */
}
diff --git a/src/mame/drivers/canyon.cpp b/src/mame/drivers/canyon.cpp
index 1e08018a616..602928597bb 100644
--- a/src/mame/drivers/canyon.cpp
+++ b/src/mame/drivers/canyon.cpp
@@ -95,7 +95,7 @@ READ8_MEMBER(canyon_state::canyon_options_r)
WRITE8_MEMBER(canyon_state::canyon_led_w)
{
- set_led_status(machine(), offset & 0x01, offset & 0x02);
+ machine().output().set_led_value(offset & 0x01, offset & 0x02);
}
diff --git a/src/mame/drivers/cardline.cpp b/src/mame/drivers/cardline.cpp
index ae58b74824b..89f8125db96 100644
--- a/src/mame/drivers/cardline.cpp
+++ b/src/mame/drivers/cardline.cpp
@@ -196,14 +196,14 @@ READ8_MEMBER(cardline_state::hsync_r)
WRITE8_MEMBER(cardline_state::lamps_w)
{
/* button lamps 1-8 (collect, card 1-5, bet, start) */
- output_set_lamp_value(5,(data >> 0) & 1);
- output_set_lamp_value(0,(data >> 1) & 1);
- output_set_lamp_value(1,(data >> 2) & 1);
- output_set_lamp_value(2,(data >> 3) & 1);
- output_set_lamp_value(3,(data >> 4) & 1);
- output_set_lamp_value(4,(data >> 5) & 1);
- output_set_lamp_value(6,(data >> 6) & 1);
- output_set_lamp_value(7,(data >> 7) & 1);
+ machine().output().set_lamp_value(5,(data >> 0) & 1);
+ machine().output().set_lamp_value(0,(data >> 1) & 1);
+ machine().output().set_lamp_value(1,(data >> 2) & 1);
+ machine().output().set_lamp_value(2,(data >> 3) & 1);
+ machine().output().set_lamp_value(3,(data >> 4) & 1);
+ machine().output().set_lamp_value(4,(data >> 5) & 1);
+ machine().output().set_lamp_value(6,(data >> 6) & 1);
+ machine().output().set_lamp_value(7,(data >> 7) & 1);
}
static ADDRESS_MAP_START( mem_prg, AS_PROGRAM, 8, cardline_state )
diff --git a/src/mame/drivers/caswin.cpp b/src/mame/drivers/caswin.cpp
index 43ff1c4748c..d7f9f8640cc 100644
--- a/src/mame/drivers/caswin.cpp
+++ b/src/mame/drivers/caswin.cpp
@@ -179,11 +179,11 @@ WRITE8_MEMBER(caswin_state::vvillage_lamps_w)
---- --x- lamp button 2
---- ---x lamp button 1
*/
- set_led_status(machine(), 0, data & 0x01);
- set_led_status(machine(), 1, data & 0x02);
- set_led_status(machine(), 2, data & 0x04);
- set_led_status(machine(), 3, data & 0x08);
- set_led_status(machine(), 4, data & 0x10);
+ machine().output().set_led_value(0, data & 0x01);
+ machine().output().set_led_value(1, data & 0x02);
+ machine().output().set_led_value(2, data & 0x04);
+ machine().output().set_led_value(3, data & 0x08);
+ machine().output().set_led_value(4, data & 0x10);
}
static ADDRESS_MAP_START( vvillage_mem, AS_PROGRAM, 8, caswin_state )
diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp
index f3f0ebf55c3..78def135097 100644
--- a/src/mame/drivers/cave.cpp
+++ b/src/mame/drivers/cave.cpp
@@ -640,10 +640,10 @@ WRITE16_MEMBER(cave_state::korokoro_leds_w)
{
COMBINE_DATA(&m_leds[0]);
- set_led_status(machine(), 0, data & 0x8000);
- set_led_status(machine(), 1, data & 0x4000);
- set_led_status(machine(), 2, data & 0x1000); // square button
- set_led_status(machine(), 3, data & 0x0800); // round button
+ machine().output().set_led_value(0, data & 0x8000);
+ machine().output().set_led_value(1, data & 0x4000);
+ machine().output().set_led_value(2, data & 0x1000); // square button
+ machine().output().set_led_value(3, data & 0x0800); // round button
// machine().bookkeeping().coin_lockout_w(1, ~data & 0x0200); // coin lockouts?
// machine().bookkeeping().coin_lockout_w(0, ~data & 0x0100);
@@ -651,10 +651,10 @@ WRITE16_MEMBER(cave_state::korokoro_leds_w)
// machine().bookkeeping().coin_counter_w(1, data & 0x0020);
machine().bookkeeping().coin_counter_w(0, data & 0x0010);
- set_led_status(machine(), 5, data & 0x0008);
- set_led_status(machine(), 6, data & 0x0004);
- set_led_status(machine(), 7, data & 0x0002);
- set_led_status(machine(), 8, data & 0x0001);
+ machine().output().set_led_value(5, data & 0x0008);
+ machine().output().set_led_value(6, data & 0x0004);
+ machine().output().set_led_value(7, data & 0x0002);
+ machine().output().set_led_value(8, data & 0x0001);
show_leds();
}
@@ -845,17 +845,17 @@ WRITE16_MEMBER(cave_state::ppsatan_out_w)
{
machine().bookkeeping().coin_counter_w(0, data & 0x0001);
- set_led_status(machine(), 0, data & 0x0010);
- set_led_status(machine(), 1, data & 0x0020);
- set_led_status(machine(), 2, data & 0x0040);
- set_led_status(machine(), 3, data & 0x0080);
+ machine().output().set_led_value(0, data & 0x0010);
+ machine().output().set_led_value(1, data & 0x0020);
+ machine().output().set_led_value(2, data & 0x0040);
+ machine().output().set_led_value(3, data & 0x0080);
}
if (ACCESSING_BITS_8_15)
{
- set_led_status(machine(), 4, data & 0x0100);
- set_led_status(machine(), 5, data & 0x0200);
- set_led_status(machine(), 6, data & 0x0400); // not tested in service mode
- set_led_status(machine(), 7, data & 0x0800); // not tested in service mode
+ machine().output().set_led_value(4, data & 0x0100);
+ machine().output().set_led_value(5, data & 0x0200);
+ machine().output().set_led_value(6, data & 0x0400); // not tested in service mode
+ machine().output().set_led_value(7, data & 0x0800); // not tested in service mode
m_oki->set_bank_base((data & 0x8000) ? 0x40000 : 0);
}
@@ -1027,14 +1027,14 @@ WRITE16_MEMBER(cave_state::tjumpman_leds_w)
{
if (ACCESSING_BITS_0_7)
{
- set_led_status(machine(), 0, data & 0x0001); // suru
- set_led_status(machine(), 1, data & 0x0002); // shinai
- set_led_status(machine(), 2, data & 0x0004); // payout
- set_led_status(machine(), 3, data & 0x0008); // go
- set_led_status(machine(), 4, data & 0x0010); // 1 bet
- set_led_status(machine(), 5, data & 0x0020); // medal
+ machine().output().set_led_value(0, data & 0x0001); // suru
+ machine().output().set_led_value(1, data & 0x0002); // shinai
+ machine().output().set_led_value(2, data & 0x0004); // payout
+ machine().output().set_led_value(3, data & 0x0008); // go
+ machine().output().set_led_value(4, data & 0x0010); // 1 bet
+ machine().output().set_led_value(5, data & 0x0020); // medal
m_hopper = data & 0x0040; // hopper
- set_led_status(machine(), 6, data & 0x0080); // 3 bet
+ machine().output().set_led_value(6, data & 0x0080); // 3 bet
}
// popmessage("led %04X", data);
@@ -1073,12 +1073,12 @@ WRITE16_MEMBER(cave_state::pacslot_leds_w)
{
if (ACCESSING_BITS_0_7)
{
- set_led_status(machine(), 0, data & 0x0001); // pac-man
- set_led_status(machine(), 1, data & 0x0002); // ms. pac-man
- set_led_status(machine(), 2, data & 0x0004); // payout
- set_led_status(machine(), 3, data & 0x0008); // start
- set_led_status(machine(), 4, data & 0x0010); // bet
- set_led_status(machine(), 5, data & 0x0020); // medal
+ machine().output().set_led_value(0, data & 0x0001); // pac-man
+ machine().output().set_led_value(1, data & 0x0002); // ms. pac-man
+ machine().output().set_led_value(2, data & 0x0004); // payout
+ machine().output().set_led_value(3, data & 0x0008); // start
+ machine().output().set_led_value(4, data & 0x0010); // bet
+ machine().output().set_led_value(5, data & 0x0020); // medal
m_hopper = data & 0x0040; // hopper
}
diff --git a/src/mame/drivers/cc40.cpp b/src/mame/drivers/cc40.cpp
index 254a9bdbd2a..bf320eafb96 100644
--- a/src/mame/drivers/cc40.cpp
+++ b/src/mame/drivers/cc40.cpp
@@ -195,7 +195,7 @@ void cc40_state::update_lcd_indicator(UINT8 y, UINT8 x, int state)
// ---- raw lcd screen here ----
// under | ERROR v v v v v v _LOW
// output# | 60 61 62 63 50 51 52 53
- output_set_lamp_value(y * 10 + x, state);
+ machine().output().set_lamp_value(y * 10 + x, state);
}
static HD44780_PIXEL_UPDATE(cc40_pixel_update)
diff --git a/src/mame/drivers/ccastles.cpp b/src/mame/drivers/ccastles.cpp
index 6d380f3b549..485c74e2b8d 100644
--- a/src/mame/drivers/ccastles.cpp
+++ b/src/mame/drivers/ccastles.cpp
@@ -249,7 +249,7 @@ WRITE8_MEMBER(ccastles_state::irq_ack_w)
WRITE8_MEMBER(ccastles_state::led_w)
{
- set_led_status(machine(), offset, ~data & 1);
+ machine().output().set_led_value(offset, ~data & 1);
}
diff --git a/src/mame/drivers/centiped.cpp b/src/mame/drivers/centiped.cpp
index 1d17a3107cd..610e9840ef0 100644
--- a/src/mame/drivers/centiped.cpp
+++ b/src/mame/drivers/centiped.cpp
@@ -617,7 +617,7 @@ READ8_MEMBER(centiped_state::bullsdrt_data_port_r)
WRITE8_MEMBER(centiped_state::led_w)
{
- set_led_status(machine(), offset, ~data & 0x80);
+ machine().output().set_led_value(offset, ~data & 0x80);
}
diff --git a/src/mame/drivers/chance32.cpp b/src/mame/drivers/chance32.cpp
index 7c49c0125ec..c6c84d83ccf 100644
--- a/src/mame/drivers/chance32.cpp
+++ b/src/mame/drivers/chance32.cpp
@@ -168,13 +168,13 @@ WRITE8_MEMBER(chance32_state::muxout_w)
if (data & 1) // bit 0 is the mux selector.
{
- output_set_lamp_value(0, (data >> 1) & 1); /* Lamp 0 - Small / Big */
- output_set_lamp_value(1, (data >> 2) & 1); /* Lamp 1 - Big / Small */
- output_set_lamp_value(2, (data >> 3) & 1); /* Lamp 2 - Hold 5 */
- output_set_lamp_value(3, (data >> 4) & 1); /* Lamp 3 - Hold 4 */
- output_set_lamp_value(4, (data >> 5) & 1); /* Lamp 4 - Hold 3 */
- output_set_lamp_value(5, (data >> 6) & 1); /* Lamp 5 - Hold 2 */
- output_set_lamp_value(6, (data >> 7) & 1); /* Lamp 6 - Hold 1 */
+ machine().output().set_lamp_value(0, (data >> 1) & 1); /* Lamp 0 - Small / Big */
+ machine().output().set_lamp_value(1, (data >> 2) & 1); /* Lamp 1 - Big / Small */
+ machine().output().set_lamp_value(2, (data >> 3) & 1); /* Lamp 2 - Hold 5 */
+ machine().output().set_lamp_value(3, (data >> 4) & 1); /* Lamp 3 - Hold 4 */
+ machine().output().set_lamp_value(4, (data >> 5) & 1); /* Lamp 4 - Hold 3 */
+ machine().output().set_lamp_value(5, (data >> 6) & 1); /* Lamp 5 - Hold 2 */
+ machine().output().set_lamp_value(6, (data >> 7) & 1); /* Lamp 6 - Hold 1 */
logerror("Lamps A: %02x\n", data);
}
@@ -182,12 +182,12 @@ WRITE8_MEMBER(chance32_state::muxout_w)
else
{
// bit 1 is unknown...
- output_set_lamp_value(7, (data >> 2) & 1); /* Lamp 7 - Fever! */
- output_set_lamp_value(8, (data >> 3) & 1); /* Lamp 8 - Cancel */
- output_set_lamp_value(9, (data >> 4) & 1); /* Lamp 9 - D-Up / Take */
- output_set_lamp_value(10, (data >> 5) & 1); /* Lamp 10 - Take / D-Up */
- output_set_lamp_value(11, (data >> 6) & 1); /* Lamp 11 - Deal */
- output_set_lamp_value(12, (data >> 7) & 1); /* Lamp 12 - Bet */
+ machine().output().set_lamp_value(7, (data >> 2) & 1); /* Lamp 7 - Fever! */
+ machine().output().set_lamp_value(8, (data >> 3) & 1); /* Lamp 8 - Cancel */
+ machine().output().set_lamp_value(9, (data >> 4) & 1); /* Lamp 9 - D-Up / Take */
+ machine().output().set_lamp_value(10, (data >> 5) & 1); /* Lamp 10 - Take / D-Up */
+ machine().output().set_lamp_value(11, (data >> 6) & 1); /* Lamp 11 - Deal */
+ machine().output().set_lamp_value(12, (data >> 7) & 1); /* Lamp 12 - Bet */
logerror("Lamps B: %02x\n", data);
}
diff --git a/src/mame/drivers/chessmst.cpp b/src/mame/drivers/chessmst.cpp
index bb844e64b12..e6e62fca91b 100644
--- a/src/mame/drivers/chessmst.cpp
+++ b/src/mame/drivers/chessmst.cpp
@@ -170,25 +170,25 @@ WRITE8_MEMBER( chessmst_state::pio1_port_a_w )
for (int row=1; row<=8; row++)
{
if (m_led_sel & 0x01)
- output_set_indexed_value("led_a", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_a", row, BIT(data, 8-row));
if (m_led_sel & 0x02)
- output_set_indexed_value("led_b", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_b", row, BIT(data, 8-row));
if (m_led_sel & 0x04)
- output_set_indexed_value("led_c", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_c", row, BIT(data, 8-row));
if (m_led_sel & 0x08)
- output_set_indexed_value("led_d", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_d", row, BIT(data, 8-row));
if (m_led_sel & 0x10)
- output_set_indexed_value("led_e", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_e", row, BIT(data, 8-row));
if (m_led_sel & 0x20)
- output_set_indexed_value("led_f", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_f", row, BIT(data, 8-row));
if (m_led_sel & 0x40)
- output_set_indexed_value("led_g", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_g", row, BIT(data, 8-row));
if (m_led_sel & 0x80)
- output_set_indexed_value("led_h", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_h", row, BIT(data, 8-row));
if (m_led_sel & 0x100)
- output_set_indexed_value("led_i", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_i", row, BIT(data, 8-row));
if (m_led_sel & 0x200)
- output_set_indexed_value("led_j", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_j", row, BIT(data, 8-row));
}
m_led_sel = 0;
diff --git a/src/mame/drivers/chesstrv.cpp b/src/mame/drivers/chesstrv.cpp
index 3fb8de7a40d..15d576950bd 100644
--- a/src/mame/drivers/chesstrv.cpp
+++ b/src/mame/drivers/chesstrv.cpp
@@ -66,13 +66,13 @@ WRITE8_MEMBER( chesstrv_state::display_w )
UINT8 seg_data = BITSWAP8(data,0,1,2,3,4,5,6,7);
if(!(m_matrix & 0x01))
- output_set_digit_value( 3, seg_data );
+ machine().output().set_digit_value( 3, seg_data );
if(!(m_matrix & 0x02))
- output_set_digit_value( 2, seg_data );
+ machine().output().set_digit_value( 2, seg_data );
if(!(m_matrix & 0x04))
- output_set_digit_value( 1, seg_data );
+ machine().output().set_digit_value( 1, seg_data );
if(!(m_matrix & 0x08))
- output_set_digit_value( 0, seg_data );
+ machine().output().set_digit_value( 0, seg_data );
}
WRITE8_MEMBER( chesstrv_state::matrix_w )
@@ -98,7 +98,7 @@ READ8_MEMBER( chesstrv_state::keypad_r )
WRITE8_MEMBER( chesstrv_state::diplomat_display_w )
{
- output_set_digit_value( m_matrix & 7, data ^ 0xff );
+ machine().output().set_digit_value( m_matrix & 7, data ^ 0xff );
}
READ8_MEMBER( chesstrv_state::diplomat_keypad_r )
diff --git a/src/mame/drivers/chexx.cpp b/src/mame/drivers/chexx.cpp
index 533e094ff3a..fa850a7e5ac 100644
--- a/src/mame/drivers/chexx.cpp
+++ b/src/mame/drivers/chexx.cpp
@@ -133,16 +133,16 @@ WRITE_LINE_MEMBER(chexx_state::via_cb2_out)
// 7segs (score)
static const UINT8 patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0, 0, 0, 0, 0, 0 }; // 4511
- output_set_digit_value(0, patterns[(m_shift >> (16+4)) & 0xf]);
- output_set_digit_value(1, patterns[(m_shift >> (16+0)) & 0xf]);
+ machine().output().set_digit_value(0, patterns[(m_shift >> (16+4)) & 0xf]);
+ machine().output().set_digit_value(1, patterns[(m_shift >> (16+0)) & 0xf]);
- output_set_digit_value(2, patterns[(m_shift >> (8+4)) & 0xf]);
- output_set_digit_value(3, patterns[(m_shift >> (8+0)) & 0xf]);
+ machine().output().set_digit_value(2, patterns[(m_shift >> (8+4)) & 0xf]);
+ machine().output().set_digit_value(3, patterns[(m_shift >> (8+0)) & 0xf]);
// Leds (period being played)
- output_set_led_value(0, BIT(m_shift,2));
- output_set_led_value(1, BIT(m_shift,1));
- output_set_led_value(2, BIT(m_shift,0));
+ machine().output().set_led_value(0, BIT(m_shift,2));
+ machine().output().set_led_value(1, BIT(m_shift,1));
+ machine().output().set_led_value(2, BIT(m_shift,0));
// logerror("%s: VIA write CB2 = %02X\n", machine().describe_context(), state);
}
@@ -178,8 +178,8 @@ ADDRESS_MAP_END
WRITE8_MEMBER(chexx_state::lamp_w)
{
m_lamp = data;
- output_set_lamp_value(0, BIT(m_lamp,0));
- output_set_lamp_value(1, BIT(m_lamp,1));
+ machine().output().set_lamp_value(0, BIT(m_lamp,0));
+ machine().output().set_lamp_value(1, BIT(m_lamp,1));
}
WRITE8_MEMBER(chexx_state::ay_w)
diff --git a/src/mame/drivers/chsuper.cpp b/src/mame/drivers/chsuper.cpp
index 7b17ad25230..e42bf9d7dae 100644
--- a/src/mame/drivers/chsuper.cpp
+++ b/src/mame/drivers/chsuper.cpp
@@ -138,11 +138,11 @@ WRITE8_MEMBER( chsuper_state::chsuper_vram_w )
WRITE8_MEMBER( chsuper_state::chsuper_outporta_w ) // Port EEh
{
machine().bookkeeping().coin_counter_w(0, data & 0x01); // Coin counter
- output_set_lamp_value(0, (data >> 1) & 1); // Hold 1 / Black (Nero) lamp.
+ machine().output().set_lamp_value(0, (data >> 1) & 1); // Hold 1 / Black (Nero) lamp.
machine().bookkeeping().coin_counter_w(1, data & 0x04); // Payout / Ticket Out pulse
- output_set_lamp_value(1, (data >> 3) & 1); // Hold 2 / Low (Bassa) lamp.
+ machine().output().set_lamp_value(1, (data >> 3) & 1); // Hold 2 / Low (Bassa) lamp.
// D4: unused...
- output_set_lamp_value(5, (data >> 5) & 1); // BET lamp
+ machine().output().set_lamp_value(5, (data >> 5) & 1); // BET lamp
// D6: ticket motor...
// D7: unused...
@@ -153,11 +153,11 @@ WRITE8_MEMBER( chsuper_state::chsuper_outporta_w ) // Port EEh
if ((m_blacklamp == 1) & (m_redlamp == 1)) // if both are ON...
{
- output_set_lamp_value(2, 1); // HOLD 3 ON
+ machine().output().set_lamp_value(2, 1); // HOLD 3 ON
}
else
{
- output_set_lamp_value(2, 0); // otherwise HOLD 3 OFF
+ machine().output().set_lamp_value(2, 0); // otherwise HOLD 3 OFF
}
}
@@ -165,11 +165,11 @@ WRITE8_MEMBER( chsuper_state::chsuper_outportb_w ) // Port EFh
{
// D0: unknown...
// D1: unused...
- output_set_lamp_value(3, (data >> 2) & 1); // Hold 4 / High (Alta) lamp.
+ machine().output().set_lamp_value(3, (data >> 2) & 1); // Hold 4 / High (Alta) lamp.
// D3: unused...
// D4: unused...
- output_set_lamp_value(4, (data >> 5) & 1); // Hold 5 / Red (Rosso) / Gamble (Raddoppio) lamp.
- output_set_lamp_value(6, (data >> 6) & 1); // Start / Gamble (Raddoppio) lamp.
+ machine().output().set_lamp_value(4, (data >> 5) & 1); // Hold 5 / Red (Rosso) / Gamble (Raddoppio) lamp.
+ machine().output().set_lamp_value(6, (data >> 6) & 1); // Start / Gamble (Raddoppio) lamp.
// D7: unused...
/* Workaround to get the HOLD 3 lamp line active,
@@ -179,11 +179,11 @@ WRITE8_MEMBER( chsuper_state::chsuper_outportb_w ) // Port EFh
if ((m_blacklamp == 1) & (m_redlamp == 1)) // if both are ON...
{
- output_set_lamp_value(2, 1); // Hold 3 ON
+ machine().output().set_lamp_value(2, 1); // Hold 3 ON
}
else
{
- output_set_lamp_value(2, 0); // Hold 3 OFF
+ machine().output().set_lamp_value(2, 0); // Hold 3 OFF
}
}
diff --git a/src/mame/drivers/cidelsa.cpp b/src/mame/drivers/cidelsa.cpp
index 7417b063e17..86b8ce2d03d 100644
--- a/src/mame/drivers/cidelsa.cpp
+++ b/src/mame/drivers/cidelsa.cpp
@@ -113,9 +113,9 @@ WRITE8_MEMBER( cidelsa_state::altair_out1_w )
7 CONT. M1
*/
- set_led_status(machine(), 0, data & 0x08); // 1P
- set_led_status(machine(), 1, data & 0x10); // 2P
- set_led_status(machine(), 2, data & 0x20); // FIRE
+ machine().output().set_led_value(0, data & 0x08); // 1P
+ machine().output().set_led_value(1, data & 0x10); // 2P
+ machine().output().set_led_value(2, data & 0x20); // FIRE
}
WRITE8_MEMBER( draco_state::out1_w )
diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp
index 82d19df4fb2..edf034733eb 100644
--- a/src/mame/drivers/cischeat.cpp
+++ b/src/mame/drivers/cischeat.cpp
@@ -384,15 +384,15 @@ WRITE16_MEMBER(cischeat_state::scudhamm_leds_w)
{
if (ACCESSING_BITS_8_15)
{
- set_led_status(machine(), 0, data & 0x0100); // 3 buttons
- set_led_status(machine(), 1, data & 0x0200);
- set_led_status(machine(), 2, data & 0x0400);
+ machine().output().set_led_value(0, data & 0x0100); // 3 buttons
+ machine().output().set_led_value(1, data & 0x0200);
+ machine().output().set_led_value(2, data & 0x0400);
}
if (ACCESSING_BITS_0_7)
{
-// set_led_status(machine(), 3, data & 0x0010); // if we had more leds..
-// set_led_status(machine(), 4, data & 0x0020);
+// machine().output().set_led_value(3, data & 0x0010); // if we had more leds..
+// machine().output().set_led_value(4, data & 0x0020);
}
}
@@ -483,10 +483,10 @@ WRITE16_MEMBER(cischeat_state::armchmp2_leds_w)
{
if (ACCESSING_BITS_8_15)
{
- set_led_status(machine(), 0, data & 0x0100);
- set_led_status(machine(), 1, data & 0x1000);
- set_led_status(machine(), 2, data & 0x2000);
- set_led_status(machine(), 3, data & 0x4000);
+ machine().output().set_led_value(0, data & 0x0100);
+ machine().output().set_led_value(1, data & 0x1000);
+ machine().output().set_led_value(2, data & 0x2000);
+ machine().output().set_led_value(3, data & 0x4000);
}
if (ACCESSING_BITS_0_7)
@@ -526,9 +526,9 @@ WRITE16_MEMBER(cischeat_state::captflag_leds_w)
if (ACCESSING_BITS_8_15)
{
machine().bookkeeping().coin_counter_w(1, data & 0x0100); // coin 2
- set_led_status(machine(), 0, data & 0x0200); // decide
+ machine().output().set_led_value(0, data & 0x0200); // decide
machine().bookkeeping().coin_counter_w(0, data & 0x0400); // coin 1
- set_led_status(machine(), 1, data & 0x2000); // select
+ machine().output().set_led_value(1, data & 0x2000); // select
int power = (data & 0x1000);
m_captflag_hopper->write(space, 0, power ? 0x80 : 0x00); // prize motor
@@ -621,7 +621,7 @@ void cischeat_state::captflag_motor_move(int side, UINT16 data)
dev.reset();
}
- output_set_value((side == RIGHT) ? "right" : "left", pos);
+ machine().output().set_value((side == RIGHT) ? "right" : "left", pos);
}
CUSTOM_INPUT_MEMBER(cischeat_state::captflag_motor_pos_r)
diff --git a/src/mame/drivers/cliffhgr.cpp b/src/mame/drivers/cliffhgr.cpp
index 0a50dd302e1..5aac3ef3fea 100644
--- a/src/mame/drivers/cliffhgr.cpp
+++ b/src/mame/drivers/cliffhgr.cpp
@@ -128,7 +128,7 @@ public:
WRITE8_MEMBER(cliffhgr_state::cliff_test_led_w)
{
- set_led_status(machine(), 0, offset ^ 1);
+ machine().output().set_led_value(0, offset ^ 1);
}
WRITE8_MEMBER(cliffhgr_state::cliff_port_bank_w)
diff --git a/src/mame/drivers/cloak.cpp b/src/mame/drivers/cloak.cpp
index 0792fb3490b..47c9afa7924 100644
--- a/src/mame/drivers/cloak.cpp
+++ b/src/mame/drivers/cloak.cpp
@@ -130,7 +130,7 @@
WRITE8_MEMBER(cloak_state::cloak_led_w)
{
- set_led_status(machine(), 1 - offset, ~data & 0x80);
+ machine().output().set_led_value(1 - offset, ~data & 0x80);
}
WRITE8_MEMBER(cloak_state::cloak_coin_counter_w)
diff --git a/src/mame/drivers/cloud9.cpp b/src/mame/drivers/cloud9.cpp
index fe371336c63..0f7ced0426b 100644
--- a/src/mame/drivers/cloud9.cpp
+++ b/src/mame/drivers/cloud9.cpp
@@ -215,7 +215,7 @@ WRITE8_MEMBER(cloud9_state::irq_ack_w)
WRITE8_MEMBER(cloud9_state::cloud9_led_w)
{
- set_led_status(machine(), offset, ~data & 0x80);
+ machine().output().set_led_value(offset, ~data & 0x80);
}
diff --git a/src/mame/drivers/cops.cpp b/src/mame/drivers/cops.cpp
index 1f3797f8d72..0804a5118f4 100644
--- a/src/mame/drivers/cops.cpp
+++ b/src/mame/drivers/cops.cpp
@@ -569,7 +569,7 @@ WRITE8_MEMBER(cops_state::io1_w)
sprintf(output_name, "digit%d", i);
display_data = m_lcd_data_l | (m_lcd_data_h << 8);
display_data = BITSWAP16(display_data, 4, 5, 12, 1, 0, 11, 10, 6, 7, 2, 9, 3, 15, 8, 14, 13);
- output_set_value(output_name, display_data);
+ machine().output().set_value(output_name, display_data);
}
}
break;
@@ -580,23 +580,23 @@ WRITE8_MEMBER(cops_state::io1_w)
m_lcd_data_h = data;
break;
case 0x04: /* WOP4 */
- output_set_value("Offroad Right 4 Lamp", data & 0x80);
- output_set_value("Offroad Right 3 Lamp", data & 0x40);
- output_set_value("Offroad Right 2 Lamp", data & 0x20);
- output_set_value("Offroad Right 1 Lamp", data & 0x10);
- output_set_value("Offroad Left 4 Lamp", data & 0x08);
- output_set_value("Offroad Left 3 Lamp", data & 0x04);
- output_set_value("Offroad Left 2 Lamp", data & 0x02);
- output_set_value("Offroad Left 1 Lamp", data & 0x01);
+ machine().output().set_value("Offroad Right 4 Lamp", data & 0x80);
+ machine().output().set_value("Offroad Right 3 Lamp", data & 0x40);
+ machine().output().set_value("Offroad Right 2 Lamp", data & 0x20);
+ machine().output().set_value("Offroad Right 1 Lamp", data & 0x10);
+ machine().output().set_value("Offroad Left 4 Lamp", data & 0x08);
+ machine().output().set_value("Offroad Left 3 Lamp", data & 0x04);
+ machine().output().set_value("Offroad Left 2 Lamp", data & 0x02);
+ machine().output().set_value("Offroad Left 1 Lamp", data & 0x01);
break;
case 0x05: /* WOP5 */
- output_set_value("Damage Lamp", data & 0x80);
- output_set_value("Stop Lamp", data & 0x40);
- output_set_value("Gun Active Right Lamp", data & 0x20);
- output_set_value("Vest Hit 2 Lamp", data & 0x10);
- output_set_value("Vest Hit 3 Lamp", data & 0x04);
- output_set_value("Gun Active Left Lamp", data & 0x02);
- output_set_value("Vest Hit 1 Lamp", data & 0x01);
+ machine().output().set_value("Damage Lamp", data & 0x80);
+ machine().output().set_value("Stop Lamp", data & 0x40);
+ machine().output().set_value("Gun Active Right Lamp", data & 0x20);
+ machine().output().set_value("Vest Hit 2 Lamp", data & 0x10);
+ machine().output().set_value("Vest Hit 3 Lamp", data & 0x04);
+ machine().output().set_value("Gun Active Left Lamp", data & 0x02);
+ machine().output().set_value("Vest Hit 1 Lamp", data & 0x01);
break;
case 0x06: /* WOP6 */
logerror("WOP6: data = %02x\n", data);
@@ -630,17 +630,17 @@ WRITE8_MEMBER(cops_state::io2_w)
switch( offset & 0x0f )
{
case 0x02:
- output_set_value("Flash Red Lamp", data & 0x01);
- output_set_value("Flash Blue Lamp", data & 0x80);
+ machine().output().set_value("Flash Red Lamp", data & 0x01);
+ machine().output().set_value("Flash Blue Lamp", data & 0x80);
if ( data & ~0x91 ) logerror("Unknown io2_w, offset = %02x, data = %02x\n", offset, data);
break;
case 0x04:
- output_set_value("Bullet Lamp 6", data & 0x20);
- output_set_value("Bullet Lamp 5", data & 0x10);
- output_set_value("Bullet Lamp 4", data & 0x08);
- output_set_value("Bullet Lamp 3", data & 0x04);
- output_set_value("Bullet Lamp 2", data & 0x02);
- output_set_value("Bullet Lamp 1", data & 0x01);
+ machine().output().set_value("Bullet Lamp 6", data & 0x20);
+ machine().output().set_value("Bullet Lamp 5", data & 0x10);
+ machine().output().set_value("Bullet Lamp 4", data & 0x08);
+ machine().output().set_value("Bullet Lamp 3", data & 0x04);
+ machine().output().set_value("Bullet Lamp 2", data & 0x02);
+ machine().output().set_value("Bullet Lamp 1", data & 0x01);
if ( data & ~0x3f ) logerror("Unknown io2_w, offset = %02x, data = %02x\n", offset, data);
break;
default:
diff --git a/src/mame/drivers/copsnrob.cpp b/src/mame/drivers/copsnrob.cpp
index d31c1d7d5b9..99d4ad399ca 100644
--- a/src/mame/drivers/copsnrob.cpp
+++ b/src/mame/drivers/copsnrob.cpp
@@ -77,7 +77,7 @@ WRITE8_MEMBER(copsnrob_state::copsnrob_misc2_w)
{
m_misc = data & 0x7f;
/* Multi Player Start */
- set_led_status(machine(), 1, !((data >> 6) & 0x01));
+ machine().output().set_led_value(1, !((data >> 6) & 0x01));
}
diff --git a/src/mame/drivers/corona.cpp b/src/mame/drivers/corona.cpp
index e539bacba32..c71a5d8234f 100644
--- a/src/mame/drivers/corona.cpp
+++ b/src/mame/drivers/corona.cpp
@@ -509,8 +509,8 @@ WRITE8_MEMBER(corona_state::ball_w)
{
m_lamp = data;
- output_set_lamp_value(data, 1);
- output_set_lamp_value(m_lamp_old, 0);
+ machine().output().set_lamp_value(data, 1);
+ machine().output().set_lamp_value(m_lamp_old, 0);
m_lamp_old = m_lamp;
}
diff --git a/src/mame/drivers/cosmicos.cpp b/src/mame/drivers/cosmicos.cpp
index 8ec2903c821..c4cd26d7be1 100644
--- a/src/mame/drivers/cosmicos.cpp
+++ b/src/mame/drivers/cosmicos.cpp
@@ -158,7 +158,7 @@ WRITE8_MEMBER( cosmicos_state::segment_w )
if ((m_counter > 0) && (m_counter < 9))
{
- output_set_digit_value(10 - m_counter, data);
+ machine().output().set_digit_value(10 - m_counter, data);
}
}
@@ -201,7 +201,7 @@ INPUT_CHANGED_MEMBER( cosmicos_state::data )
if (!BIT(data, i))
{
m_data |= (1 << i);
- output_set_led_value(LED_D0 - i, 1);
+ machine().output().set_led_value(LED_D0 - i, 1);
}
}
}
@@ -221,29 +221,29 @@ INPUT_CHANGED_MEMBER( cosmicos_state::single_step )
void cosmicos_state::set_cdp1802_mode(int mode)
{
- output_set_led_value(LED_RUN, 0);
- output_set_led_value(LED_LOAD, 0);
- output_set_led_value(LED_PAUSE, 0);
- output_set_led_value(LED_RESET, 0);
+ machine().output().set_led_value(LED_RUN, 0);
+ machine().output().set_led_value(LED_LOAD, 0);
+ machine().output().set_led_value(LED_PAUSE, 0);
+ machine().output().set_led_value(LED_RESET, 0);
switch (mode)
{
case MODE_RUN:
- output_set_led_value(LED_RUN, 1);
+ machine().output().set_led_value(LED_RUN, 1);
m_wait = 1;
m_clear = 1;
break;
case MODE_LOAD:
- output_set_led_value(LED_LOAD, 1);
+ machine().output().set_led_value(LED_LOAD, 1);
m_wait = 0;
m_clear = 0;
break;
case MODE_PAUSE:
- output_set_led_value(LED_PAUSE, 1);
+ machine().output().set_led_value(LED_PAUSE, 1);
m_wait = 1;
m_clear = 0;
@@ -257,7 +257,7 @@ void cosmicos_state::set_cdp1802_mode(int mode)
m_clear = 0;
m_boot = 1;
- output_set_led_value(LED_RESET, 1);
+ machine().output().set_led_value(LED_RESET, 1);
break;
}
}
@@ -275,7 +275,7 @@ void cosmicos_state::clear_input_data()
for (i = 0; i < 8; i++)
{
- output_set_led_value(LED_D0 - i, 0);
+ machine().output().set_led_value(LED_D0 - i, 0);
}
}
@@ -353,7 +353,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cosmicos_state::digit_tick)
{
m_digit = !m_digit;
- output_set_digit_value(m_digit, m_segment);
+ machine().output().set_digit_value(m_digit, m_segment);
}
TIMER_DEVICE_CALLBACK_MEMBER(cosmicos_state::int_tick)
@@ -395,7 +395,7 @@ READ_LINE_MEMBER( cosmicos_state::ef2_r )
UINT8 special = m_special->read();
int casin = (m_cassette)->input() < 0.0;
- output_set_led_value(LED_CASSETTE, casin);
+ machine().output().set_led_value(LED_CASSETTE, casin);
return BIT(special, 1) | BIT(special, 3) | casin;
}
diff --git a/src/mame/drivers/cp1.cpp b/src/mame/drivers/cp1.cpp
index 825b39e36c0..0360e7062df 100644
--- a/src/mame/drivers/cp1.cpp
+++ b/src/mame/drivers/cp1.cpp
@@ -185,12 +185,12 @@ WRITE8_MEMBER(cp1_state::i8155_porta_w)
if (m_7seg)
{
- if (!(m_matrix & 0x01)) output_set_digit_value(5, data);
- if (!(m_matrix & 0x02)) output_set_digit_value(4, data);
- if (!(m_matrix & 0x04)) output_set_digit_value(3, data);
- if (!(m_matrix & 0x08)) output_set_digit_value(2, data | 0x80); // this digit has always the dot active
- if (!(m_matrix & 0x10)) output_set_digit_value(1, data);
- if (!(m_matrix & 0x20)) output_set_digit_value(0, data);
+ if (!(m_matrix & 0x01)) machine().output().set_digit_value(5, data);
+ if (!(m_matrix & 0x02)) machine().output().set_digit_value(4, data);
+ if (!(m_matrix & 0x04)) machine().output().set_digit_value(3, data);
+ if (!(m_matrix & 0x08)) machine().output().set_digit_value(2, data | 0x80); // this digit has always the dot active
+ if (!(m_matrix & 0x10)) machine().output().set_digit_value(1, data);
+ if (!(m_matrix & 0x20)) machine().output().set_digit_value(0, data);
}
m_7seg ^= 0x01;
diff --git a/src/mame/drivers/cps2.cpp b/src/mame/drivers/cps2.cpp
index 0353d0045b2..a1e78b2cc41 100644
--- a/src/mame/drivers/cps2.cpp
+++ b/src/mame/drivers/cps2.cpp
@@ -776,9 +776,9 @@ WRITE16_MEMBER( cps_state::cps2_eeprom_port_w )
}
/*
- set_led_status(machine(), 0, data & 0x01);
- set_led_status(machine(), 1, data & 0x10);
- set_led_status(machine(), 2, data & 0x20);
+ machine().output().set_led_value(0, data & 0x01);
+ machine().output().set_led_value(1, data & 0x10);
+ machine().output().set_led_value(2, data & 0x20);
*/
}
}
diff --git a/src/mame/drivers/csc.cpp b/src/mame/drivers/csc.cpp
index 50e0ef39c61..21f63e2384a 100644
--- a/src/mame/drivers/csc.cpp
+++ b/src/mame/drivers/csc.cpp
@@ -73,19 +73,19 @@ WRITE8_MEMBER( csc_state::pia0_pa_w )
switch (m_selector)
{
case 0:
- output_set_digit_value(0, out_digit & 0x7f);
- output_set_value("pm_led", BIT(out_digit, 7));
+ machine().output().set_digit_value(0, out_digit & 0x7f);
+ machine().output().set_value("pm_led", BIT(out_digit, 7));
break;
case 1:
- output_set_digit_value(1, out_digit & 0x7f);
+ machine().output().set_digit_value(1, out_digit & 0x7f);
break;
case 2:
- output_set_digit_value(2, out_digit & 0x7f);
- output_set_value("up_dot", BIT(out_digit, 7));
+ machine().output().set_digit_value(2, out_digit & 0x7f);
+ machine().output().set_value("up_dot", BIT(out_digit, 7));
break;
case 3:
- output_set_digit_value(3, out_digit & 0x7f);
- output_set_value("low_dot", BIT(out_digit, 7));
+ machine().output().set_digit_value(3, out_digit & 0x7f);
+ machine().output().set_value("low_dot", BIT(out_digit, 7));
break;
}
@@ -134,7 +134,7 @@ WRITE8_MEMBER( csc_state::pia1_pb_w )
if (m_selector < 8)
for (int i=0; i<8; i++)
- output_set_indexed_value(row_tag[m_selector], i+1, BIT(data, 7-i));
+ machine().output().set_indexed_value(row_tag[m_selector], i+1, BIT(data, 7-i));
}
READ8_MEMBER( csc_state::pia1_pa_r )
diff --git a/src/mame/drivers/cubo.cpp b/src/mame/drivers/cubo.cpp
index 678137cf6dd..87e4f05d4b0 100644
--- a/src/mame/drivers/cubo.cpp
+++ b/src/mame/drivers/cubo.cpp
@@ -399,7 +399,7 @@ WRITE8_MEMBER( cubo_state::akiko_cia_0_port_a_write )
m_cdda->set_output_gain( 0, ( data & 1 ) ? 0.0 : 1.0 );
/* bit 2 = Power Led on Amiga */
- set_led_status(machine(), 0, (data & 2) ? 0 : 1);
+ machine().output().set_led_value(0, (data & 2) ? 0 : 1);
handle_cd32_joystick_cia(machine(), data, m_cia_0->read(space, 2));
}
diff --git a/src/mame/drivers/cvicny.cpp b/src/mame/drivers/cvicny.cpp
index 416309d78d0..8965db6625c 100644
--- a/src/mame/drivers/cvicny.cpp
+++ b/src/mame/drivers/cvicny.cpp
@@ -56,7 +56,7 @@ public:
WRITE8_MEMBER( cvicny_state::segment_w ) // output segments on the selected digit
{
if (m_digit != m_digit_last)
- output_set_digit_value(m_digit, data);
+ machine().output().set_digit_value(m_digit, data);
m_digit_last = m_digit;
}
diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp
index d05867024cb..43cd8c61564 100644
--- a/src/mame/drivers/dacholer.cpp
+++ b/src/mame/drivers/dacholer.cpp
@@ -211,8 +211,8 @@ WRITE8_MEMBER(dacholer_state::coins_w)
machine().bookkeeping().coin_counter_w(0, data & 1);
machine().bookkeeping().coin_counter_w(1, data & 2);
- set_led_status(machine(), 0, data & 4);
- set_led_status(machine(), 1, data & 8);
+ machine().output().set_led_value(0, data & 4);
+ machine().output().set_led_value(1, data & 8);
}
WRITE8_MEMBER(dacholer_state::snd_w)
diff --git a/src/mame/drivers/dblcrown.cpp b/src/mame/drivers/dblcrown.cpp
index 0a8748477b6..ac2205f5523 100644
--- a/src/mame/drivers/dblcrown.cpp
+++ b/src/mame/drivers/dblcrown.cpp
@@ -322,14 +322,14 @@ WRITE8_MEMBER( dblcrown_state::lamps_w )
-x-- ---- Hold 2
x--- ---- Hold 1
*/
- output_set_lamp_value(0, (data) & 1); /* Deal */
- output_set_lamp_value(1, (data >> 1) & 1); /* Bet */
- output_set_lamp_value(2, (data >> 2) & 1); /* Cancel */
- output_set_lamp_value(3, (data >> 3) & 1); /* Hold 5 */
- output_set_lamp_value(4, (data >> 4) & 1); /* Hold 4 */
- output_set_lamp_value(5, (data >> 5) & 1); /* Hold 3 */
- output_set_lamp_value(6, (data >> 6) & 1); /* Hold 2 */
- output_set_lamp_value(7, (data >> 7) & 1); /* Hold 1 */
+ machine().output().set_lamp_value(0, (data) & 1); /* Deal */
+ machine().output().set_lamp_value(1, (data >> 1) & 1); /* Bet */
+ machine().output().set_lamp_value(2, (data >> 2) & 1); /* Cancel */
+ machine().output().set_lamp_value(3, (data >> 3) & 1); /* Hold 5 */
+ machine().output().set_lamp_value(4, (data >> 4) & 1); /* Hold 4 */
+ machine().output().set_lamp_value(5, (data >> 5) & 1); /* Hold 3 */
+ machine().output().set_lamp_value(6, (data >> 6) & 1); /* Hold 2 */
+ machine().output().set_lamp_value(7, (data >> 7) & 1); /* Hold 1 */
m_lamps_data = data;
}
diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp
index b004aa03a85..02843a65f4d 100644
--- a/src/mame/drivers/ddenlovr.cpp
+++ b/src/mame/drivers/ddenlovr.cpp
@@ -2430,7 +2430,7 @@ WRITE8_MEMBER(ddenlovr_state::mmpanic_blitter2_w)
void ddenlovr_state::mmpanic_update_leds()
{
- set_led_status(machine(), 0, m_mmpanic_leds);
+ machine().output().set_led_value(0, m_mmpanic_leds);
}
/* leds 1-8 */
@@ -2453,7 +2453,7 @@ WRITE8_MEMBER(ddenlovr_state::mmpanic_lockout_w)
{
machine().bookkeeping().coin_counter_w(0, (~data) & 0x01);
machine().bookkeeping().coin_lockout_w(0, (~data) & 0x02);
- set_led_status(machine(), 1, (~data) & 0x04);
+ machine().output().set_led_value(1, (~data) & 0x04);
}
}
@@ -3923,7 +3923,7 @@ WRITE8_MEMBER(ddenlovr_state::mjgnight_coincounter_w)
{
m_prot_val = data;
- set_led_status(machine(), 0, data & 0x01); // led? 1 in-game, 0 in service mode / while booting
+ machine().output().set_led_value(0, data & 0x01); // led? 1 in-game, 0 in service mode / while booting
machine().bookkeeping().coin_counter_w(0, data & 0x04); // coin-out
machine().bookkeeping().coin_counter_w(1, data & 0x08); // coin-in
diff --git a/src/mame/drivers/de_2.cpp b/src/mame/drivers/de_2.cpp
index ae58088dc0b..a2188a026f0 100644
--- a/src/mame/drivers/de_2.cpp
+++ b/src/mame/drivers/de_2.cpp
@@ -273,7 +273,7 @@ WRITE8_MEMBER( de_2_state::dig0_w )
data &= 0x7f;
m_strobe = data & 15;
m_diag = (data & 0x70) >> 4;
- output_set_digit_value(60, patterns[data>>4]); // diag digit
+ machine().output().set_digit_value(60, patterns[data>>4]); // diag digit
m_segment1 = 0;
m_segment2 = 0;
}
@@ -284,7 +284,7 @@ WRITE8_MEMBER( de_2_state::dig1_w )
m_segment2 |= 0x30000;
if ((m_segment2 & 0x70000) == 0x30000)
{
- output_set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 11, 15, 12, 10, 8, 14, 13, 9, 7, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 11, 15, 12, 10, 8, 14, 13, 9, 7, 6, 5, 4, 3, 2, 1, 0));
m_segment2 |= 0x40000;
}
}
@@ -295,7 +295,7 @@ WRITE8_MEMBER( de_2_state::type2alpha3_dig1_w )
m_segment2 |= 0x20000;
if ((m_segment2 & 0x70000) == 0x30000)
{
- output_set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 11, 15, 12, 10, 8, 14, 13, 9, 7, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 11, 15, 12, 10, 8, 14, 13, 9, 7, 6, 5, 4, 3, 2, 1, 0));
m_segment2 |= 0x40000;
}
}
@@ -306,7 +306,7 @@ WRITE8_MEMBER( de_2_state::alpha3_dig1_w )
m_segment2 |= 0x20000;
if ((m_segment2 & 0x70000) == 0x30000)
{
- output_set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
m_segment2 |= 0x40000;
}
}
@@ -328,7 +328,7 @@ WRITE8_MEMBER( de_2_state::pia2c_pa_w )
m_segment1 |= 0x10000;
if ((m_segment1 & 0x70000) == 0x30000)
{
- output_set_digit_value(m_strobe, BITSWAP16(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(m_strobe, BITSWAP16(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
m_segment1 |= 0x40000;
}
}
@@ -339,7 +339,7 @@ WRITE8_MEMBER( de_2_state::pia2c_pb_w )
m_segment1 |= 0x20000;
if ((m_segment1 & 0x70000) == 0x30000)
{
- output_set_digit_value(m_strobe, BITSWAP16(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(m_strobe, BITSWAP16(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
m_segment1 |= 0x40000;
}
}
@@ -379,7 +379,7 @@ WRITE8_MEMBER( de_2_state::type2alpha3_pia34_pa_w )
m_segment2 |= 0x10000;
if ((m_segment2 & 0x70000) == 0x30000)
{
- output_set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
m_segment2 |= 0x40000;
}
}
@@ -390,7 +390,7 @@ WRITE8_MEMBER( de_2_state::alpha3_pia34_pa_w )
m_segment2 |= 0x10000;
if ((m_segment2 & 0x70000) == 0x30000)
{
- output_set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 11, 15, 12, 10, 8, 14, 13, 9, 7, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 11, 15, 12, 10, 8, 14, 13, 9, 7, 6, 5, 4, 3, 2, 1, 0));
m_segment2 |= 0x40000;
}
}
diff --git a/src/mame/drivers/de_3.cpp b/src/mame/drivers/de_3.cpp
index d178dd64d44..c789b0a1f62 100644
--- a/src/mame/drivers/de_3.cpp
+++ b/src/mame/drivers/de_3.cpp
@@ -199,7 +199,7 @@ WRITE8_MEMBER( de_3_state::dig0_w )
// data &= 0x7f;
// m_strobe = data & 15;
// m_diag = (data & 0x70) >> 4;
-// output_set_digit_value(60, patterns[data>>4]); // diag digit
+// machine().output().set_digit_value(60, patterns[data>>4]); // diag digit
// m_segment1 = 0;
// m_segment2 = 0;
}
@@ -211,9 +211,9 @@ WRITE8_MEMBER( de_3_state::dig1_w )
// if ((m_segment2 & 0x70000) == 0x30000)
// {
// if(m_is_alpha3) // Alphanumeric type 2 uses 7 segment LEDs on the bottom row, type 3 uses 14 segment LEDs
-// output_set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+// machine().output().set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
// else
-// output_set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 11, 15, 12, 10, 8, 14, 13, 9, 7, 6, 5, 4, 3, 2, 1, 0));
+// machine().output().set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 11, 15, 12, 10, 8, 14, 13, 9, 7, 6, 5, 4, 3, 2, 1, 0));
// m_segment2 |= 0x40000;
// }
}
@@ -246,7 +246,7 @@ WRITE8_MEMBER( de_3_state::pia2c_pa_w )
// m_segment1 |= 0x10000;
// if ((m_segment1 & 0x70000) == 0x30000)
// {
-// output_set_digit_value(m_strobe, BITSWAP16(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+// machine().output().set_digit_value(m_strobe, BITSWAP16(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
// m_segment1 |= 0x40000;
// }
}
@@ -278,7 +278,7 @@ WRITE8_MEMBER( de_3_state::pia2c_pb_w )
// m_segment1 |= 0x20000;
// if ((m_segment1 & 0x70000) == 0x30000)
// {
-// output_set_digit_value(m_strobe, BITSWAP16(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+// machine().output().set_digit_value(m_strobe, BITSWAP16(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
// m_segment1 |= 0x40000;
// }
}
@@ -312,7 +312,7 @@ WRITE8_MEMBER( de_3_state::pia34_pa_w )
// m_segment2 |= 0x10000;
// if ((m_segment2 & 0x70000) == 0x30000)
// {
-// output_set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+// machine().output().set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
// m_segment2 |= 0x40000;
// }
}
diff --git a/src/mame/drivers/decwritr.cpp b/src/mame/drivers/decwritr.cpp
index 5c476bb9c1a..c151cd63384 100644
--- a/src/mame/drivers/decwritr.cpp
+++ b/src/mame/drivers/decwritr.cpp
@@ -293,13 +293,13 @@ void decwriter_state::machine_start()
{
m_speaker->set_frequency(786); // TODO: LA120 speaker is controlled by asic; VT100 has: 7.945us per serial clock = ~125865.324hz, / 160 clocks per char = ~ 786 hz
#if 0
- output_set_value("online_led",1);
- output_set_value("local_led", 0);
- output_set_value("noscroll_led",1);
- output_set_value("basic_led", 1);
- output_set_value("hardcopy_led", 1);
- output_set_value("l1_led", 1);
- output_set_value("l2_led", 1);
+ machine().output().set_value("online_led",1);
+ machine().output().set_value("local_led", 0);
+ machine().output().set_value("noscroll_led",1);
+ machine().output().set_value("basic_led", 1);
+ machine().output().set_value("hardcopy_led", 1);
+ machine().output().set_value("l1_led", 1);
+ machine().output().set_value("l2_led", 1);
#endif
char kbdcol[8];
// look up all 16 tags 'the slow way' but only once on reset
diff --git a/src/mame/drivers/destroyr.cpp b/src/mame/drivers/destroyr.cpp
index 6f2972470c3..2b5d5034c25 100644
--- a/src/mame/drivers/destroyr.cpp
+++ b/src/mame/drivers/destroyr.cpp
@@ -247,10 +247,10 @@ WRITE8_MEMBER(destroyr_state::output_w)
else switch (offset & 7)
{
case 0:
- set_led_status(machine(), 0, data & 1);
+ machine().output().set_led_value(0, data & 1);
break;
case 1:
- set_led_status(machine(), 1, data & 1); /* no second LED present on cab */
+ machine().output().set_led_value(1, data & 1); /* no second LED present on cab */
break;
case 2:
/* bit 0 => songate */
diff --git a/src/mame/drivers/digel804.cpp b/src/mame/drivers/digel804.cpp
index 9aeb5d4814d..fd3eb963f98 100644
--- a/src/mame/drivers/digel804.cpp
+++ b/src/mame/drivers/digel804.cpp
@@ -332,12 +332,12 @@ WRITE8_MEMBER( digel804_state::op46 )
//popmessage("LEDS: %s %s %s Func: %s%d\n", (data&0x80)?"INPUT":"-----", (data&0x40)?"BUSY":"----", (data&0x20)?"ERROR":"-----", (data&0x10)?"None":"", (data&0x10)?-1:(~data&0xF));
//fprintf("LEDS: %s %s %s Func: %s%d\n", (data&0x80)?"INPUT":"-----", (data&0x40)?"BUSY":"----", (data&0x20)?"ERROR":"-----", (data&0x10)?"None":"", (data&0x10)?-1:(~data&0xF));
- output_set_value("input_led", BIT(data,7));
- output_set_value("busy_led", BIT(data,6));
- output_set_value("error_led", BIT(data,5));
+ machine().output().set_value("input_led", BIT(data,7));
+ machine().output().set_value("busy_led", BIT(data,6));
+ machine().output().set_value("error_led", BIT(data,5));
for(int i=0; i<16; i++)
- output_set_indexed_value("func_led", i, (!(data & 0x10) && ((~data & 0x0f) == i)) ? 1 : 0);
+ machine().output().set_indexed_value("func_led", i, (!(data & 0x10) && ((~data & 0x0f) == i)) ? 1 : 0);
}
WRITE8_MEMBER( digel804_state::op47 ) // eprom timing/power and control write
diff --git a/src/mame/drivers/djmain.cpp b/src/mame/drivers/djmain.cpp
index aa47b3e4f02..a6b85515e52 100644
--- a/src/mame/drivers/djmain.cpp
+++ b/src/mame/drivers/djmain.cpp
@@ -291,10 +291,10 @@ WRITE32_MEMBER(djmain_state::light_ctrl_1_w)
{
if (ACCESSING_BITS_16_31)
{
- output_set_value("right-red-hlt", !(data & 0x08000000)); // Right red HIGHLIGHT
- output_set_value("left-red-hlt", !(data & 0x04000000)); // Left red HIGHLIGHT
- output_set_value("left-blue-hlt", !(data & 0x02000000)); // Left blue HIGHLIGHT
- output_set_value("right-blue-hlt", !(data & 0x00200000)); // Right blue HIGHLIGHT
+ machine().output().set_value("right-red-hlt", !(data & 0x08000000)); // Right red HIGHLIGHT
+ machine().output().set_value("left-red-hlt", !(data & 0x04000000)); // Left red HIGHLIGHT
+ machine().output().set_value("left-blue-hlt", !(data & 0x02000000)); // Left blue HIGHLIGHT
+ machine().output().set_value("right-blue-hlt", !(data & 0x00200000)); // Right blue HIGHLIGHT
}
}
@@ -302,11 +302,11 @@ WRITE32_MEMBER(djmain_state::light_ctrl_2_w)
{
if (ACCESSING_BITS_16_31)
{
- output_set_value("left-ssr", !!(data & 0x08000000)); // SSR
- output_set_value("right-ssr", !!(data & 0x08000000)); // SSR
- set_led_status(machine(), 0, data & 0x00010000); // 1P START
- set_led_status(machine(), 1, data & 0x00020000); // 2P START
- set_led_status(machine(), 2, data & 0x00040000); // EFFECT
+ machine().output().set_value("left-ssr", !!(data & 0x08000000)); // SSR
+ machine().output().set_value("right-ssr", !!(data & 0x08000000)); // SSR
+ machine().output().set_led_value(0, data & 0x00010000); // 1P START
+ machine().output().set_led_value(1, data & 0x00020000); // 2P START
+ machine().output().set_led_value(2, data & 0x00040000); // EFFECT
}
}
@@ -1364,9 +1364,9 @@ void djmain_state::machine_reset()
sndram_set_bank();
/* reset LEDs */
- set_led_status(machine(), 0, 1);
- set_led_status(machine(), 1, 1);
- set_led_status(machine(), 2, 1);
+ machine().output().set_led_value(0, 1);
+ machine().output().set_led_value(1, 1);
+ machine().output().set_led_value(2, 1);
}
diff --git a/src/mame/drivers/dlair.cpp b/src/mame/drivers/dlair.cpp
index f640c8b33b0..461ab57bc18 100644
--- a/src/mame/drivers/dlair.cpp
+++ b/src/mame/drivers/dlair.cpp
@@ -305,13 +305,13 @@ WRITE8_MEMBER(dlair_state::dleuro_misc_w)
WRITE8_MEMBER(dlair_state::led_den1_w)
{
- output_set_digit_value(0 + (offset & 7), led_map[data & 0x0f]);
+ machine().output().set_digit_value(0 + (offset & 7), led_map[data & 0x0f]);
}
WRITE8_MEMBER(dlair_state::led_den2_w)
{
- output_set_digit_value(8 + (offset & 7), led_map[data & 0x0f]);
+ machine().output().set_digit_value(8 + (offset & 7), led_map[data & 0x0f]);
}
diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp
index cbe084fe0f4..beaaa914397 100644
--- a/src/mame/drivers/dmv.cpp
+++ b/src/mame/drivers/dmv.cpp
@@ -202,7 +202,7 @@ WRITE8_MEMBER(dmv_state::leds_w)
*/
for(int i=0; i<8; i++)
- output_set_led_value(8-i, BIT(data, i));
+ machine().output().set_led_value(8-i, BIT(data, i));
}
READ8_MEMBER(dmv_state::ramsel_r)
diff --git a/src/mame/drivers/dolphunk.cpp b/src/mame/drivers/dolphunk.cpp
index 8ee69d20042..37429f72177 100644
--- a/src/mame/drivers/dolphunk.cpp
+++ b/src/mame/drivers/dolphunk.cpp
@@ -127,7 +127,7 @@ WRITE_LINE_MEMBER( dauphin_state::cass_w )
WRITE8_MEMBER( dauphin_state::port00_w )
{
- output_set_digit_value(offset, data);
+ machine().output().set_digit_value(offset, data);
}
WRITE8_MEMBER( dauphin_state::port06_w )
diff --git a/src/mame/drivers/dragrace.cpp b/src/mame/drivers/dragrace.cpp
index fc5d0f6e5a7..5523b2fab84 100644
--- a/src/mame/drivers/dragrace.cpp
+++ b/src/mame/drivers/dragrace.cpp
@@ -29,8 +29,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(dragrace_state::dragrace_frame_callback)
case 0x10: m_gear[i] = 0; break;
}
}
- output_set_value("P1gear", m_gear[0]);
- output_set_value("P2gear", m_gear[1]);
+ machine().output().set_value("P1gear", m_gear[0]);
+ machine().output().set_value("P2gear", m_gear[1]);
/* watchdog is disabled during service mode */
machine().watchdog_enable(ioport("IN0")->read() & 0x20);
@@ -70,8 +70,8 @@ void dragrace_state::dragrace_update_misc_flags( address_space &space )
* 0x091f = set Player 2 Start Lamp 0x80000000
* 0x0938 = clear 0x0918 - 0x091f
*/
- set_led_status(machine(), 0, m_misc_flags & 0x00008000);
- set_led_status(machine(), 1, m_misc_flags & 0x80000000);
+ machine().output().set_led_value(0, m_misc_flags & 0x00008000);
+ machine().output().set_led_value(1, m_misc_flags & 0x80000000);
m_discrete->write(space, DRAGRACE_MOTOR1_DATA, ~m_misc_flags & 0x0000001f); // Speed1 data*
m_discrete->write(space, DRAGRACE_EXPLODE1_EN, (m_misc_flags & 0x00000020) ? 1: 0); // Explosion1 enable
@@ -90,8 +90,8 @@ void dragrace_state::dragrace_update_misc_flags( address_space &space )
m_discrete->write(space, DRAGRACE_HITONE_EN, (m_misc_flags & 0x20000000) ? 1: 0); // HiTone enable
// the tachometers are driven from the same frequency generator that creates the engine sound
- output_set_value("tachometer", ~m_misc_flags & 0x0000001f);
- output_set_value("tachometer2", (~m_misc_flags & 0x001f0000) >> 0x10);
+ machine().output().set_value("tachometer", ~m_misc_flags & 0x0000001f);
+ machine().output().set_value("tachometer2", (~m_misc_flags & 0x001f0000) >> 0x10);
}
WRITE8_MEMBER(dragrace_state::dragrace_misc_w)
diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp
index 5100f7f9d2e..8c5dc34b79a 100644
--- a/src/mame/drivers/dynax.cpp
+++ b/src/mame/drivers/dynax.cpp
@@ -968,7 +968,7 @@ READ8_MEMBER(dynax_state::jantouki_blitter_busy_r)
WRITE8_MEMBER(dynax_state::jantouki_rombank_w)
{
membank("bank1")->set_entry(data & 0x0f);
- set_led_status(machine(), 0, data & 0x10); // maybe
+ machine().output().set_led_value(0, data & 0x10); // maybe
}
static ADDRESS_MAP_START( jantouki_io_map, AS_IO, 8, dynax_state )
diff --git a/src/mame/drivers/eacc.cpp b/src/mame/drivers/eacc.cpp
index ef0bc9830ae..6ddd29cdf65 100644
--- a/src/mame/drivers/eacc.cpp
+++ b/src/mame/drivers/eacc.cpp
@@ -210,14 +210,14 @@ WRITE8_MEMBER( eacc_state::eacc_segment_w )
for (i = 0; i < 8; i++)
{
sprintf(lednum,"led%d",i);
- output_set_value(lednum, BIT(data, i));
+ machine().output().set_value(lednum, BIT(data, i));
}
}
else
{
for (i = 3; i < 7; i++)
if (BIT(m_digit, i))
- output_set_digit_value(i, BITSWAP8(data, 7, 0, 1, 4, 5, 6, 2, 3));
+ machine().output().set_digit_value(i, BITSWAP8(data, 7, 0, 1, 4, 5, 6, 2, 3));
}
}
}
diff --git a/src/mame/drivers/ecoinf2.cpp b/src/mame/drivers/ecoinf2.cpp
index bce9f1ada06..e698beda217 100644
--- a/src/mame/drivers/ecoinf2.cpp
+++ b/src/mame/drivers/ecoinf2.cpp
@@ -70,7 +70,7 @@ public:
{
int data = ((m_lamps[i] << bit)&0x8000)>>15;
- output_set_indexed_value("lamp", (i*16)+bit, data );
+ machine().output().set_indexed_value("lamp", (i*16)+bit, data );
}
}
}
@@ -82,7 +82,7 @@ public:
{
int data = ((m_leds[i] << bit)&0x8000)>>15;
- output_set_digit_value((i*16)+bit, data );
+ machine().output().set_digit_value((i*16)+bit, data );
}
}
}
@@ -181,8 +181,8 @@ public:
DECLARE_WRITE8_MEMBER(ppi8255_ic24_write_b_payouts)
{
//TODO: Fix up payout enables - all available bits enable one slide each
- output_set_value("coinlamp0", data&0x40 );
- output_set_value("coinlamp1", data&0x80 );
+ machine().output().set_value("coinlamp0", data&0x40 );
+ machine().output().set_value("coinlamp1", data&0x80 );
}
DECLARE_WRITE8_MEMBER(ppi8255_ic24_write_c_inhibits)
@@ -204,8 +204,8 @@ public:
m_reel0->update( data &0x0f);
m_reel1->update((data>>4)&0x0f);
- awp_draw_reel("reel1", m_reel0);
- awp_draw_reel("reel2", m_reel1);
+ awp_draw_reel(machine(),"reel1", m_reel0);
+ awp_draw_reel(machine(),"reel2", m_reel1);
}
DECLARE_WRITE8_MEMBER(ppi8255_ic23_write_b_reel23)
@@ -213,8 +213,8 @@ public:
m_reel2->update( data &0x0f);
m_reel3->update((data>>4)&0x0f);
- awp_draw_reel("reel3", m_reel2);
- awp_draw_reel("reel4", m_reel3);
+ awp_draw_reel(machine(),"reel3", m_reel2);
+ awp_draw_reel(machine(),"reel4", m_reel3);
}
DECLARE_READ8_MEMBER(ppi8255_ic23_read_c_key)
diff --git a/src/mame/drivers/ecoinf3.cpp b/src/mame/drivers/ecoinf3.cpp
index 3073fdc2852..7d863ab9d66 100644
--- a/src/mame/drivers/ecoinf3.cpp
+++ b/src/mame/drivers/ecoinf3.cpp
@@ -174,7 +174,7 @@ public:
{
int data = ((m_lamps[i] << bit)&0x8000)>>15;
- output_set_indexed_value("lamp", (i*16)+bit, data );
+ machine().output().set_indexed_value("lamp", (i*16)+bit, data );
}
}
@@ -229,8 +229,8 @@ public:
m_reel0->update( data &0x0f);
m_reel1->update((data>>4)&0x0f);
- awp_draw_reel("reel1", m_reel0);
- awp_draw_reel("reel2", m_reel1);
+ awp_draw_reel(machine(),"reel1", m_reel0);
+ awp_draw_reel(machine(),"reel2", m_reel1);
}
DECLARE_WRITE8_MEMBER(ppi8255_intf_d_write_b_reel23)
@@ -240,8 +240,8 @@ public:
m_reel2->update( data &0x0f);
m_reel3->update((data>>4)&0x0f);
- awp_draw_reel("reel3", m_reel2);
- awp_draw_reel("reel4", m_reel3);
+ awp_draw_reel(machine(),"reel3", m_reel2);
+ awp_draw_reel(machine(),"reel4", m_reel3);
}
DECLARE_WRITE8_MEMBER(ppi8255_intf_d_write_c) { logerror("%04x - ppi8255_intf_d_(used)write_c %02x\n", m_maincpu->pcbase(), data);}
@@ -354,7 +354,7 @@ void ecoinf3_state::update_display()
{
for (int i =0; i<14; i++)
{
- output_set_indexed_value("vfd", i, set_display(m_chars[i]) );
+ machine().output().set_indexed_value("vfd", i, set_display(m_chars[i]) );
}
}
diff --git a/src/mame/drivers/ecoinfr.cpp b/src/mame/drivers/ecoinfr.cpp
index 3d6a4a48373..462c401e13b 100644
--- a/src/mame/drivers/ecoinfr.cpp
+++ b/src/mame/drivers/ecoinfr.cpp
@@ -167,7 +167,7 @@ WRITE8_MEMBER(ecoinfr_state::ec_port00_out_w)
m_reel0->update(data&0x0f);
- awp_draw_reel("reel1", m_reel0);
+ awp_draw_reel(machine(),"reel1", m_reel0);
}
WRITE8_MEMBER(ecoinfr_state::ec_port01_out_w)
@@ -179,7 +179,7 @@ WRITE8_MEMBER(ecoinfr_state::ec_port01_out_w)
m_reel1->update(data&0x0f);
- awp_draw_reel("reel2", m_reel1);
+ awp_draw_reel(machine(),"reel2", m_reel1);
}
WRITE8_MEMBER(ecoinfr_state::ec_port02_out_w)
@@ -191,7 +191,7 @@ WRITE8_MEMBER(ecoinfr_state::ec_port02_out_w)
m_reel2->update(data&0x0f);
- awp_draw_reel("reel3", m_reel2);
+ awp_draw_reel(machine(),"reel3", m_reel2);
}
@@ -323,7 +323,7 @@ WRITE8_MEMBER(ecoinfr_state::ec_port0d_out_cred_data_w)
if (m_credsel!=0xff)
{
UINT8 bf7segdata = BITSWAP8(data,7,0,1,2,3,4,5,6);
- output_set_digit_value(m_credsel+8, bf7segdata);
+ machine().output().set_digit_value(m_credsel+8, bf7segdata);
}
}
@@ -336,7 +336,7 @@ WRITE8_MEMBER(ecoinfr_state::ec_port0f_out_bank_segdata_w)
if (m_banksel!=0xff)
{
UINT8 bf7segdata = BITSWAP8(data,7,0,1,2,3,4,5,6);
- output_set_digit_value(m_banksel, bf7segdata);
+ machine().output().set_digit_value(m_banksel, bf7segdata);
}
}
diff --git a/src/mame/drivers/elekscmp.cpp b/src/mame/drivers/elekscmp.cpp
index 7783184917c..2183f7cdaa6 100644
--- a/src/mame/drivers/elekscmp.cpp
+++ b/src/mame/drivers/elekscmp.cpp
@@ -55,7 +55,7 @@ protected:
WRITE8_MEMBER(elekscmp_state::hex_display_w)
{
- output_set_digit_value(offset, data);
+ machine().output().set_digit_value(offset, data);
}
UINT8 elekscmp_state::convert_key(UINT8 data)
diff --git a/src/mame/drivers/elf.cpp b/src/mame/drivers/elf.cpp
index 5fdfc47035b..b4f4320cf83 100644
--- a/src/mame/drivers/elf.cpp
+++ b/src/mame/drivers/elf.cpp
@@ -151,7 +151,7 @@ READ_LINE_MEMBER( elf2_state::ef4_r )
WRITE_LINE_MEMBER( elf2_state::q_w )
{
- output_set_led_value(0, state);
+ machine().output().set_led_value(0, state);
}
READ8_MEMBER( elf2_state::dma_r )
diff --git a/src/mame/drivers/enmirage.cpp b/src/mame/drivers/enmirage.cpp
index 64412391c75..085c3a469c5 100644
--- a/src/mame/drivers/enmirage.cpp
+++ b/src/mame/drivers/enmirage.cpp
@@ -161,7 +161,7 @@ WRITE8_MEMBER(mirage_state::mirage_via_write_porta)
}
m_l_hi = seg;
- output_set_digit_value(0, m_l_segs);
+ machine().output().set_digit_value(0, m_l_segs);
// printf("L LED: seg %d (hi %d conv %02x, %02x)\n", seg, m_l_hi, segconv[seg], m_l_segs);
}
// right LED selected?
@@ -179,7 +179,7 @@ WRITE8_MEMBER(mirage_state::mirage_via_write_porta)
}
m_r_hi = seg;
- output_set_digit_value(1, m_r_segs);
+ machine().output().set_digit_value(1, m_r_segs);
// printf("R LED: seg %d (hi %d conv %02x, %02x)\n", seg, m_r_hi, segconv[seg], m_r_segs);
}
}
diff --git a/src/mame/drivers/eolith.cpp b/src/mame/drivers/eolith.cpp
index 400e535e5be..4558b32fb70 100644
--- a/src/mame/drivers/eolith.cpp
+++ b/src/mame/drivers/eolith.cpp
@@ -132,7 +132,7 @@ WRITE32_MEMBER(eolith_state::systemcontrol_w)
{
m_buffer = (data & 0x80) >> 7;
machine().bookkeeping().coin_counter_w(0, data & m_coin_counter_bit);
- set_led_status(machine(), 0, data & 1);
+ machine().output().set_led_value(0, data & 1);
m_eepromoutport->write(data, 0xff);
diff --git a/src/mame/drivers/et3400.cpp b/src/mame/drivers/et3400.cpp
index bf9806787c0..1e386c549d1 100644
--- a/src/mame/drivers/et3400.cpp
+++ b/src/mame/drivers/et3400.cpp
@@ -53,14 +53,14 @@ WRITE8_MEMBER( et3400_state::et3400_display_w )
static const UINT8 segments[8]={0x40,0x20,0x10,0x08,0x04,0x02,0x01,0x80};
UINT8 digit = (offset >> 4) & 7;
UINT8 segment = segments[offset & 7];
- UINT8 segdata = output_get_digit_value(digit);
+ UINT8 segdata = machine().output().get_digit_value(digit);
if (data & 1)
segdata |= segment;
else
segdata &= ~segment;
- output_set_digit_value(digit, segdata);
+ machine().output().set_digit_value(digit, segdata);
}
diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp
index d7d453b5823..93905e6ddc8 100644
--- a/src/mame/drivers/eti660.cpp
+++ b/src/mame/drivers/eti660.cpp
@@ -173,7 +173,7 @@ WRITE_LINE_MEMBER( eti660_state::q_w )
m_cti->aoe_w(state);
/* PULSE led */
- set_led_status(machine(), LED_PULSE, state);
+ machine().output().set_led_value(LED_PULSE, state);
/* tape output */
m_cassette->output(state ? 1.0 : -1.0);
diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp
index 2289cb0965b..cd87d7e62fb 100644
--- a/src/mame/drivers/fidelz80.cpp
+++ b/src/mame/drivers/fidelz80.cpp
@@ -612,23 +612,23 @@ void fidelz80_state::update_display()
if (m_led_selected&0x04)
{
- output_set_digit_value(0, out_digit);
+ machine().output().set_digit_value(0, out_digit);
- output_set_led_value(1, m_led_data);
+ machine().output().set_led_value(1, m_led_data);
}
if (m_led_selected&0x08)
{
- output_set_digit_value(1, out_digit);
+ machine().output().set_digit_value(1, out_digit);
- output_set_led_value(0, m_led_data);
+ machine().output().set_led_value(0, m_led_data);
}
if (m_led_selected&0x10)
{
- output_set_digit_value(2, out_digit);
+ machine().output().set_digit_value(2, out_digit);
}
if (m_led_selected&0x20)
{
- output_set_digit_value(3, out_digit);
+ machine().output().set_digit_value(3, out_digit);
}
}
@@ -710,22 +710,22 @@ WRITE8_MEMBER(fidelz80_state::vsc_porta_w)
if (m_kp_matrix & 0x01)
{
- output_set_digit_value(0, out_digit & 0x7f);
- output_set_value("pm_led", BIT(out_digit, 7));
+ machine().output().set_digit_value(0, out_digit & 0x7f);
+ machine().output().set_value("pm_led", BIT(out_digit, 7));
}
if (m_kp_matrix & 0x02)
{
- output_set_digit_value(1, out_digit & 0x7f);
+ machine().output().set_digit_value(1, out_digit & 0x7f);
}
if (m_kp_matrix & 0x04)
{
- output_set_digit_value(2, out_digit & 0x7f);
- output_set_value("up_dot", BIT(out_digit, 7));
+ machine().output().set_digit_value(2, out_digit & 0x7f);
+ machine().output().set_value("up_dot", BIT(out_digit, 7));
}
if (m_kp_matrix & 0x08)
{
- output_set_digit_value(3, out_digit & 0x7f);
- output_set_value("low_dot", BIT(out_digit, 7));
+ machine().output().set_digit_value(3, out_digit & 0x7f);
+ machine().output().set_value("low_dot", BIT(out_digit, 7));
}
m_speech->reg_w(data & 0x3f);
@@ -736,21 +736,21 @@ WRITE8_MEMBER(fidelz80_state::vsc_portb_w)
for (int row = 1; row <= 8; row++)
{
if (m_kp_matrix & 0x01)
- output_set_indexed_value("led_a", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_a", row, BIT(data, 8-row));
if (m_kp_matrix & 0x02)
- output_set_indexed_value("led_b", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_b", row, BIT(data, 8-row));
if (m_kp_matrix & 0x04)
- output_set_indexed_value("led_c", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_c", row, BIT(data, 8-row));
if (m_kp_matrix & 0x08)
- output_set_indexed_value("led_d", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_d", row, BIT(data, 8-row));
if (m_kp_matrix & 0x10)
- output_set_indexed_value("led_e", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_e", row, BIT(data, 8-row));
if (m_kp_matrix & 0x20)
- output_set_indexed_value("led_f", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_f", row, BIT(data, 8-row));
if (m_kp_matrix & 0x40)
- output_set_indexed_value("led_g", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_g", row, BIT(data, 8-row));
if (m_kp_matrix & 0x80)
- output_set_indexed_value("led_h", row, BIT(data, 8-row));
+ machine().output().set_indexed_value("led_h", row, BIT(data, 8-row));
}
}
@@ -822,43 +822,43 @@ WRITE8_MEMBER(fidelz80_state::kp_matrix_w)
// output the digit before update the matrix
if (m_kp_matrix & 0x01)
{
- output_set_digit_value(1, out_digit);
- output_set_led_value(8, out_led);
+ machine().output().set_digit_value(1, out_digit);
+ machine().output().set_led_value(8, out_led);
}
if (m_kp_matrix & 0x02)
{
- output_set_digit_value(2, out_digit);
- output_set_led_value(7, out_led);
+ machine().output().set_digit_value(2, out_digit);
+ machine().output().set_led_value(7, out_led);
}
if (m_kp_matrix & 0x04)
{
- output_set_digit_value(3, out_digit);
- output_set_led_value(6, out_led);
+ machine().output().set_digit_value(3, out_digit);
+ machine().output().set_led_value(6, out_led);
}
if (m_kp_matrix & 0x08)
{
- output_set_digit_value(4, out_digit);
- output_set_led_value(5, out_led);
+ machine().output().set_digit_value(4, out_digit);
+ machine().output().set_led_value(5, out_led);
}
if (m_kp_matrix & 0x10)
{
- output_set_digit_value(5, out_digit);
- output_set_led_value(4, out_led);
+ machine().output().set_digit_value(5, out_digit);
+ machine().output().set_led_value(4, out_led);
}
if (m_kp_matrix & 0x20)
{
- output_set_digit_value(6, out_digit);
- output_set_led_value(3, out_led);
+ machine().output().set_digit_value(6, out_digit);
+ machine().output().set_led_value(3, out_led);
}
if (m_kp_matrix & 0x40)
{
- output_set_digit_value(7, out_digit);
- output_set_led_value(2, out_led);
+ machine().output().set_digit_value(7, out_digit);
+ machine().output().set_led_value(2, out_led);
}
if (m_kp_matrix & 0x80)
{
- output_set_digit_value(8, out_digit);
- output_set_led_value(1, out_led);
+ machine().output().set_digit_value(8, out_digit);
+ machine().output().set_led_value(1, out_led);
}
memset(m_digit_line_status, 0, sizeof(m_digit_line_status));
diff --git a/src/mame/drivers/fireball.cpp b/src/mame/drivers/fireball.cpp
index 5b88a5802de..0200f310881 100644
--- a/src/mame/drivers/fireball.cpp
+++ b/src/mame/drivers/fireball.cpp
@@ -109,13 +109,13 @@ WRITE8_MEMBER(fireball_state::io_00_w)
switch (data&0x0f)
{
- case 1: output_set_digit_value(2, m_display_data);
+ case 1: machine().output().set_digit_value(2, m_display_data);
break;
- case 2: output_set_digit_value(1, m_display_data);
+ case 2: machine().output().set_digit_value(1, m_display_data);
break;
- case 4: output_set_digit_value(4, m_display_data);
+ case 4: machine().output().set_digit_value(4, m_display_data);
break;
- case 8: output_set_digit_value(3, m_display_data);
+ case 8: machine().output().set_digit_value(3, m_display_data);
break;
}
@@ -123,9 +123,9 @@ WRITE8_MEMBER(fireball_state::io_00_w)
if (LOG_OUTPUT)
logerror("write to 0x00 IO (X11-X11A) %02X\n",data&0xf0);
- output_set_value("Hopper1", BIT(data, 4));
- output_set_value("Hopper2", BIT(data, 5));
- output_set_value("Hopper3", BIT(data, 6));
+ machine().output().set_value("Hopper1", BIT(data, 4));
+ machine().output().set_value("Hopper2", BIT(data, 5));
+ machine().output().set_value("Hopper3", BIT(data, 6));
}
READ8_MEMBER(fireball_state::io_02_r)
@@ -144,14 +144,14 @@ WRITE8_MEMBER(fireball_state::io_02_w)
if (LOG_OUTPUT)
logerror("write to 0x00 IO (X7-X9) %02X\n",data);
- output_set_value("GameOver", BIT(data, 0));
- output_set_value("Title", BIT(data, 1));
- output_set_value("Credit", BIT(data, 2));
- output_set_value("SS", BIT(data, 3));
- output_set_value("C_LOCK", BIT(~data, 4));
- output_set_value("SV", BIT(data, 5));
- output_set_value("FBV", BIT(data, 6));
- output_set_value("RV", BIT(data, 7));
+ machine().output().set_value("GameOver", BIT(data, 0));
+ machine().output().set_value("Title", BIT(data, 1));
+ machine().output().set_value("Credit", BIT(data, 2));
+ machine().output().set_value("SS", BIT(data, 3));
+ machine().output().set_value("C_LOCK", BIT(~data, 4));
+ machine().output().set_value("SV", BIT(data, 5));
+ machine().output().set_value("FBV", BIT(data, 6));
+ machine().output().set_value("RV", BIT(data, 7));
}
READ8_MEMBER(fireball_state::io_04_r)
@@ -194,7 +194,7 @@ WRITE8_MEMBER(fireball_state::io_06_w)
if (LOG_DISPLAY2)
logerror("On board display write %02X\n",UINT8(~(data&0xff)));
- output_set_digit_value(7, UINT8(~(data&0xff)));
+ machine().output().set_digit_value(7, UINT8(~(data&0xff)));
}
@@ -443,21 +443,21 @@ INPUT_PORTS_END
void fireball_state::machine_reset()
{
int_timing=1;
- output_set_digit_value(5, 0x3f);
- output_set_digit_value(6, 0x3f);
-
- output_set_value("Hopper1", 0);
- output_set_value("Hopper2", 0);
- output_set_value("Hopper3", 0);
-
- output_set_value("GameOver", 0);
- output_set_value("Title", 0);
- output_set_value("Credit", 0);
- output_set_value("SS", 0);
- output_set_value("C_LOCK", 0);
- output_set_value("SV", 0);
- output_set_value("FBV", 0);
- output_set_value("RV", 0);
+ machine().output().set_digit_value(5, 0x3f);
+ machine().output().set_digit_value(6, 0x3f);
+
+ machine().output().set_value("Hopper1", 0);
+ machine().output().set_value("Hopper2", 0);
+ machine().output().set_value("Hopper3", 0);
+
+ machine().output().set_value("GameOver", 0);
+ machine().output().set_value("Title", 0);
+ machine().output().set_value("Credit", 0);
+ machine().output().set_value("SS", 0);
+ machine().output().set_value("C_LOCK", 0);
+ machine().output().set_value("SV", 0);
+ machine().output().set_value("FBV", 0);
+ machine().output().set_value("RV", 0);
}
/*************************
diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp
index 132b0f03130..a83ffb4a6d0 100644
--- a/src/mame/drivers/firebeat.cpp
+++ b/src/mame/drivers/firebeat.cpp
@@ -736,14 +736,14 @@ WRITE32_MEMBER(firebeat_state::lamp_output_w )
// -------- -------- -------- xxxxxxxx Status LEDs (active low)
if (ACCESSING_BITS_0_7)
{
- output_set_value("status_led_0", (data & 0x01) ? 0 : 1);
- output_set_value("status_led_1", (data & 0x02) ? 0 : 1);
- output_set_value("status_led_2", (data & 0x04) ? 0 : 1);
- output_set_value("status_led_3", (data & 0x08) ? 0 : 1);
- output_set_value("status_led_4", (data & 0x10) ? 0 : 1);
- output_set_value("status_led_5", (data & 0x20) ? 0 : 1);
- output_set_value("status_led_6", (data & 0x40) ? 0 : 1);
- output_set_value("status_led_7", (data & 0x80) ? 0 : 1);
+ machine().output().set_value("status_led_0", (data & 0x01) ? 0 : 1);
+ machine().output().set_value("status_led_1", (data & 0x02) ? 0 : 1);
+ machine().output().set_value("status_led_2", (data & 0x04) ? 0 : 1);
+ machine().output().set_value("status_led_3", (data & 0x08) ? 0 : 1);
+ machine().output().set_value("status_led_4", (data & 0x10) ? 0 : 1);
+ machine().output().set_value("status_led_5", (data & 0x20) ? 0 : 1);
+ machine().output().set_value("status_led_6", (data & 0x40) ? 0 : 1);
+ machine().output().set_value("status_led_7", (data & 0x80) ? 0 : 1);
}
// printf("lamp_output_w: %08X, %08X, %08X\n", data, offset, mem_mask);
@@ -755,16 +755,16 @@ WRITE32_MEMBER(firebeat_state::lamp_output_kbm_w )
if (ACCESSING_BITS_24_31)
{
- output_set_value("door_lamp", (data & 0x10000000) ? 1 : 0);
- output_set_value("start1p", (data & 0x01000000) ? 1 : 0);
- output_set_value("start2p", (data & 0x02000000) ? 1 : 0);
+ machine().output().set_value("door_lamp", (data & 0x10000000) ? 1 : 0);
+ machine().output().set_value("start1p", (data & 0x01000000) ? 1 : 0);
+ machine().output().set_value("start2p", (data & 0x02000000) ? 1 : 0);
}
if (ACCESSING_BITS_8_15)
{
- output_set_value("lamp1", (data & 0x00000100) ? 1 : 0);
- output_set_value("lamp2", (data & 0x00000200) ? 1 : 0);
- output_set_value("lamp3", (data & 0x00000400) ? 1 : 0);
- output_set_value("neon", (data & 0x00000800) ? 1 : 0);
+ machine().output().set_value("lamp1", (data & 0x00000100) ? 1 : 0);
+ machine().output().set_value("lamp2", (data & 0x00000200) ? 1 : 0);
+ machine().output().set_value("lamp3", (data & 0x00000400) ? 1 : 0);
+ machine().output().set_value("neon", (data & 0x00000800) ? 1 : 0);
}
}
@@ -788,25 +788,25 @@ WRITE32_MEMBER(firebeat_state::lamp_output_ppp_w )
// 0x00080000 Stage LED 7
if (ACCESSING_BITS_8_15)
{
- output_set_value("left", (data & 0x00000100) ? 1 : 0);
- output_set_value("right", (data & 0x00000200) ? 1 : 0);
- output_set_value("door_lamp", (data & 0x00000400) ? 1 : 0);
- output_set_value("ok", (data & 0x00000800) ? 1 : 0);
- output_set_value("slim", (data & 0x00008000) ? 1 : 0);
+ machine().output().set_value("left", (data & 0x00000100) ? 1 : 0);
+ machine().output().set_value("right", (data & 0x00000200) ? 1 : 0);
+ machine().output().set_value("door_lamp", (data & 0x00000400) ? 1 : 0);
+ machine().output().set_value("ok", (data & 0x00000800) ? 1 : 0);
+ machine().output().set_value("slim", (data & 0x00008000) ? 1 : 0);
}
if (ACCESSING_BITS_24_31)
{
- output_set_value("stage_led_0", (data & 0x01000000) ? 1 : 0);
- output_set_value("stage_led_1", (data & 0x02000000) ? 1 : 0);
- output_set_value("stage_led_2", (data & 0x04000000) ? 1 : 0);
- output_set_value("stage_led_3", (data & 0x08000000) ? 1 : 0);
+ machine().output().set_value("stage_led_0", (data & 0x01000000) ? 1 : 0);
+ machine().output().set_value("stage_led_1", (data & 0x02000000) ? 1 : 0);
+ machine().output().set_value("stage_led_2", (data & 0x04000000) ? 1 : 0);
+ machine().output().set_value("stage_led_3", (data & 0x08000000) ? 1 : 0);
}
if (ACCESSING_BITS_16_23)
{
- output_set_value("stage_led_4", (data & 0x00010000) ? 1 : 0);
- output_set_value("stage_led_5", (data & 0x00020000) ? 1 : 0);
- output_set_value("stage_led_6", (data & 0x00040000) ? 1 : 0);
- output_set_value("stage_led_7", (data & 0x00080000) ? 1 : 0);
+ machine().output().set_value("stage_led_4", (data & 0x00010000) ? 1 : 0);
+ machine().output().set_value("stage_led_5", (data & 0x00020000) ? 1 : 0);
+ machine().output().set_value("stage_led_6", (data & 0x00040000) ? 1 : 0);
+ machine().output().set_value("stage_led_7", (data & 0x00080000) ? 1 : 0);
}
}
@@ -830,17 +830,17 @@ WRITE32_MEMBER(firebeat_state::lamp_output2_ppp_w )
// 0x00000008 Top LED 7
if (ACCESSING_BITS_16_23)
{
- output_set_value("top_led_0", (data & 0x00010000) ? 1 : 0);
- output_set_value("top_led_1", (data & 0x00020000) ? 1 : 0);
- output_set_value("top_led_2", (data & 0x00040000) ? 1 : 0);
- output_set_value("top_led_3", (data & 0x00080000) ? 1 : 0);
+ machine().output().set_value("top_led_0", (data & 0x00010000) ? 1 : 0);
+ machine().output().set_value("top_led_1", (data & 0x00020000) ? 1 : 0);
+ machine().output().set_value("top_led_2", (data & 0x00040000) ? 1 : 0);
+ machine().output().set_value("top_led_3", (data & 0x00080000) ? 1 : 0);
}
if (ACCESSING_BITS_0_7)
{
- output_set_value("top_led_4", (data & 0x00000001) ? 1 : 0);
- output_set_value("top_led_5", (data & 0x00000002) ? 1 : 0);
- output_set_value("top_led_6", (data & 0x00000004) ? 1 : 0);
- output_set_value("top_led_7", (data & 0x00000008) ? 1 : 0);
+ machine().output().set_value("top_led_4", (data & 0x00000001) ? 1 : 0);
+ machine().output().set_value("top_led_5", (data & 0x00000002) ? 1 : 0);
+ machine().output().set_value("top_led_6", (data & 0x00000004) ? 1 : 0);
+ machine().output().set_value("top_led_7", (data & 0x00000008) ? 1 : 0);
}
}
@@ -860,10 +860,10 @@ WRITE32_MEMBER(firebeat_state::lamp_output3_ppp_w )
// 0x00400000 Lamp 3
if (ACCESSING_BITS_16_23)
{
- output_set_value("lamp_0", (data & 0x00010000) ? 1 : 0);
- output_set_value("lamp_1", (data & 0x00040000) ? 1 : 0);
- output_set_value("lamp_2", (data & 0x00100000) ? 1 : 0);
- output_set_value("lamp_3", (data & 0x00400000) ? 1 : 0);
+ machine().output().set_value("lamp_0", (data & 0x00010000) ? 1 : 0);
+ machine().output().set_value("lamp_1", (data & 0x00040000) ? 1 : 0);
+ machine().output().set_value("lamp_2", (data & 0x00100000) ? 1 : 0);
+ machine().output().set_value("lamp_3", (data & 0x00400000) ? 1 : 0);
}
}
diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp
index 5ef2b3fb8f5..ebf79daad55 100644
--- a/src/mame/drivers/firefox.cpp
+++ b/src/mame/drivers/firefox.cpp
@@ -483,7 +483,7 @@ WRITE8_MEMBER(firefox_state::self_reset_w)
WRITE8_MEMBER(firefox_state::led_w)
{
- set_led_status( machine(), offset, ( data & 0x80 ) == 0 );
+ machine().output().set_led_value(offset, ( data & 0x80 ) == 0 );
}
WRITE8_MEMBER(firefox_state::firefox_coin_counter_w)
diff --git a/src/mame/drivers/firetrk.cpp b/src/mame/drivers/firetrk.cpp
index bcde2b58259..0701db8f067 100644
--- a/src/mame/drivers/firetrk.cpp
+++ b/src/mame/drivers/firetrk.cpp
@@ -46,7 +46,7 @@ INPUT_CHANGED_MEMBER(firetrk_state::gear_changed)
if (newval)
{
m_gear = (FPTR)param;
- output_set_value("P1gear", m_gear+1);
+ machine().output().set_value("P1gear", m_gear+1);
}
}
@@ -69,16 +69,16 @@ TIMER_DEVICE_CALLBACK_MEMBER(firetrk_state::firetrk_scanline)
WRITE8_MEMBER(firetrk_state::firetrk_output_w)
{
/* BIT0 => START1 LAMP */
- set_led_status(machine(), 0, !(data & 0x01));
+ machine().output().set_led_value(0, !(data & 0x01));
/* BIT1 => START2 LAMP */
- set_led_status(machine(), 1, !(data & 0x02));
+ machine().output().set_led_value(1, !(data & 0x02));
/* BIT2 => FLASH */
m_flash = data & 0x04;
/* BIT3 => TRACK LAMP */
- set_led_status(machine(), 3, !(data & 0x08));
+ machine().output().set_led_value(3, !(data & 0x08));
/* BIT4 => ATTRACT */
m_discrete->write(space, FIRETRUCK_ATTRACT_EN, data & 0x10);
@@ -86,7 +86,7 @@ WRITE8_MEMBER(firetrk_state::firetrk_output_w)
machine().bookkeeping().coin_lockout_w(1, !(data & 0x10));
/* BIT5 => START3 LAMP */
- set_led_status(machine(), 2, !(data & 0x20));
+ machine().output().set_led_value(2, !(data & 0x20));
/* BIT6 => UNUSED */
@@ -98,7 +98,7 @@ WRITE8_MEMBER(firetrk_state::firetrk_output_w)
WRITE8_MEMBER(firetrk_state::superbug_output_w)
{
/* BIT0 => START LAMP */
- set_led_status(machine(), 0, offset & 0x01);
+ machine().output().set_led_value(0, offset & 0x01);
/* BIT1 => ATTRACT */
m_discrete->write(space, SUPERBUG_ATTRACT_EN, offset & 0x02);
@@ -109,17 +109,17 @@ WRITE8_MEMBER(firetrk_state::superbug_output_w)
m_flash = offset & 0x04;
/* BIT3 => TRACK LAMP */
- set_led_status(machine(), 1, offset & 0x08);
+ machine().output().set_led_value(1, offset & 0x08);
}
WRITE8_MEMBER(firetrk_state::montecar_output_1_w)
{
/* BIT0 => START LAMP */
- set_led_status(machine(), 0, !(data & 0x01));
+ machine().output().set_led_value(0, !(data & 0x01));
/* BIT1 => TRACK LAMP */
- set_led_status(machine(), 1, !(data & 0x02));
+ machine().output().set_led_value(1, !(data & 0x02));
/* BIT2 => ATTRACT */
m_discrete->write(space, MONTECAR_ATTRACT_INV, data & 0x04);
diff --git a/src/mame/drivers/flicker.cpp b/src/mame/drivers/flicker.cpp
index b4222b25212..5c41e3acdc7 100644
--- a/src/mame/drivers/flicker.cpp
+++ b/src/mame/drivers/flicker.cpp
@@ -127,7 +127,7 @@ WRITE8_MEMBER( flicker_state::port00_w )
{
static const UINT8 patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7d, 0x07, 0x7f, 0x6f, 0, 0, 0, 0, 0, 0 };
offset = m_maincpu->state_int(I4004_RAM); // we need the full address
- output_set_digit_value(offset, patterns[data]);
+ machine().output().set_digit_value(offset, patterns[data]);
}
WRITE8_MEMBER( flicker_state::port01_w )
diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp
index ee8125c0a2e..2ea2b0f7fec 100644
--- a/src/mame/drivers/flyball.cpp
+++ b/src/mame/drivers/flyball.cpp
@@ -276,7 +276,7 @@ WRITE8_MEMBER(flyball_state::misc_w)
switch (offset)
{
case 0:
- set_led_status(machine(), 0, bit);
+ machine().output().set_led_value(0, bit);
break;
case 1:
/* crowd very loud */
diff --git a/src/mame/drivers/foodf.cpp b/src/mame/drivers/foodf.cpp
index 78f0f945f85..ddff1368928 100644
--- a/src/mame/drivers/foodf.cpp
+++ b/src/mame/drivers/foodf.cpp
@@ -168,8 +168,8 @@ WRITE8_MEMBER(foodf_state::digital_w)
if (!(data & 0x08))
video_int_ack_w(space,0,0);
- output_set_led_value(0, (data >> 4) & 1);
- output_set_led_value(1, (data >> 5) & 1);
+ machine().output().set_led_value(0, (data >> 4) & 1);
+ machine().output().set_led_value(1, (data >> 5) & 1);
machine().bookkeeping().coin_counter_w(0, (data >> 6) & 1);
machine().bookkeeping().coin_counter_w(1, (data >> 7) & 1);
diff --git a/src/mame/drivers/fortecar.cpp b/src/mame/drivers/fortecar.cpp
index 979585829a3..ebca2fa3644 100644
--- a/src/mame/drivers/fortecar.cpp
+++ b/src/mame/drivers/fortecar.cpp
@@ -487,7 +487,7 @@ WRITE8_MEMBER(fortecar_state::ayporta_w)
int i;
for(i = 0; i < 8; i++)
- output_set_lamp_value(i, (data >> i) & 1);
+ machine().output().set_lamp_value(i, (data >> i) & 1);
}
diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp
index 67735df765a..f3e4b7fc409 100644
--- a/src/mame/drivers/funworld.cpp
+++ b/src/mame/drivers/funworld.cpp
@@ -1015,17 +1015,17 @@ WRITE8_MEMBER(funworld_state::funworld_lamp_a_w)
-x-- ---- Hopper Motor (inverted).
x--- ---- HOLD4 lamp.
*/
- output_set_lamp_value(0, 1-((data >> 1) & 1)); /* Hold1 (inverted) */
- output_set_lamp_value(2, 1-((data >> 1) & 1)); /* Hold3 (inverted, see pinouts) */
+ machine().output().set_lamp_value(0, 1-((data >> 1) & 1)); /* Hold1 (inverted) */
+ machine().output().set_lamp_value(2, 1-((data >> 1) & 1)); /* Hold3 (inverted, see pinouts) */
- output_set_lamp_value(1, 1-((data >> 3) & 1)); /* Hold2 / Low (inverted) */
- output_set_lamp_value(3, (data >> 7) & 1); /* Hold4 / High */
- output_set_lamp_value(5, 1-((data >> 5) & 1)); /* Cancel / Collect (inverted) */
+ machine().output().set_lamp_value(1, 1-((data >> 3) & 1)); /* Hold2 / Low (inverted) */
+ machine().output().set_lamp_value(3, (data >> 7) & 1); /* Hold4 / High */
+ machine().output().set_lamp_value(5, 1-((data >> 5) & 1)); /* Cancel / Collect (inverted) */
machine().bookkeeping().coin_counter_w(0, data & 0x01); /* Credit In counter */
machine().bookkeeping().coin_counter_w(7, data & 0x04); /* Credit Out counter, mapped as coin 8 */
- output_set_lamp_value(7, 1-((data >> 6) & 1)); /* Hopper Motor (inverted) */
+ machine().output().set_lamp_value(7, 1-((data >> 6) & 1)); /* Hopper Motor (inverted) */
// popmessage("Lamps A: %02X", (data ^ 0xff));
}
@@ -1039,8 +1039,8 @@ WRITE8_MEMBER(funworld_state::funworld_lamp_b_w)
---- -x-- Unknown (inverted).
xxxx x--- Unknown.
*/
- output_set_lamp_value(4, (data >> 0) & 1); /* Hold5 / Bet */
- output_set_lamp_value(6, (data >> 1) & 1); /* Start / Deal / Draw */
+ machine().output().set_lamp_value(4, (data >> 0) & 1); /* Hold5 / Bet */
+ machine().output().set_lamp_value(6, (data >> 1) & 1); /* Start / Deal / Draw */
// popmessage("Lamps B: %02X", data);
}
diff --git a/src/mame/drivers/g627.cpp b/src/mame/drivers/g627.cpp
index c3b19d87b6c..2bd29cdf463 100644
--- a/src/mame/drivers/g627.cpp
+++ b/src/mame/drivers/g627.cpp
@@ -205,22 +205,22 @@ WRITE8_MEMBER( g627_state::portc_w )
m_portc = data;
if ((m_type) && (data < 6))
{
- output_set_digit_value(data, m_seg[0]);
- output_set_digit_value(10 + data, m_seg[1]);
- output_set_digit_value(20 + data, m_seg[2]);
- output_set_digit_value(30 + data, m_seg[3]);
- output_set_digit_value(50 + data, m_seg[5]);
+ machine().output().set_digit_value(data, m_seg[0]);
+ machine().output().set_digit_value(10 + data, m_seg[1]);
+ machine().output().set_digit_value(20 + data, m_seg[2]);
+ machine().output().set_digit_value(30 + data, m_seg[3]);
+ machine().output().set_digit_value(50 + data, m_seg[5]);
}
else
if ((!m_type) && (data))
{
data--;
- output_set_digit_value(data, m_seg[0]);
- output_set_digit_value(10 + data, m_seg[1]);
- output_set_digit_value(20 + data, m_seg[2]);
- output_set_digit_value(30 + data, m_seg[3]);
- output_set_digit_value(50 + data, m_seg[5]);
+ machine().output().set_digit_value(data, m_seg[0]);
+ machine().output().set_digit_value(10 + data, m_seg[1]);
+ machine().output().set_digit_value(20 + data, m_seg[2]);
+ machine().output().set_digit_value(30 + data, m_seg[3]);
+ machine().output().set_digit_value(50 + data, m_seg[5]);
}
}
diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp
index 55541922615..fafa98234a4 100644
--- a/src/mame/drivers/galaga.cpp
+++ b/src/mame/drivers/galaga.cpp
@@ -783,8 +783,8 @@ CUSTOM_INPUT_MEMBER(digdug_state::shifted_port_r){ return ioport((const char *)p
WRITE8_MEMBER(galaga_state::out_0)
{
- set_led_status(machine(), 1,data & 1);
- set_led_status(machine(), 0,data & 2);
+ machine().output().set_led_value(1,data & 1);
+ machine().output().set_led_value(0,data & 2);
machine().bookkeeping().coin_counter_w(1,~data & 4);
machine().bookkeeping().coin_counter_w(0,~data & 8);
}
diff --git a/src/mame/drivers/galaxi.cpp b/src/mame/drivers/galaxi.cpp
index e65eb04bbe9..0397009646e 100644
--- a/src/mame/drivers/galaxi.cpp
+++ b/src/mame/drivers/galaxi.cpp
@@ -257,12 +257,12 @@ WRITE16_MEMBER(galaxi_state::galaxi_500004_w)
-x-- ---- Payout.
*/
- output_set_lamp_value(1, (data & 1)); /* Lamp 1 - HOLD 1 */
- output_set_lamp_value(2, (data >> 1) & 1); /* Lamp 2 - HOLD 2 */
- output_set_lamp_value(3, (data >> 2) & 1); /* Lamp 3 - HOLD 3 */
- output_set_lamp_value(4, (data >> 3) & 1); /* Lamp 4 - HOLD 4 */
- output_set_lamp_value(5, (data >> 4) & 1); /* Lamp 5 - HOLD 5 */
- output_set_lamp_value(6, (data >> 5) & 1); /* Lamp 6 - START */
+ machine().output().set_lamp_value(1, (data & 1)); /* Lamp 1 - HOLD 1 */
+ machine().output().set_lamp_value(2, (data >> 1) & 1); /* Lamp 2 - HOLD 2 */
+ machine().output().set_lamp_value(3, (data >> 2) & 1); /* Lamp 3 - HOLD 3 */
+ machine().output().set_lamp_value(4, (data >> 3) & 1); /* Lamp 4 - HOLD 4 */
+ machine().output().set_lamp_value(5, (data >> 4) & 1); /* Lamp 5 - HOLD 5 */
+ machine().output().set_lamp_value(6, (data >> 5) & 1); /* Lamp 6 - START */
}
if (ACCESSING_BITS_8_15)
{
diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp
index f943a4541f1..c3669c936cb 100644
--- a/src/mame/drivers/galaxian.cpp
+++ b/src/mame/drivers/galaxian.cpp
@@ -717,7 +717,7 @@ WRITE8_MEMBER(galaxian_state::start_lamp_w)
{
/* offset 0 = 1P START LAMP */
/* offset 1 = 2P START LAMP */
- set_led_status(machine(), offset, data & 1);
+ machine().output().set_led_value(offset, data & 1);
}
diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp
index 4ea2eb3203b..9d4f683ab26 100644
--- a/src/mame/drivers/gaplus.cpp
+++ b/src/mame/drivers/gaplus.cpp
@@ -474,8 +474,8 @@ static const char *const gaplus_sample_names[] =
WRITE8_MEMBER(gaplus_state::out_lamps0)
{
- set_led_status(machine(), 0, data & 1);
- set_led_status(machine(), 1, data & 2);
+ machine().output().set_led_value(0, data & 1);
+ machine().output().set_led_value(1, data & 2);
machine().bookkeeping().coin_lockout_global_w(data & 4);
machine().bookkeeping().coin_counter_w(0, ~data & 8);
}
diff --git a/src/mame/drivers/gatron.cpp b/src/mame/drivers/gatron.cpp
index 707bc13ce5c..70cebbc93c7 100644
--- a/src/mame/drivers/gatron.cpp
+++ b/src/mame/drivers/gatron.cpp
@@ -410,13 +410,13 @@ WRITE8_MEMBER(gatron_state::output_port_0_w)
.x.. .... --> Change Card / Take / Low.
*/
- output_set_lamp_value(0, (data) & 1); /* hold3 lamp */
- output_set_lamp_value(1, (data >> 1) & 1); /* hold4 lamp */
- output_set_lamp_value(2, (data >> 2) & 1); /* hold5 lamp */
- output_set_lamp_value(3, (data >> 3) & 1); /* ante/bet lamp */
- output_set_lamp_value(4, (data >> 4) & 1); /* start lamp */
- output_set_lamp_value(5, (data >> 5) & 1); /* deal/hit lamp */
- output_set_lamp_value(6, (data >> 6) & 1); /* stand/fbdraw lamp */
+ machine().output().set_lamp_value(0, (data) & 1); /* hold3 lamp */
+ machine().output().set_lamp_value(1, (data >> 1) & 1); /* hold4 lamp */
+ machine().output().set_lamp_value(2, (data >> 2) & 1); /* hold5 lamp */
+ machine().output().set_lamp_value(3, (data >> 3) & 1); /* ante/bet lamp */
+ machine().output().set_lamp_value(4, (data >> 4) & 1); /* start lamp */
+ machine().output().set_lamp_value(5, (data >> 5) & 1); /* deal/hit lamp */
+ machine().output().set_lamp_value(6, (data >> 6) & 1); /* stand/fbdraw lamp */
}
@@ -435,8 +435,8 @@ WRITE8_MEMBER(gatron_state::output_port_1_w)
x... .... --> Inverted pulse. Related to counters.
*/
- output_set_lamp_value(7, (data) & 1); /* hold2 lamp */
- output_set_lamp_value(8, (data >> 1) & 1); /* hold1 lamp */
+ machine().output().set_lamp_value(7, (data) & 1); /* hold2 lamp */
+ machine().output().set_lamp_value(8, (data >> 1) & 1); /* hold1 lamp */
}
/*************************
diff --git a/src/mame/drivers/gei.cpp b/src/mame/drivers/gei.cpp
index a1ccf346831..7b606beef31 100644
--- a/src/mame/drivers/gei.cpp
+++ b/src/mame/drivers/gei.cpp
@@ -189,24 +189,24 @@ UINT32 gei_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, con
WRITE8_MEMBER(gei_state::lamps_w)
{
/* 5 button lamps */
- set_led_status(machine(), 0,data & 0x01);
- set_led_status(machine(), 1,data & 0x02);
- set_led_status(machine(), 2,data & 0x04);
- set_led_status(machine(), 3,data & 0x08);
- set_led_status(machine(), 4,data & 0x10);
+ machine().output().set_led_value(0,data & 0x01);
+ machine().output().set_led_value(1,data & 0x02);
+ machine().output().set_led_value(2,data & 0x04);
+ machine().output().set_led_value(3,data & 0x08);
+ machine().output().set_led_value(4,data & 0x10);
/* 3 button lamps for deal, cancel, stand in poker games;
lamp order verified in poker and selection self tests */
- set_led_status(machine(), 7,data & 0x20);
- set_led_status(machine(), 5,data & 0x40);
- set_led_status(machine(), 6,data & 0x80);
+ machine().output().set_led_value(7,data & 0x20);
+ machine().output().set_led_value(5,data & 0x40);
+ machine().output().set_led_value(6,data & 0x80);
}
WRITE8_MEMBER(gei_state::sound_w)
{
/* bit 3 - coin lockout, lamp10 in poker / lamp6 in trivia test modes */
machine().bookkeeping().coin_lockout_global_w(~data & 0x08);
- set_led_status(machine(), 9,data & 0x08);
+ machine().output().set_led_value(9,data & 0x08);
/* bit 5 - ticket out in trivia games */
if (m_ticket != nullptr)
@@ -224,13 +224,13 @@ WRITE8_MEMBER(gei_state::sound2_w)
/* bit 3,6 - coin lockout, lamp10+11 in selection test mode */
machine().bookkeeping().coin_lockout_w(0, ~data & 0x08);
machine().bookkeeping().coin_lockout_w(1, ~data & 0x40);
- set_led_status(machine(), 9,data & 0x08);
- set_led_status(machine(), 10,data & 0x40);
+ machine().output().set_led_value(9,data & 0x08);
+ machine().output().set_led_value(10,data & 0x40);
/* bit 4,5 - lamps 12, 13 in selection test mode;
12 lights up if dsw maximum bet = 30 an bet > 15 or if dsw maximum bet = 10 an bet = 10 */
- set_led_status(machine(), 11,data & 0x10);
- set_led_status(machine(), 12,data & 0x20);
+ machine().output().set_led_value(11,data & 0x10);
+ machine().output().set_led_value(12,data & 0x20);
/* bit 7 goes directly to the sound amplifier */
m_dac->write(((data & 0x80) >> 7) * 255);
@@ -239,13 +239,13 @@ WRITE8_MEMBER(gei_state::sound2_w)
WRITE8_MEMBER(gei_state::lamps2_w)
{
/* bit 4 - play/raise button lamp, lamp 9 in poker test mode */
- set_led_status(machine(), 8,data & 0x10);
+ machine().output().set_led_value(8,data & 0x10);
}
WRITE8_MEMBER(gei_state::nmi_w)
{
/* bit 4 - play/raise button lamp, lamp 9 in selection test mode */
- set_led_status(machine(), 8,data & 0x10);
+ machine().output().set_led_value(8,data & 0x10);
/* bit 6 enables NMI */
m_nmi_mask = data & 0x40;
diff --git a/src/mame/drivers/ggconnie.cpp b/src/mame/drivers/ggconnie.cpp
index 44dd93a3f8a..0fd5021af20 100644
--- a/src/mame/drivers/ggconnie.cpp
+++ b/src/mame/drivers/ggconnie.cpp
@@ -47,7 +47,7 @@ public:
WRITE8_MEMBER(ggconnie_state::lamp_w)
{
- output_set_value("lamp", !BIT(data,0));
+ machine().output().set_value("lamp", !BIT(data,0));
}
WRITE8_MEMBER(ggconnie_state::output_w)
diff --git a/src/mame/drivers/glasgow.cpp b/src/mame/drivers/glasgow.cpp
index 20a5e2bbf18..02cd8f995c3 100644
--- a/src/mame/drivers/glasgow.cpp
+++ b/src/mame/drivers/glasgow.cpp
@@ -100,7 +100,7 @@ WRITE16_MEMBER( glasgow_state::glasgow_lcd_w )
UINT8 lcd_data = data >> 8;
if (m_led7 == 0)
- output_set_digit_value(m_lcd_shift_counter, lcd_data);
+ machine().output().set_digit_value(m_lcd_shift_counter, lcd_data);
m_lcd_shift_counter--;
m_lcd_shift_counter &= 3;
@@ -146,7 +146,7 @@ WRITE16_MEMBER( glasgow_state::write_lcd )
{
UINT8 lcd_data = data >> 8;
- output_set_digit_value(m_lcd_shift_counter, mboard_lcd_invert & 1 ? lcd_data^0xff : lcd_data);
+ machine().output().set_digit_value(m_lcd_shift_counter, mboard_lcd_invert & 1 ? lcd_data^0xff : lcd_data);
m_lcd_shift_counter--;
m_lcd_shift_counter &= 3;
logerror("LCD Offset = %d Data low = %x \n", offset, lcd_data);
@@ -218,7 +218,7 @@ WRITE32_MEMBER( glasgow_state::write_lcd32 )
{
UINT8 lcd_data = data >> 8;
- output_set_digit_value(m_lcd_shift_counter, mboard_lcd_invert & 1 ? lcd_data^0xff : lcd_data);
+ machine().output().set_digit_value(m_lcd_shift_counter, mboard_lcd_invert & 1 ? lcd_data^0xff : lcd_data);
m_lcd_shift_counter--;
m_lcd_shift_counter &= 3;
//logerror("LCD Offset = %d Data = %x \n ", offset, lcd_data);
diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp
index b60e31d25f2..4db151128d7 100644
--- a/src/mame/drivers/goldnpkr.cpp
+++ b/src/mame/drivers/goldnpkr.cpp
@@ -1502,11 +1502,11 @@ WRITE8_MEMBER(goldnpkr_state::lamps_a_w)
*/
data = data ^ 0xff;
- output_set_lamp_value(0, (data) & 1); /* Lamp 0 */
- output_set_lamp_value(1, (data >> 1) & 1); /* Lamp 1 */
- output_set_lamp_value(2, (data >> 2) & 1); /* Lamp 2 */
- output_set_lamp_value(3, (data >> 3) & 1); /* Lamp 3 */
- output_set_lamp_value(4, (data >> 4) & 1); /* Lamp 4 */
+ machine().output().set_lamp_value(0, (data) & 1); /* Lamp 0 */
+ machine().output().set_lamp_value(1, (data >> 1) & 1); /* Lamp 1 */
+ machine().output().set_lamp_value(2, (data >> 2) & 1); /* Lamp 2 */
+ machine().output().set_lamp_value(3, (data >> 3) & 1); /* Lamp 3 */
+ machine().output().set_lamp_value(4, (data >> 4) & 1); /* Lamp 4 */
machine().bookkeeping().coin_counter_w(0, data & 0x40); /* counter1 */
machine().bookkeeping().coin_counter_w(1, data & 0x80); /* counter2 */
diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp
index 4001d09fbf2..26bee73ff43 100644
--- a/src/mame/drivers/goldstar.cpp
+++ b/src/mame/drivers/goldstar.cpp
@@ -266,28 +266,28 @@ WRITE8_MEMBER(goldstar_state::p1_lamps_w)
skill98 is like schery97 but doesn't activate bit 0 for stop
nfb96, roypok96 and nc96 sets are like schery97 but they don't activate bit 2 for select
*/
- output_set_lamp_value(0, (data >> 0) & 1);
- output_set_lamp_value(1, (data >> 1) & 1);
- output_set_lamp_value(2, (data >> 2) & 1);
- output_set_lamp_value(3, (data >> 3) & 1);
- output_set_lamp_value(4, (data >> 4) & 1);
- output_set_lamp_value(5, (data >> 5) & 1);
- output_set_lamp_value(6, (data >> 6) & 1);
- output_set_lamp_value(7, (data >> 7) & 1);
+ machine().output().set_lamp_value(0, (data >> 0) & 1);
+ machine().output().set_lamp_value(1, (data >> 1) & 1);
+ machine().output().set_lamp_value(2, (data >> 2) & 1);
+ machine().output().set_lamp_value(3, (data >> 3) & 1);
+ machine().output().set_lamp_value(4, (data >> 4) & 1);
+ machine().output().set_lamp_value(5, (data >> 5) & 1);
+ machine().output().set_lamp_value(6, (data >> 6) & 1);
+ machine().output().set_lamp_value(7, (data >> 7) & 1);
// popmessage("p1 lamps: %02X", data);
}
WRITE8_MEMBER(goldstar_state::p2_lamps_w)
{
- output_set_lamp_value(8 + 0, (data >> 0) & 1);
- output_set_lamp_value(8 + 1, (data >> 1) & 1);
- output_set_lamp_value(8 + 2, (data >> 2) & 1);
- output_set_lamp_value(8 + 3, (data >> 3) & 1);
- output_set_lamp_value(8 + 4, (data >> 4) & 1);
- output_set_lamp_value(8 + 5, (data >> 5) & 1);
- output_set_lamp_value(8 + 6, (data >> 6) & 1);
- output_set_lamp_value(8 + 7, (data >> 7) & 1);
+ machine().output().set_lamp_value(8 + 0, (data >> 0) & 1);
+ machine().output().set_lamp_value(8 + 1, (data >> 1) & 1);
+ machine().output().set_lamp_value(8 + 2, (data >> 2) & 1);
+ machine().output().set_lamp_value(8 + 3, (data >> 3) & 1);
+ machine().output().set_lamp_value(8 + 4, (data >> 4) & 1);
+ machine().output().set_lamp_value(8 + 5, (data >> 5) & 1);
+ machine().output().set_lamp_value(8 + 6, (data >> 6) & 1);
+ machine().output().set_lamp_value(8 + 7, (data >> 7) & 1);
// popmessage("p2 lamps: %02X", data);
}
@@ -1053,12 +1053,12 @@ WRITE8_MEMBER(unkch_state::unkcm_0x02_w)
m_vblank_irq_enable = data & 0x80;
- output_set_lamp_value(0, (data >> 0) & 1); /* Bet-A / Stop 2 */
- output_set_lamp_value(1, (data >> 1) & 1); /* Start / Stop All */
- output_set_lamp_value(2, (data >> 2) & 1); /* Info / Small / Stop 3 */
- output_set_lamp_value(3, (data >> 3) & 1); /* Big */
- output_set_lamp_value(4, (data >> 4) & 1); /* Bet-B / D-Up */
- output_set_lamp_value(5, (data >> 5) & 1); /* Take / Stop 1 */
+ machine().output().set_lamp_value(0, (data >> 0) & 1); /* Bet-A / Stop 2 */
+ machine().output().set_lamp_value(1, (data >> 1) & 1); /* Start / Stop All */
+ machine().output().set_lamp_value(2, (data >> 2) & 1); /* Info / Small / Stop 3 */
+ machine().output().set_lamp_value(3, (data >> 3) & 1); /* Big */
+ machine().output().set_lamp_value(4, (data >> 4) & 1); /* Bet-B / D-Up */
+ machine().output().set_lamp_value(5, (data >> 5) & 1); /* Take / Stop 1 */
}
WRITE8_MEMBER(unkch_state::unkcm_0x03_w)
diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp
index 1118a330455..b03a45a4a85 100644
--- a/src/mame/drivers/gottlieb.cpp
+++ b/src/mame/drivers/gottlieb.cpp
@@ -323,9 +323,9 @@ WRITE8_MEMBER(gottlieb_state::reactor_output_w)
{
general_output_w(space, offset, data & ~0xe0);
- set_led_status(machine(), 0, data & 0x20);
- set_led_status(machine(), 1, data & 0x40);
- set_led_status(machine(), 2, data & 0x80);
+ machine().output().set_led_value(0, data & 0x20);
+ machine().output().set_led_value(1, data & 0x40);
+ machine().output().set_led_value(2, data & 0x80);
}
WRITE8_MEMBER(gottlieb_state::qbert_output_w)
@@ -653,7 +653,7 @@ void gottlieb_state::laserdisc_audio_process(laserdisc_device &device, int sampl
void gottlieb_state::qbert_knocker(UINT8 knock)
{
- output_set_value("knocker0", knock);
+ machine().output().set_value("knocker0", knock);
// start sound on rising edge
if (knock & ~m_knocker_prev)
diff --git a/src/mame/drivers/gp_1.cpp b/src/mame/drivers/gp_1.cpp
index 3e0dabf219b..90607468e44 100644
--- a/src/mame/drivers/gp_1.cpp
+++ b/src/mame/drivers/gp_1.cpp
@@ -349,10 +349,10 @@ WRITE8_MEMBER( gp_1_state::porta_w )
else
if (m_u14 == 8)
{
- output_set_digit_value(m_digit, patterns[m_segment[8]]);
- output_set_digit_value(m_digit+8, patterns[m_segment[9]]);
- output_set_digit_value(m_digit+16, patterns[m_segment[10]]);
- output_set_digit_value(m_digit+24, patterns[m_segment[11]]);
+ machine().output().set_digit_value(m_digit, patterns[m_segment[8]]);
+ machine().output().set_digit_value(m_digit+8, patterns[m_segment[9]]);
+ machine().output().set_digit_value(m_digit+16, patterns[m_segment[10]]);
+ machine().output().set_digit_value(m_digit+24, patterns[m_segment[11]]);
}
}
@@ -393,7 +393,7 @@ WRITE8_MEMBER( gp_1_state::portas_w )
WRITE8_MEMBER( gp_1_state::portc_w )
{
- output_set_value("led0", !BIT(data, 3));
+ machine().output().set_value("led0", !BIT(data, 3));
m_digit = data & 7;
}
diff --git a/src/mame/drivers/gp_2.cpp b/src/mame/drivers/gp_2.cpp
index 11e2222720b..0294d4c7575 100644
--- a/src/mame/drivers/gp_2.cpp
+++ b/src/mame/drivers/gp_2.cpp
@@ -536,17 +536,17 @@ WRITE8_MEMBER( gp_2_state::porta_w )
else
if (m_u14 == 7)
{
- output_set_digit_value(m_digit, patterns[m_segment[7]]);
- output_set_digit_value(m_digit+8, patterns[m_segment[8]]);
- output_set_digit_value(m_digit+16, patterns[m_segment[9]]);
- output_set_digit_value(m_digit+24, patterns[m_segment[10]]);
- output_set_digit_value(m_digit+32, patterns[m_segment[11]]);
+ machine().output().set_digit_value(m_digit, patterns[m_segment[7]]);
+ machine().output().set_digit_value(m_digit+8, patterns[m_segment[8]]);
+ machine().output().set_digit_value(m_digit+16, patterns[m_segment[9]]);
+ machine().output().set_digit_value(m_digit+24, patterns[m_segment[10]]);
+ machine().output().set_digit_value(m_digit+32, patterns[m_segment[11]]);
}
}
WRITE8_MEMBER( gp_2_state::portc_w )
{
- output_set_value("led0", !BIT(data, 3));
+ machine().output().set_value("led0", !BIT(data, 3));
m_digit = data & 7;
}
diff --git a/src/mame/drivers/grchamp.cpp b/src/mame/drivers/grchamp.cpp
index 9cfe75dbc7a..9e53d043826 100644
--- a/src/mame/drivers/grchamp.cpp
+++ b/src/mame/drivers/grchamp.cpp
@@ -179,7 +179,7 @@ WRITE8_MEMBER(grchamp_state::cpu0_outputs_w)
/* bit 5: Game Over lamp */
/* bit 6-7: n/c */
machine().bookkeeping().coin_lockout_global_w((data >> 4) & 1);
- output_set_value("led0", (~data >> 5) & 1);
+ machine().output().set_value("led0", (~data >> 5) & 1);
break;
case 0x0a: /* OUT10 */
@@ -228,7 +228,7 @@ WRITE8_MEMBER(grchamp_state::led_board_w)
case 0x0c:
m_ledram[m_ledaddr & 0x07] = m_ledlatch;
- output_set_digit_value(m_ledaddr & 0x07, ls247_map[m_ledram[m_ledaddr & 0x07] & 0x0f]);
+ machine().output().set_digit_value(m_ledaddr & 0x07, ls247_map[m_ledram[m_ledaddr & 0x07] & 0x0f]);
/*
ledram[0] & 0x0f = score LSD
ledram[1] & 0x0f = score
diff --git a/src/mame/drivers/gridlee.cpp b/src/mame/drivers/gridlee.cpp
index 4dbd748e980..1beb029ad2f 100644
--- a/src/mame/drivers/gridlee.cpp
+++ b/src/mame/drivers/gridlee.cpp
@@ -269,14 +269,14 @@ READ8_MEMBER(gridlee_state::random_num_r)
WRITE8_MEMBER(gridlee_state::led_0_w)
{
- set_led_status(machine(), 0, data & 1);
+ machine().output().set_led_value(0, data & 1);
logerror("LED 0 %s\n", (data & 1) ? "on" : "off");
}
WRITE8_MEMBER(gridlee_state::led_1_w)
{
- set_led_status(machine(), 1, data & 1);
+ machine().output().set_led_value(1, data & 1);
logerror("LED 1 %s\n", (data & 1) ? "on" : "off");
}
diff --git a/src/mame/drivers/gts1.cpp b/src/mame/drivers/gts1.cpp
index 7a0ebd6bbab..a551ce5efaf 100644
--- a/src/mame/drivers/gts1.cpp
+++ b/src/mame/drivers/gts1.cpp
@@ -461,8 +461,8 @@ WRITE8_MEMBER(gts1_state::gts1_display_w)
UINT8 b = ttl7448_mod[(data >> 4) & 15];
// LOG(("%s: offset:%d data:%02x a:%02x b:%02x\n", __FUNCTION__, offset, data, a, b));
if ((offset % 8) < 7) {
- output_set_indexed_value("digit8_", offset, a);
- output_set_indexed_value("digit8_", offset + 16, b);
+ machine().output().set_indexed_value("digit8_", offset, a);
+ machine().output().set_indexed_value("digit8_", offset + 16, b);
} else {
/*
* For the 4 7-seg displays the segment h is turned back into
@@ -472,9 +472,9 @@ WRITE8_MEMBER(gts1_state::gts1_display_w)
a = _b | _c;
if (b & _h)
b = _b | _c;
- output_set_indexed_value("digit7_", offset, a);
+ machine().output().set_indexed_value("digit7_", offset, a);
// FIXME: there is nothing on outputs 22, 23, 30 and 31?
- output_set_indexed_value("digit7_", offset + 16, b);
+ machine().output().set_indexed_value("digit7_", offset + 16, b);
}
#undef _a
#undef _b
diff --git a/src/mame/drivers/gts3.cpp b/src/mame/drivers/gts3.cpp
index 17fc7d7029a..98814251d29 100644
--- a/src/mame/drivers/gts3.cpp
+++ b/src/mame/drivers/gts3.cpp
@@ -220,7 +220,7 @@ WRITE8_MEMBER( gts3_state::segbank_w )
m_segment[offset] = data;
seg1 = m_segment[offset&2] | (m_segment[offset|1] << 8);
seg2 = BITSWAP32(seg1,16,16,16,16,16,16,16,16,16,16,16,16,16,16,15,14,9,7,13,11,10,6,8,12,5,4,3,3,2,1,0,0);
- output_set_digit_value(m_digit+(BIT(offset, 1) ? 0 : 20), seg2);
+ machine().output().set_digit_value(m_digit+(BIT(offset, 1) ? 0 : 20), seg2);
}
WRITE8_MEMBER( gts3_state::u4b_w )
diff --git a/src/mame/drivers/gts3a.cpp b/src/mame/drivers/gts3a.cpp
index 69ec8f25ae9..8b737c29941 100644
--- a/src/mame/drivers/gts3a.cpp
+++ b/src/mame/drivers/gts3a.cpp
@@ -229,7 +229,7 @@ WRITE8_MEMBER( gts3a_state::segbank_w )
m_segment[offset] = data;
seg1 = m_segment[offset&2] | (m_segment[offset|1] << 8);
seg2 = BITSWAP32(seg1,16,16,16,16,16,16,16,16,16,16,16,16,16,16,15,14,9,7,13,11,10,6,8,12,5,4,3,3,2,1,0,0);
- output_set_digit_value(m_digit+(BIT(offset, 1) ? 0 : 20), seg2);
+ machine().output().set_digit_value(m_digit+(BIT(offset, 1) ? 0 : 20), seg2);
}
WRITE8_MEMBER( gts3a_state::u4b_w )
diff --git a/src/mame/drivers/gts80.cpp b/src/mame/drivers/gts80.cpp
index ae48fffa0a6..4d281f33bf1 100644
--- a/src/mame/drivers/gts80.cpp
+++ b/src/mame/drivers/gts80.cpp
@@ -298,15 +298,15 @@ WRITE8_MEMBER( gts80_state::port2a_w )
{
case 0x10: // player 1&2
if (!BIT(m_segment, 7)) seg2 |= 0x300; // put '1' in the middle
- output_set_digit_value(data & 15, seg2);
+ machine().output().set_digit_value(data & 15, seg2);
break;
case 0x20: // player 3&4
if (!BIT(m_segment, 7)) seg2 |= 0x300; // put '1' in the middle
- output_set_digit_value((data & 15)+20, seg2);
+ machine().output().set_digit_value((data & 15)+20, seg2);
break;
case 0x40: // credits & balls
if (!BIT(m_segment, 7)) m_segment = 1; // turn '1' back to normal
- output_set_digit_value((data & 15)+40, patterns[m_segment & 15]);
+ machine().output().set_digit_value((data & 15)+40, patterns[m_segment & 15]);
break;
}
}
diff --git a/src/mame/drivers/gts80a.cpp b/src/mame/drivers/gts80a.cpp
index fe85091f904..2fed0e9d483 100644
--- a/src/mame/drivers/gts80a.cpp
+++ b/src/mame/drivers/gts80a.cpp
@@ -287,15 +287,15 @@ WRITE8_MEMBER( gts80a_state::port2a_w )
{
case 0x10: // player 1&2
if (!BIT(m_segment, 7)) seg2 |= 0x300; // put '1' in the middle
- output_set_digit_value(data & 15, seg2);
+ machine().output().set_digit_value(data & 15, seg2);
break;
case 0x20: // player 3&4
if (!BIT(m_segment, 7)) seg2 |= 0x300; // put '1' in the middle
- output_set_digit_value((data & 15)+20, seg2);
+ machine().output().set_digit_value((data & 15)+20, seg2);
break;
case 0x40: // credits & balls
if (!BIT(m_segment, 7)) m_segment = 1; // turn '1' back to normal
- output_set_digit_value((data & 15)+40, patterns[m_segment & 15]);
+ machine().output().set_digit_value((data & 15)+40, patterns[m_segment & 15]);
break;
}
}
diff --git a/src/mame/drivers/gts80b.cpp b/src/mame/drivers/gts80b.cpp
index bc12e1aece7..3d9dedc0eef 100644
--- a/src/mame/drivers/gts80b.cpp
+++ b/src/mame/drivers/gts80b.cpp
@@ -334,7 +334,7 @@ WRITE8_MEMBER( gts80b_state::port2b_w )
{ // display a character
segment = patterns[m_dispcmd & 0x7f]; // ignore blank/inverse bit
segment = BITSWAP16(segment, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 3, 2, 1, 0, 0);
- output_set_digit_value(m_digit[i]+i*20, segment);
+ machine().output().set_digit_value(m_digit[i]+i*20, segment);
m_digit[i]++; // auto-increment pointer
if (m_digit[i] > 19) m_digit[i] = 0; // check for overflow
}
diff --git a/src/mame/drivers/gunbustr.cpp b/src/mame/drivers/gunbustr.cpp
index 515663f0bb8..83ab19a32a5 100644
--- a/src/mame/drivers/gunbustr.cpp
+++ b/src/mame/drivers/gunbustr.cpp
@@ -122,9 +122,9 @@ WRITE32_MEMBER(gunbustr_state::motor_control_w)
{
// Standard value poked into MSW is 0x3c00
// (0x2000 and zero are written at startup)
- output_set_value("Player1_Gun_Recoil", (data & 0x1000000) ? 1 : 0);
- output_set_value("Player2_Gun_Recoil", (data & 0x10000) ? 1 : 0);
- output_set_value("Hit_lamp", (data & 0x40000) ? 1 : 0);
+ machine().output().set_value("Player1_Gun_Recoil", (data & 0x1000000) ? 1 : 0);
+ machine().output().set_value("Player2_Gun_Recoil", (data & 0x10000) ? 1 : 0);
+ machine().output().set_value("Hit_lamp", (data & 0x40000) ? 1 : 0);
}
diff --git a/src/mame/drivers/h8.cpp b/src/mame/drivers/h8.cpp
index 8cd33b18201..a71fc03b154 100644
--- a/src/mame/drivers/h8.cpp
+++ b/src/mame/drivers/h8.cpp
@@ -144,9 +144,9 @@ WRITE8_MEMBER( h8_state::portf0_w )
// d7 = beeper enable
m_digit = data & 15;
- if (m_digit) output_set_digit_value(m_digit, m_segment);
+ if (m_digit) machine().output().set_digit_value(m_digit, m_segment);
- output_set_value("mon_led", !BIT(data, 5));
+ machine().output().set_value("mon_led", !BIT(data, 5));
m_beep->set_state(!BIT(data, 7));
m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE);
@@ -167,7 +167,7 @@ WRITE8_MEMBER( h8_state::portf1_w )
//d0 segment g
m_segment = 0xff ^ BITSWAP8(data, 7, 0, 6, 5, 4, 3, 2, 1);
- if (m_digit) output_set_digit_value(m_digit, m_segment);
+ if (m_digit) machine().output().set_digit_value(m_digit, m_segment);
}
static ADDRESS_MAP_START(h8_mem, AS_PROGRAM, 8, h8_state)
@@ -216,7 +216,7 @@ INPUT_PORTS_END
void h8_state::machine_reset()
{
m_beep->set_frequency(H8_BEEP_FRQ);
- output_set_value("pwr_led", 0);
+ machine().output().set_value("pwr_led", 0);
m_irq_ctl = 1;
m_cass_state = 1;
m_cass_data[0] = 0;
@@ -229,7 +229,7 @@ void h8_state::machine_reset()
WRITE_LINE_MEMBER( h8_state::h8_inte_callback )
{
// operate the ION LED
- output_set_value("ion_led", !state);
+ machine().output().set_value("ion_led", !state);
m_irq_ctl &= 0x7f | ((state) ? 0 : 0x80);
}
@@ -261,7 +261,7 @@ But, all of this can only occur if bit 5 of port F0 is low. */
// operate the RUN LED
- output_set_value("run_led", state);
+ machine().output().set_value("run_led", state);
}
WRITE_LINE_MEMBER( h8_state::txdata_callback )
diff --git a/src/mame/drivers/hankin.cpp b/src/mame/drivers/hankin.cpp
index 80f1da77500..58a8249ac56 100644
--- a/src/mame/drivers/hankin.cpp
+++ b/src/mame/drivers/hankin.cpp
@@ -283,7 +283,7 @@ WRITE8_MEMBER( hankin_state::ic10_a_w )
{
seg1 = patterns[m_segment[i]];
seg2 = BITSWAP16(seg1, 8, 8, 8, 8, 8, 8, 7, 7, 6, 6, 5, 4, 3, 2, 1, 0);
- output_set_digit_value(i*10+m_digit, seg2);
+ machine().output().set_digit_value(i*10+m_digit, seg2);
}
}
}
@@ -319,7 +319,7 @@ WRITE8_MEMBER( hankin_state::ic10_b_w )
WRITE_LINE_MEMBER( hankin_state::ic10_ca2_w )
{
- output_set_value("led0", !state);
+ machine().output().set_value("led0", !state);
// also sound strobe
m_ic2->ca1_w(state);
}
diff --git a/src/mame/drivers/hh_cop400.cpp b/src/mame/drivers/hh_cop400.cpp
index 9080ceffb18..5750723f02b 100644
--- a/src/mame/drivers/hh_cop400.cpp
+++ b/src/mame/drivers/hh_cop400.cpp
@@ -149,7 +149,7 @@ void hh_cop400_state::display_update()
if (m_display_cache[y] != active_state[y])
{
if (m_display_segmask[y] != 0)
- output_set_digit_value(y, active_state[y] & m_display_segmask[y]);
+ machine().output().set_digit_value(y, active_state[y] & m_display_segmask[y]);
const int mul = (m_display_maxx <= 10) ? 10 : 100;
for (int x = 0; x <= m_display_maxx; x++)
@@ -169,8 +169,8 @@ void hh_cop400_state::display_update()
sprintf(buf1, "lamp%d", y * mul + x);
sprintf(buf2, "%d.%d", y, x);
}
- output_set_value(buf1, state);
- output_set_value(buf2, state);
+ machine().output().set_value(buf1, state);
+ machine().output().set_value(buf2, state);
}
}
diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp
index 443ab3f48ce..28ff016c78b 100644
--- a/src/mame/drivers/hh_hmcs40.cpp
+++ b/src/mame/drivers/hh_hmcs40.cpp
@@ -222,7 +222,7 @@ void hh_hmcs40_state::display_update()
if (m_display_cache[y] != active_state[y])
{
if (m_display_segmask[y] != 0)
- output_set_digit_value(y, active_state[y] & m_display_segmask[y]);
+ machine().output().set_digit_value(y, active_state[y] & m_display_segmask[y]);
const int mul = (m_display_maxx <= 10) ? 10 : 100;
for (int x = 0; x <= m_display_maxx; x++)
@@ -242,8 +242,8 @@ void hh_hmcs40_state::display_update()
sprintf(buf1, "lamp%d", y * mul + x);
sprintf(buf2, "%d.%d", y, x);
}
- output_set_value(buf1, state);
- output_set_value(buf2, state);
+ machine().output().set_value(buf1, state);
+ machine().output().set_value(buf2, state);
}
}
diff --git a/src/mame/drivers/hh_melps4.cpp b/src/mame/drivers/hh_melps4.cpp
index 9f8392fc2e8..0cbd9a3568e 100644
--- a/src/mame/drivers/hh_melps4.cpp
+++ b/src/mame/drivers/hh_melps4.cpp
@@ -131,7 +131,7 @@ void hh_melps4_state::display_update()
if (m_display_cache[y] != active_state[y])
{
if (m_display_segmask[y] != 0)
- output_set_digit_value(y, active_state[y] & m_display_segmask[y]);
+ machine().output().set_digit_value(y, active_state[y] & m_display_segmask[y]);
const int mul = (m_display_maxx <= 10) ? 10 : 100;
for (int x = 0; x <= m_display_maxx; x++)
@@ -151,8 +151,8 @@ void hh_melps4_state::display_update()
sprintf(buf1, "lamp%d", y * mul + x);
sprintf(buf2, "%d.%d", y, x);
}
- output_set_value(buf1, state);
- output_set_value(buf2, state);
+ machine().output().set_value(buf1, state);
+ machine().output().set_value(buf2, state);
}
}
diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp
index 7026c25ff30..e511bc6698d 100644
--- a/src/mame/drivers/hh_pic16.cpp
+++ b/src/mame/drivers/hh_pic16.cpp
@@ -141,7 +141,7 @@ void hh_pic16_state::display_update()
if (m_display_cache[y] != active_state[y])
{
if (m_display_segmask[y] != 0)
- output_set_digit_value(y, active_state[y] & m_display_segmask[y]);
+ machine().output().set_digit_value(y, active_state[y] & m_display_segmask[y]);
const int mul = (m_display_maxx <= 10) ? 10 : 100;
for (int x = 0; x <= m_display_maxx; x++)
@@ -161,8 +161,8 @@ void hh_pic16_state::display_update()
sprintf(buf1, "lamp%d", y * mul + x);
sprintf(buf2, "%d.%d", y, x);
}
- output_set_value(buf1, state);
- output_set_value(buf2, state);
+ machine().output().set_value(buf1, state);
+ machine().output().set_value(buf2, state);
}
}
diff --git a/src/mame/drivers/hh_sm510.cpp b/src/mame/drivers/hh_sm510.cpp
index 4b7946153a6..4c95a76302b 100644
--- a/src/mame/drivers/hh_sm510.cpp
+++ b/src/mame/drivers/hh_sm510.cpp
@@ -92,7 +92,7 @@ WRITE16_MEMBER(hh_sm510_state::lcd_segment_w)
// output to x.y, where x = row a/b/bs/c*4 + H1-4, y = seg1-16
char buf[0x10];
sprintf(buf, "%d.%d", offset, seg);
- output_set_value(buf, state);
+ machine().output().set_value(buf, state);
m_lcd_output_cache[index] = state;
}
diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp
index ea51b613628..fd731c2341c 100644
--- a/src/mame/drivers/hh_tms1k.cpp
+++ b/src/mame/drivers/hh_tms1k.cpp
@@ -211,7 +211,7 @@ void hh_tms1k_state::display_update()
if (m_display_cache[y] != active_state[y])
{
if (m_display_segmask[y] != 0)
- output_set_digit_value(y, active_state[y] & m_display_segmask[y]);
+ machine().output().set_digit_value(y, active_state[y] & m_display_segmask[y]);
const int mul = (m_display_maxx <= 10) ? 10 : 100;
for (int x = 0; x <= m_display_maxx; x++)
@@ -231,8 +231,8 @@ void hh_tms1k_state::display_update()
sprintf(buf1, "lamp%d", y * mul + x);
sprintf(buf2, "%d.%d", y, x);
}
- output_set_value(buf1, state);
- output_set_value(buf2, state);
+ machine().output().set_value(buf1, state);
+ machine().output().set_value(buf2, state);
}
}
@@ -242,7 +242,7 @@ void hh_tms1k_state::display_update()
if (m_power_led != m_power_on)
{
m_power_led = m_power_on;
- output_set_value("power_led", m_power_led ? 1 : 0);
+ machine().output().set_value("power_led", m_power_led ? 1 : 0);
}
}
@@ -3247,11 +3247,11 @@ WRITE16_MEMBER(bigtrak_state::write_o)
// O4: right motor reverse
// O5: ext out
// O6: N/C
- output_set_value("left_motor_forward", data >> 1 & 1);
- output_set_value("left_motor_reverse", data >> 2 & 1);
- output_set_value("right_motor_forward", data >> 3 & 1);
- output_set_value("right_motor_reverse", data >> 4 & 1);
- output_set_value("ext_out", data >> 5 & 1);
+ machine().output().set_value("left_motor_forward", data >> 1 & 1);
+ machine().output().set_value("left_motor_reverse", data >> 2 & 1);
+ machine().output().set_value("right_motor_forward", data >> 3 & 1);
+ machine().output().set_value("right_motor_reverse", data >> 4 & 1);
+ machine().output().set_value("ext_out", data >> 5 & 1);
// O0,O7(,R10)(tied together): speaker out
m_speaker->level_w((data & 1) | (data >> 6 & 2) | (m_r >> 8 & 4));
@@ -4460,7 +4460,7 @@ INPUT_CHANGED_MEMBER(phpball_state::flipper_button)
{
// rectangular LEDs under LEDs D,F and E,G are directly connected
// to the left and right flipper buttons - output them to lamp90 and 91
- output_set_lamp_value(90 + (int)(FPTR)param, newval);
+ machine().output().set_lamp_value(90 + (int)(FPTR)param, newval);
}
diff --git a/src/mame/drivers/hh_ucom4.cpp b/src/mame/drivers/hh_ucom4.cpp
index 80507b69fe6..a8279265f38 100644
--- a/src/mame/drivers/hh_ucom4.cpp
+++ b/src/mame/drivers/hh_ucom4.cpp
@@ -142,7 +142,7 @@ void hh_ucom4_state::display_update()
if (m_display_cache[y] != active_state[y])
{
if (m_display_segmask[y] != 0)
- output_set_digit_value(y, active_state[y] & m_display_segmask[y]);
+ machine().output().set_digit_value(y, active_state[y] & m_display_segmask[y]);
const int mul = (m_display_maxx <= 10) ? 10 : 100;
for (int x = 0; x <= m_display_maxx; x++)
@@ -162,8 +162,8 @@ void hh_ucom4_state::display_update()
sprintf(buf1, "lamp%d", y * mul + x);
sprintf(buf2, "%d.%d", y, x);
}
- output_set_value(buf1, state);
- output_set_value(buf2, state);
+ machine().output().set_value(buf1, state);
+ machine().output().set_value(buf2, state);
}
}
diff --git a/src/mame/drivers/highvdeo.cpp b/src/mame/drivers/highvdeo.cpp
index ed006d5a028..7787838b5a7 100644
--- a/src/mame/drivers/highvdeo.cpp
+++ b/src/mame/drivers/highvdeo.cpp
@@ -286,12 +286,12 @@ WRITE16_MEMBER(highvdeo_state::write1_w)
---x ---- Hold5 lamp.
--x- ---- Start lamp.
*/
- output_set_lamp_value(1, (data & 1)); /* Lamp 1 - HOLD 1 */
- output_set_lamp_value(2, (data >> 1) & 1); /* Lamp 2 - HOLD 2 */
- output_set_lamp_value(3, (data >> 2) & 1); /* Lamp 3 - HOLD 3 */
- output_set_lamp_value(4, (data >> 3) & 1); /* Lamp 4 - HOLD 4 */
- output_set_lamp_value(5, (data >> 4) & 1); /* Lamp 5 - HOLD 5 */
- output_set_lamp_value(6, (data >> 5) & 1); /* Lamp 6 - START */
+ machine().output().set_lamp_value(1, (data & 1)); /* Lamp 1 - HOLD 1 */
+ machine().output().set_lamp_value(2, (data >> 1) & 1); /* Lamp 2 - HOLD 2 */
+ machine().output().set_lamp_value(3, (data >> 2) & 1); /* Lamp 3 - HOLD 3 */
+ machine().output().set_lamp_value(4, (data >> 3) & 1); /* Lamp 4 - HOLD 4 */
+ machine().output().set_lamp_value(5, (data >> 4) & 1); /* Lamp 5 - HOLD 5 */
+ machine().output().set_lamp_value(6, (data >> 5) & 1); /* Lamp 6 - START */
// popmessage("%04x %04x",t1,t3);
}
diff --git a/src/mame/drivers/icecold.cpp b/src/mame/drivers/icecold.cpp
index fdcef3b390c..2121fba9923 100644
--- a/src/mame/drivers/icecold.cpp
+++ b/src/mame/drivers/icecold.cpp
@@ -201,7 +201,7 @@ WRITE8_MEMBER( icecold_state::scanlines_w )
WRITE8_MEMBER( icecold_state::digit_w )
{
- output_set_digit_value(m_digit, data & 0x7f);
+ machine().output().set_digit_value(m_digit, data & 0x7f);
}
READ8_MEMBER( icecold_state::kbd_r )
@@ -248,25 +248,25 @@ READ8_MEMBER( icecold_state::ay_r )
WRITE8_MEMBER( icecold_state::ay8910_0_b_w )
{
- output_set_lamp_value(1, BIT(data, 0));
- output_set_lamp_value(2, BIT(data, 1));
- output_set_lamp_value(3, BIT(data, 2));
- output_set_lamp_value(4, BIT(data, 3));
- output_set_lamp_value(5, BIT(data, 4));
- output_set_value("in_play", BIT(data, 5));
- output_set_value("good_game", BIT(data, 6));
+ machine().output().set_lamp_value(1, BIT(data, 0));
+ machine().output().set_lamp_value(2, BIT(data, 1));
+ machine().output().set_lamp_value(3, BIT(data, 2));
+ machine().output().set_lamp_value(4, BIT(data, 3));
+ machine().output().set_lamp_value(5, BIT(data, 4));
+ machine().output().set_value("in_play", BIT(data, 5));
+ machine().output().set_value("good_game", BIT(data, 6));
m_motenbl = BIT(data, 7);
}
WRITE8_MEMBER( icecold_state::ay8910_1_a_w )
{
- output_set_lamp_value(6, BIT(data, 0));
- output_set_lamp_value(7, BIT(data, 1));
- output_set_lamp_value(8, BIT(data, 2));
- output_set_lamp_value(9, BIT(data, 3));
- output_set_lamp_value(10, BIT(data, 4));
- output_set_value("game_over", BIT(data, 5));
- output_set_value("tilt", BIT(data, 6));
+ machine().output().set_lamp_value(6, BIT(data, 0));
+ machine().output().set_lamp_value(7, BIT(data, 1));
+ machine().output().set_lamp_value(8, BIT(data, 2));
+ machine().output().set_lamp_value(9, BIT(data, 3));
+ machine().output().set_lamp_value(10, BIT(data, 4));
+ machine().output().set_value("game_over", BIT(data, 5));
+ machine().output().set_value("tilt", BIT(data, 6));
// BIT 7 watchdog reset
}
@@ -274,7 +274,7 @@ WRITE8_MEMBER( icecold_state::ay8910_1_b_w )
{
if (m_motenbl == 0)
{
- output_set_value("start", BIT(data, 0));
+ machine().output().set_value("start", BIT(data, 0));
machine().bookkeeping().coin_counter_w(1, BIT(data, 1)); // hopper counter
machine().bookkeeping().coin_counter_w(2, BIT(data, 2)); // good game counter
machine().bookkeeping().coin_lockout_w(0, BIT(data, 3)); // not used ??
@@ -317,8 +317,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(icecold_state::icecold_motors_timer)
if (lmotor_dir != 0 || rmotor_dir != 0)
{
- output_set_value("lmotor", m_lmotor);
- output_set_value("rmotor", m_rmotor);
+ machine().output().set_value("lmotor", m_lmotor);
+ machine().output().set_value("rmotor", m_rmotor);
popmessage("Left Motor Right Motor\n%-4s %-4s\n%02d\\100 %02d\\100",
(lmotor_dir > 0) ? " up" : ((lmotor_dir < 0) ? "down" : "off"),
diff --git a/src/mame/drivers/ie15.cpp b/src/mame/drivers/ie15.cpp
index c8e706a8705..ba7200c249c 100644
--- a/src/mame/drivers/ie15.cpp
+++ b/src/mame/drivers/ie15.cpp
@@ -541,14 +541,14 @@ UINT32 ie15_state::draw_scanline(UINT16 *p, UINT16 offset, UINT8 scanline)
void ie15_state::update_leds()
{
UINT8 data = m_io_keyboard->read();
- output_set_value("lat_led", m_kb_ruslat ^ 1);
- output_set_value("nr_led", BIT(m_kb_control, IE_KB_NR_BIT) ^ 1);
- output_set_value("pch_led", BIT(data, IE_KB_PCH_BIT) ^ 1);
- output_set_value("dup_led", BIT(data, IE_KB_DUP_BIT) ^ 1);
- output_set_value("lin_led", BIT(data, IE_KB_LIN_BIT) ^ 1);
- output_set_value("red_led", BIT(data, IE_KB_RED_BIT) ^ 1);
- output_set_value("sdv_led", BIT(m_kb_control, IE_KB_SDV_BIT) ^ 1);
- output_set_value("prd_led", 1); // XXX
+ machine().output().set_value("lat_led", m_kb_ruslat ^ 1);
+ machine().output().set_value("nr_led", BIT(m_kb_control, IE_KB_NR_BIT) ^ 1);
+ machine().output().set_value("pch_led", BIT(data, IE_KB_PCH_BIT) ^ 1);
+ machine().output().set_value("dup_led", BIT(data, IE_KB_DUP_BIT) ^ 1);
+ machine().output().set_value("lin_led", BIT(data, IE_KB_LIN_BIT) ^ 1);
+ machine().output().set_value("red_led", BIT(data, IE_KB_RED_BIT) ^ 1);
+ machine().output().set_value("sdv_led", BIT(m_kb_control, IE_KB_SDV_BIT) ^ 1);
+ machine().output().set_value("prd_led", 1); // XXX
}
/*
diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp
index c476d76a879..758a269767d 100644
--- a/src/mame/drivers/igs009.cpp
+++ b/src/mame/drivers/igs009.cpp
@@ -397,7 +397,7 @@ WRITE8_MEMBER(igs009_state::nmi_and_coins_w)
machine().bookkeeping().coin_counter_w(2, data & 0x08); // key in
machine().bookkeeping().coin_counter_w(3, data & 0x10); // coin m_out mech
- set_led_status(machine(), 6, data & 0x40); // led for coin m_out / m_hopper active
+ machine().output().set_led_value(6, data & 0x40); // led for coin m_out / m_hopper active
m_nmi_enable = data; // data & 0x80 // nmi enable?
@@ -407,8 +407,8 @@ WRITE8_MEMBER(igs009_state::nmi_and_coins_w)
WRITE8_MEMBER(igs009_state::video_and_leds_w)
{
- set_led_status(machine(), 4, data & 0x01); // start?
- set_led_status(machine(), 5, data & 0x04); // l_bet?
+ machine().output().set_led_value(4, data & 0x01); // start?
+ machine().output().set_led_value(5, data & 0x04); // l_bet?
m_video_enable = data & 0x40;
m_hopper = (~data)& 0x80;
@@ -419,10 +419,10 @@ WRITE8_MEMBER(igs009_state::video_and_leds_w)
WRITE8_MEMBER(igs009_state::leds_w)
{
- set_led_status(machine(), 0, data & 0x01); // stop_1
- set_led_status(machine(), 1, data & 0x02); // stop_2
- set_led_status(machine(), 2, data & 0x04); // stop_3
- set_led_status(machine(), 3, data & 0x08); // stop
+ machine().output().set_led_value(0, data & 0x01); // stop_1
+ machine().output().set_led_value(1, data & 0x02); // stop_2
+ machine().output().set_led_value(2, data & 0x04); // stop_3
+ machine().output().set_led_value(3, data & 0x08); // stop
// data & 0x10?
m_out[2] = data;
diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp
index 7a41561eab3..2a6a12dcdb5 100644
--- a/src/mame/drivers/igspoker.cpp
+++ b/src/mame/drivers/igspoker.cpp
@@ -247,7 +247,7 @@ WRITE8_MEMBER(igspoker_state::igs_nmi_and_coins_w)
machine().bookkeeping().coin_counter_w(2, data & 0x08); // key in
machine().bookkeeping().coin_counter_w(3, data & 0x10); // coin m_out mech
- set_led_status(machine(), 6, data & 0x20); // led for coin m_out / m_hopper active
+ machine().output().set_led_value(6, data & 0x20); // led for coin m_out / m_hopper active
m_nmi_enable = data & 0x80; // nmi enable?
#if VERBOSE
@@ -285,12 +285,12 @@ WRITE8_MEMBER(igspoker_state::igs_lamps_w)
---x ---- Hold5 lamp.
xx-- ---- one pulse once bet amount allows start.
*/
- output_set_lamp_value(1, (data >> 1) & 1); /* Lamp 1 - HOLD 1 */
- output_set_lamp_value(2, (data >> 5) & 1); /* Lamp 2 - HOLD 2 */
- output_set_lamp_value(3, (data >> 4) & 1); /* Lamp 3 - HOLD 3 */
- output_set_lamp_value(4, (data >> 3) & 1); /* Lamp 4 - HOLD 4 */
- output_set_lamp_value(5, (data >> 2) & 1); /* Lamp 5 - HOLD 5 */
- output_set_lamp_value(6, (data & 1)); /* Lamp 6 - START */
+ machine().output().set_lamp_value(1, (data >> 1) & 1); /* Lamp 1 - HOLD 1 */
+ machine().output().set_lamp_value(2, (data >> 5) & 1); /* Lamp 2 - HOLD 2 */
+ machine().output().set_lamp_value(3, (data >> 4) & 1); /* Lamp 3 - HOLD 3 */
+ machine().output().set_lamp_value(4, (data >> 3) & 1); /* Lamp 4 - HOLD 4 */
+ machine().output().set_lamp_value(5, (data >> 2) & 1); /* Lamp 5 - HOLD 5 */
+ machine().output().set_lamp_value(6, (data & 1)); /* Lamp 6 - START */
m_hopper = (~data)& 0x80;
diff --git a/src/mame/drivers/imolagp.cpp b/src/mame/drivers/imolagp.cpp
index 49ae5f3d8b4..38940c0faea 100644
--- a/src/mame/drivers/imolagp.cpp
+++ b/src/mame/drivers/imolagp.cpp
@@ -262,7 +262,7 @@ WRITE8_MEMBER(imolagp_state::imola_led_board_w)
static const UINT8 ls48_map[16] =
{ 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7c,0x07,0x7f,0x67,0x58,0x4c,0x62,0x69,0x78,0x00 };
- output_set_digit_value(offset, ls48_map[data & 0x0f]);
+ machine().output().set_digit_value(offset, ls48_map[data & 0x0f]);
/*
score: 0, 1, 2, 3
time: 4, 5
diff --git a/src/mame/drivers/inder.cpp b/src/mame/drivers/inder.cpp
index aab3d2e7eb4..1b30e4c0f50 100644
--- a/src/mame/drivers/inder.cpp
+++ b/src/mame/drivers/inder.cpp
@@ -1187,7 +1187,7 @@ WRITE8_MEMBER( inder_state::disp_w )
{
offset = (offset >> 3) & 7;
for (i = 0; i < 5; i++)
- output_set_digit_value(i*10+offset, m_segment[i]);
+ machine().output().set_digit_value(i*10+offset, m_segment[i]);
}
}
@@ -1219,7 +1219,7 @@ WRITE8_MEMBER( inder_state::ppi64c_w )
{
if ((m_game==1) && (i == 4)) // mundial,clown,250cc,atleta have credit and ball displays swapped
data ^= 4;
- output_set_digit_value(i*10+data, m_segment[i]);
+ machine().output().set_digit_value(i*10+data, m_segment[i]);
}
}
}
diff --git a/src/mame/drivers/instruct.cpp b/src/mame/drivers/instruct.cpp
index d7ce729fa42..eaabece2db3 100644
--- a/src/mame/drivers/instruct.cpp
+++ b/src/mame/drivers/instruct.cpp
@@ -90,7 +90,7 @@ private:
// flag led
WRITE_LINE_MEMBER( instruct_state::flag_w )
{
- output_set_value("led8", !state);
+ machine().output().set_value("led8", !state);
}
// user port
@@ -100,7 +100,7 @@ WRITE8_MEMBER( instruct_state::port_w )
for (int i = 0; i < 8; i++)
{
sprintf(ledname,"led%d",i);
- output_set_value(ledname, !BIT(data, i));
+ machine().output().set_value(ledname, !BIT(data, i));
}
}
@@ -119,7 +119,7 @@ WRITE8_MEMBER( instruct_state::portf8_w )
WRITE8_MEMBER( instruct_state::portf9_w )
{
if (m_valid_digit)
- output_set_digit_value(m_digit, data);
+ machine().output().set_digit_value(m_digit, data);
m_valid_digit = false;
}
diff --git a/src/mame/drivers/itech32.cpp b/src/mame/drivers/itech32.cpp
index 1da34373e38..50e0928bf1c 100644
--- a/src/mame/drivers/itech32.cpp
+++ b/src/mame/drivers/itech32.cpp
@@ -712,9 +712,9 @@ WRITE8_MEMBER(itech32_state::drivedge_portb_out)
/* bit 4 controls the ticket dispenser */
/* bit 5 controls the coin counter */
/* bit 6 controls the diagnostic sound LED */
- set_led_status(machine(), 1, data & 0x01);
- set_led_status(machine(), 2, data & 0x02);
- set_led_status(machine(), 3, data & 0x04);
+ machine().output().set_led_value(1, data & 0x01);
+ machine().output().set_led_value(2, data & 0x02);
+ machine().output().set_led_value(3, data & 0x04);
machine().device<ticket_dispenser_device>("ticket")->write(machine().driver_data()->generic_space(), 0, (data & 0x10) << 3);
machine().bookkeeping().coin_counter_w(0, (data & 0x20) >> 5);
}
@@ -722,7 +722,7 @@ WRITE8_MEMBER(itech32_state::drivedge_portb_out)
WRITE_LINE_MEMBER(itech32_state::drivedge_turbo_light)
{
- set_led_status(machine(), 0, state);
+ machine().output().set_led_value(0, state);
}
diff --git a/src/mame/drivers/jackie.cpp b/src/mame/drivers/jackie.cpp
index 8b3b804d0e6..a2e700f35bc 100644
--- a/src/mame/drivers/jackie.cpp
+++ b/src/mame/drivers/jackie.cpp
@@ -323,7 +323,7 @@ WRITE8_MEMBER(jackie_state::nmi_and_coins_w)
machine().bookkeeping().coin_counter_w(2, data & 0x08); // key in
machine().bookkeeping().coin_counter_w(3, data & 0x10); // coin m_out mech
- set_led_status(machine(), 6, data & 0x20); // led for coin m_out / m_hopper active
+ machine().output().set_led_value(6, data & 0x20); // led for coin m_out / m_hopper active
m_exp_bank = (data & 0x02) ? 1 : 0; // expram bank number
m_nmi_enable = data & 0x80; // nmi enable?
@@ -345,12 +345,12 @@ WRITE8_MEMBER(jackie_state::lamps_w)
---- -x-- Hold5 lamp.
---- ---x Start lamp.
*/
- output_set_lamp_value(1, (data >> 1) & 1); /* Lamp 1 - HOLD 1 */
- output_set_lamp_value(2, (data >> 5) & 1); /* Lamp 2 - HOLD 2 */
- output_set_lamp_value(3, (data >> 4) & 1); /* Lamp 3 - HOLD 3 */
- output_set_lamp_value(4, (data >> 3) & 1); /* Lamp 4 - HOLD 4 */
- output_set_lamp_value(5, (data >> 2) & 1); /* Lamp 5 - HOLD 5 */
- output_set_lamp_value(6, (data & 1)); /* Lamp 6 - START */
+ machine().output().set_lamp_value(1, (data >> 1) & 1); /* Lamp 1 - HOLD 1 */
+ machine().output().set_lamp_value(2, (data >> 5) & 1); /* Lamp 2 - HOLD 2 */
+ machine().output().set_lamp_value(3, (data >> 4) & 1); /* Lamp 3 - HOLD 3 */
+ machine().output().set_lamp_value(4, (data >> 3) & 1); /* Lamp 4 - HOLD 4 */
+ machine().output().set_lamp_value(5, (data >> 2) & 1); /* Lamp 5 - HOLD 5 */
+ machine().output().set_lamp_value(6, (data & 1)); /* Lamp 6 - START */
m_hopper = (~data)& 0x80;
diff --git a/src/mame/drivers/jankenmn.cpp b/src/mame/drivers/jankenmn.cpp
index f8092eda7c2..2b442919b55 100644
--- a/src/mame/drivers/jankenmn.cpp
+++ b/src/mame/drivers/jankenmn.cpp
@@ -184,15 +184,15 @@ static const UINT8 led_map[16] = // 7748 IC?
WRITE8_MEMBER(jankenmn_state::lamps1_w)
{
// hand state: d0: rock, d1: scissors, d2: paper
- output_set_lamp_value(8, (data & 7) != 0);
- output_set_lamp_value(11, data & 1);
- output_set_lamp_value(12, data >> 1 & 1);
- output_set_lamp_value(9, data >> 2 & 1);
- output_set_lamp_value(10, (data & 6) != 0);
- output_set_lamp_value(13, (data & 3) != 0);
+ machine().output().set_lamp_value(8, (data & 7) != 0);
+ machine().output().set_lamp_value(11, data & 1);
+ machine().output().set_lamp_value(12, data >> 1 & 1);
+ machine().output().set_lamp_value(9, data >> 2 & 1);
+ machine().output().set_lamp_value(10, (data & 6) != 0);
+ machine().output().set_lamp_value(13, (data & 3) != 0);
// d4-d7: led7seg (remaining credits) right digit
- output_set_digit_value(1, led_map[data >> 4 & 0x0f]);
+ machine().output().set_digit_value(1, led_map[data >> 4 & 0x0f]);
// d3: ? (only set if game is over)
}
@@ -200,33 +200,33 @@ WRITE8_MEMBER(jankenmn_state::lamps1_w)
WRITE8_MEMBER(jankenmn_state::lamps2_w)
{
// button LEDs: d1: paper, d2: scissors, d3: rock
- output_set_lamp_value(2, data >> 3 & 1);
- output_set_lamp_value(3, data >> 2 & 1);
- output_set_lamp_value(4, data >> 1 & 1);
+ machine().output().set_lamp_value(2, data >> 3 & 1);
+ machine().output().set_lamp_value(3, data >> 2 & 1);
+ machine().output().set_lamp_value(4, data >> 1 & 1);
// lamps: d5: draw, d6: lose, d7: win
- output_set_lamp_value(5, data >> 6 & 1);
- output_set_lamp_value(6, data >> 5 & 1);
- output_set_lamp_value(7, data >> 7 & 1);
+ machine().output().set_lamp_value(5, data >> 6 & 1);
+ machine().output().set_lamp_value(6, data >> 5 & 1);
+ machine().output().set_lamp_value(7, data >> 7 & 1);
// d4: payout error LED
- output_set_lamp_value(14, data >> 4 & 1);
+ machine().output().set_lamp_value(14, data >> 4 & 1);
// d0: led7seg (remaining credits) left digit
- output_set_digit_value(0, led_map[data & 1]);
+ machine().output().set_digit_value(0, led_map[data & 1]);
}
WRITE8_MEMBER(jankenmn_state::lamps3_w)
{
// d1: blue rotating lamp on top of cab
- output_set_lamp_value(15, data >> 1 & 1);
+ machine().output().set_lamp_value(15, data >> 1 & 1);
// d2: payout (waits for hopper status)
machine().bookkeeping().coin_counter_w(2, data & 0x04);
// d3: right multiplier lamp(2), d4: left multiplier lamp(1)
- output_set_lamp_value(0, data >> 4 & 1);
- output_set_lamp_value(1, data >> 3 & 1);
+ machine().output().set_lamp_value(0, data >> 4 & 1);
+ machine().output().set_lamp_value(1, data >> 3 & 1);
// d5: assume coin lockout
machine().bookkeeping().coin_lockout_global_w(~data & 0x20);
diff --git a/src/mame/drivers/jeutel.cpp b/src/mame/drivers/jeutel.cpp
index a4a79305948..f00f35f5c2a 100644
--- a/src/mame/drivers/jeutel.cpp
+++ b/src/mame/drivers/jeutel.cpp
@@ -119,7 +119,7 @@ WRITE8_MEMBER( jeutel_state::ppi0a_w )
if BIT(data, 6)
{
- output_set_digit_value(40+m_digit, 0x3f); //patterns[data&15];
+ machine().output().set_digit_value(40+m_digit, 0x3f); //patterns[data&15];
return;
}
switch (data & 0x0f)
@@ -144,12 +144,12 @@ WRITE8_MEMBER( jeutel_state::ppi0a_w )
}
if BIT(data, 4)
{
- output_set_digit_value(m_digit, (blank) ? 0 : segment);
+ machine().output().set_digit_value(m_digit, (blank) ? 0 : segment);
}
else
if BIT(data, 5)
{
- output_set_digit_value(20+m_digit, (blank) ? 0 : segment);
+ machine().output().set_digit_value(20+m_digit, (blank) ? 0 : segment);
}
}
diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp
index fafaf01a525..1e13dd23daa 100644
--- a/src/mame/drivers/joystand.cpp
+++ b/src/mame/drivers/joystand.cpp
@@ -397,14 +397,14 @@ WRITE16_MEMBER(joystand_state::outputs_w)
machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); // coin counter 1
machine().bookkeeping().coin_counter_w(1, BIT(data, 1)); // coin counter 2
- output_set_value("blocker", BIT(data, 2));
- output_set_value("error_lamp", BIT(data, 3)); // counter error
- output_set_value("photo_lamp", BIT(data, 4)); // during photo
+ machine().output().set_value("blocker", BIT(data, 2));
+ machine().output().set_value("error_lamp", BIT(data, 3)); // counter error
+ machine().output().set_value("photo_lamp", BIT(data, 4)); // during photo
}
if (ACCESSING_BITS_8_15)
{
- output_set_value("ok_button_led", BIT(data, 8));
- output_set_value("cancel_button_led", BIT(data, 9));
+ machine().output().set_value("ok_button_led", BIT(data, 8));
+ machine().output().set_value("cancel_button_led", BIT(data, 9));
}
}
diff --git a/src/mame/drivers/jp.cpp b/src/mame/drivers/jp.cpp
index 872afed4974..856a1055314 100644
--- a/src/mame/drivers/jp.cpp
+++ b/src/mame/drivers/jp.cpp
@@ -198,7 +198,7 @@ WRITE8_MEMBER( jp_state::disp_w )
if (t == 8)
{ // ball number
segment = m_disp_data >> 6;
- output_set_digit_value(94, BITSWAP8(segment, 0, 1, 2, 3, 4, 5, 6, 7) ^ 0xff);
+ machine().output().set_digit_value(94, BITSWAP8(segment, 0, 1, 2, 3, 4, 5, 6, 7) ^ 0xff);
}
else
if (t < 8)
@@ -210,9 +210,9 @@ WRITE8_MEMBER( jp_state::disp_w )
for (i = 0; i < 32; i++)
if BIT(m_disp_data, i)
- output_set_digit_value(i, (output_get_digit_value(i) & ~segment));
+ machine().output().set_digit_value(i, (machine().output().get_digit_value(i) & ~segment));
else
- output_set_digit_value(i, (output_get_digit_value(i) | segment));
+ machine().output().set_digit_value(i, (machine().output().get_digit_value(i) | segment));
}
}
}
@@ -258,10 +258,10 @@ void jp_state::machine_reset()
m_row = 0;
m_clock_bit = 0;
//m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
- output_set_digit_value(96, 0x3f);
- output_set_digit_value(97, 0x3f);
- output_set_digit_value(98, 0x3f);
- output_set_digit_value(99, 0x3f);
+ machine().output().set_digit_value(96, 0x3f);
+ machine().output().set_digit_value(97, 0x3f);
+ machine().output().set_digit_value(98, 0x3f);
+ machine().output().set_digit_value(99, 0x3f);
}
DRIVER_INIT_MEMBER( jp_state, jp )
diff --git a/src/mame/drivers/jpmimpct.cpp b/src/mame/drivers/jpmimpct.cpp
index 291406f2a20..3e26933796c 100644
--- a/src/mame/drivers/jpmimpct.cpp
+++ b/src/mame/drivers/jpmimpct.cpp
@@ -510,7 +510,7 @@ void jpmimpct_state::jpm_draw_lamps(int data, int lamp_strobe)
for (i=0; i<16; i++)
{
m_Lamps[16*(m_lamp_strobe+i)] = data & 1;
- output_set_lamp_value((16*lamp_strobe)+i, (m_Lamps[(16*lamp_strobe)+i]));
+ machine().output().set_lamp_value((16*lamp_strobe)+i, (m_Lamps[(16*lamp_strobe)+i]));
data = data >> 1;
}
}
@@ -562,7 +562,7 @@ WRITE16_MEMBER(jpmimpct_state::jpmio_w)
case 0x0b:
{
- output_set_digit_value(m_lamp_strobe,data);
+ machine().output().set_digit_value(m_lamp_strobe,data);
break;
}
case 0x0f:
@@ -1076,8 +1076,8 @@ WRITE16_MEMBER(jpmimpct_state::jpmioawp_w)
{
case 0x00:
{
- output_set_value("PWRLED",!(data&0x100));
- output_set_value("STATLED",!(data&0x200));
+ machine().output().set_value("PWRLED",!(data&0x100));
+ machine().output().set_value("STATLED",!(data&0x200));
break;
}
@@ -1088,18 +1088,18 @@ WRITE16_MEMBER(jpmimpct_state::jpmioawp_w)
m_reel1->update((data >> 1)& 0x0F);
m_reel2->update((data >> 2)& 0x0F);
m_reel3->update((data >> 3)& 0x0F);
- awp_draw_reel("reel1", m_reel0);
- awp_draw_reel("reel2", m_reel1);
- awp_draw_reel("reel3", m_reel2);
- awp_draw_reel("reel4", m_reel3);
+ awp_draw_reel(machine(),"reel1", m_reel0);
+ awp_draw_reel(machine(),"reel2", m_reel1);
+ awp_draw_reel(machine(),"reel3", m_reel2);
+ awp_draw_reel(machine(),"reel4", m_reel3);
break;
}
case 0x04:
{
m_reel4->update((data >> 4)& 0x0F);
m_reel5->update((data >> 5)& 0x0F);
- awp_draw_reel("reel5", m_reel4);
- awp_draw_reel("reel6", m_reel5);
+ awp_draw_reel(machine(),"reel5", m_reel4);
+ awp_draw_reel(machine(),"reel6", m_reel5);
break;
}
case 0x06:
@@ -1156,7 +1156,7 @@ WRITE16_MEMBER(jpmimpct_state::jpmioawp_w)
case 0x0b:
{
- output_set_digit_value(m_lamp_strobe,data);
+ machine().output().set_digit_value(m_lamp_strobe,data);
break;
}
case 0x0f:
diff --git a/src/mame/drivers/jpmsys5.cpp b/src/mame/drivers/jpmsys5.cpp
index b7ccb9f3396..1df369c5263 100644
--- a/src/mame/drivers/jpmsys5.cpp
+++ b/src/mame/drivers/jpmsys5.cpp
@@ -177,9 +177,9 @@ void jpmsys5_state::sys5_draw_lamps()
int i;
for (i = 0; i <8; i++)
{
- output_set_lamp_value( (16*m_lamp_strobe)+i, (m_muxram[(4*m_lamp_strobe)] & (1 << i)) !=0);
- output_set_lamp_value((16*m_lamp_strobe)+i+8, (m_muxram[(4*m_lamp_strobe) +1 ] & (1 << i)) !=0);
- output_set_indexed_value("sys5led",(8*m_lamp_strobe)+i,(m_muxram[(4*m_lamp_strobe) +2 ] & (1 << i)) !=0);
+ machine().output().set_lamp_value( (16*m_lamp_strobe)+i, (m_muxram[(4*m_lamp_strobe)] & (1 << i)) !=0);
+ machine().output().set_lamp_value((16*m_lamp_strobe)+i+8, (m_muxram[(4*m_lamp_strobe) +1 ] & (1 << i)) !=0);
+ machine().output().set_indexed_value("sys5led",(8*m_lamp_strobe)+i,(m_muxram[(4*m_lamp_strobe) +2 ] & (1 << i)) !=0);
}
}
diff --git a/src/mame/drivers/jubilee.cpp b/src/mame/drivers/jubilee.cpp
index 8f1560725c0..d57e08d2128 100644
--- a/src/mame/drivers/jubilee.cpp
+++ b/src/mame/drivers/jubilee.cpp
@@ -406,19 +406,19 @@ WRITE8_MEMBER(jubilee_state::unk_w)
{
if (muxlamps == 1)
{
- output_set_lamp_value(0, (data & 1)); /* lamp */
+ machine().output().set_lamp_value(0, (data & 1)); /* lamp */
logerror("CRU: LAAAAAAMP 0 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 0");
}
if (muxlamps == 2)
{
- output_set_lamp_value(3, (data & 1)); /* lamp */
+ machine().output().set_lamp_value(3, (data & 1)); /* lamp */
logerror("CRU: LAAAAAAMP 3 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 3");
}
if (muxlamps == 3)
{
- output_set_lamp_value(6, (data & 1)); /* lamp */
+ machine().output().set_lamp_value(6, (data & 1)); /* lamp */
logerror("CRU: LAAAAAAMP 6 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 6");
}
@@ -428,19 +428,19 @@ WRITE8_MEMBER(jubilee_state::unk_w)
{
if (muxlamps == 1)
{
- output_set_lamp_value(1, (data & 1)); /* lamp */
+ machine().output().set_lamp_value(1, (data & 1)); /* lamp */
logerror("CRU: LAAAAAAMP 1 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 1");
}
if (muxlamps == 2)
{
- output_set_lamp_value(4, (data & 1)); /* lamp */
+ machine().output().set_lamp_value(4, (data & 1)); /* lamp */
logerror("CRU: LAAAAAAMP 4 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 4");
}
if (muxlamps == 3)
{
- output_set_lamp_value(7, (data & 1)); /* lamp */
+ machine().output().set_lamp_value(7, (data & 1)); /* lamp */
logerror("CRU: LAAAAAAMP 7 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 7");
}
@@ -450,19 +450,19 @@ WRITE8_MEMBER(jubilee_state::unk_w)
{
if (muxlamps == 1)
{
- output_set_lamp_value(2, (data & 1)); /* lamp */
+ machine().output().set_lamp_value(2, (data & 1)); /* lamp */
logerror("CRU: LAAAAAAMP 2 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 2");
}
if (muxlamps == 2)
{
- output_set_lamp_value(5, (data & 1)); /* lamp */
+ machine().output().set_lamp_value(5, (data & 1)); /* lamp */
logerror("CRU: LAAAAAAMP 5 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 5");
}
if (muxlamps == 3)
{
- output_set_lamp_value(8, (data & 1)); /* lamp */
+ machine().output().set_lamp_value(8, (data & 1)); /* lamp */
logerror("CRU: LAAAAAAMP 8 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 8");
}
diff --git a/src/mame/drivers/junior.cpp b/src/mame/drivers/junior.cpp
index 9744712c9cc..9041ecadee5 100644
--- a/src/mame/drivers/junior.cpp
+++ b/src/mame/drivers/junior.cpp
@@ -162,7 +162,7 @@ WRITE8_MEMBER( junior_state::junior_riot_a_w )
if ((idx >= 4 && idx < 10) & ( m_port_a != 0xff ))
{
- output_set_digit_value( idx-4, m_port_a ^ 0x7f );
+ machine().output().set_digit_value( idx-4, m_port_a ^ 0x7f );
m_led_time[idx - 4] = 10;
}
}
@@ -176,7 +176,7 @@ WRITE8_MEMBER( junior_state::junior_riot_b_w )
if ((idx >= 4 && idx < 10) & ( m_port_a != 0xff ))
{
- output_set_digit_value( idx-4, m_port_a ^ 0x7f );
+ machine().output().set_digit_value( idx-4, m_port_a ^ 0x7f );
m_led_time[idx - 4] = 10;
}
}
@@ -197,7 +197,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(junior_state::junior_update_leds)
if ( m_led_time[i] )
m_led_time[i]--;
else
- output_set_digit_value( i, 0 );
+ machine().output().set_digit_value( i, 0 );
}
}
diff --git a/src/mame/drivers/k1003.cpp b/src/mame/drivers/k1003.cpp
index bd78e42b474..2853b7fe5b4 100644
--- a/src/mame/drivers/k1003.cpp
+++ b/src/mame/drivers/k1003.cpp
@@ -111,8 +111,8 @@ UINT8 k1003_state::bit_to_dec(UINT8 val)
WRITE8_MEMBER( k1003_state::disp_w )
{
- output_set_digit_value(bit_to_dec(data)*2, m_disp_1);
- output_set_digit_value(bit_to_dec(data)*2+1, m_disp_2);
+ machine().output().set_digit_value(bit_to_dec(data)*2, m_disp_1);
+ machine().output().set_digit_value(bit_to_dec(data)*2+1, m_disp_2);
}
static ADDRESS_MAP_START( k1003_io, AS_IO, 8, k1003_state )
diff --git a/src/mame/drivers/kas89.cpp b/src/mame/drivers/kas89.cpp
index 81971b80f2d..870841110fa 100644
--- a/src/mame/drivers/kas89.cpp
+++ b/src/mame/drivers/kas89.cpp
@@ -272,7 +272,7 @@ WRITE_LINE_MEMBER(kas89_state::kas89_vdp_interrupt)
void kas89_state::machine_start()
{
- output_set_lamp_value(37, 0); /* turning off the operator led */
+ machine().output().set_lamp_value(37, 0); /* turning off the operator led */
}
void kas89_state::machine_reset()
@@ -309,7 +309,7 @@ READ8_MEMBER(kas89_state::mux_r)
case 0x20: return m_pl6->read();
case 0x40:
{
- output_set_lamp_value(37, 1 - ((m_svc->read() >> 5) & 1)); /* Operator Key LAMP */
+ machine().output().set_lamp_value(37, 1 - ((m_svc->read() >> 5) & 1)); /* Operator Key LAMP */
return m_svc->read();
}
case 0x80: return m_dsw->read(); /* Polled at $162a through NMI routine */
@@ -375,7 +375,7 @@ WRITE8_MEMBER(kas89_state::sound_comm_w)
UINT8 i;
for ( i = 0; i < 37; i++ )
{
- output_set_lamp_value(i, 0); /* All roulette LEDs OFF */
+ machine().output().set_lamp_value(i, 0); /* All roulette LEDs OFF */
}
}
@@ -421,7 +421,7 @@ WRITE8_MEMBER(kas89_state::led_mux_select_w)
UINT8 i;
for ( i = 0; i < 37; i++ )
{
- output_set_lamp_value(i, 0); /* All LEDs OFF */
+ machine().output().set_lamp_value(i, 0); /* All LEDs OFF */
}
switch(data)
@@ -430,69 +430,69 @@ WRITE8_MEMBER(kas89_state::led_mux_select_w)
{
for ( i = 0; i < 37; i++ )
{
- output_set_lamp_value(i, 0); /* All LEDs OFF */
+ machine().output().set_lamp_value(i, 0); /* All LEDs OFF */
}
}
case 0x01:
{
- output_set_lamp_value(11, (m_leds_mux_data >> 0) & 1); /* Number 11 LED */
- output_set_lamp_value(36, (m_leds_mux_data >> 1) & 1); /* Number 36 LED */
- output_set_lamp_value(13, (m_leds_mux_data >> 2) & 1); /* Number 13 LED */
- output_set_lamp_value(27, (m_leds_mux_data >> 3) & 1); /* Number 27 LED */
- output_set_lamp_value(06, (m_leds_mux_data >> 4) & 1); /* Number 6 LED */
- output_set_lamp_value(34, (m_leds_mux_data >> 5) & 1); /* Number 34 LED */
- output_set_lamp_value(17, (m_leds_mux_data >> 6) & 1); /* Number 17 LED */
- output_set_lamp_value(25, (m_leds_mux_data >> 7) & 1); /* Number 25 LED */
+ machine().output().set_lamp_value(11, (m_leds_mux_data >> 0) & 1); /* Number 11 LED */
+ machine().output().set_lamp_value(36, (m_leds_mux_data >> 1) & 1); /* Number 36 LED */
+ machine().output().set_lamp_value(13, (m_leds_mux_data >> 2) & 1); /* Number 13 LED */
+ machine().output().set_lamp_value(27, (m_leds_mux_data >> 3) & 1); /* Number 27 LED */
+ machine().output().set_lamp_value(06, (m_leds_mux_data >> 4) & 1); /* Number 6 LED */
+ machine().output().set_lamp_value(34, (m_leds_mux_data >> 5) & 1); /* Number 34 LED */
+ machine().output().set_lamp_value(17, (m_leds_mux_data >> 6) & 1); /* Number 17 LED */
+ machine().output().set_lamp_value(25, (m_leds_mux_data >> 7) & 1); /* Number 25 LED */
break;
}
case 0x02:
{
- output_set_lamp_value( 2, (m_leds_mux_data >> 0) & 1); /* Number 2 LED */
- output_set_lamp_value(21, (m_leds_mux_data >> 1) & 1); /* Number 21 LED */
- output_set_lamp_value( 4, (m_leds_mux_data >> 2) & 1); /* Number 4 LED */
- output_set_lamp_value(19, (m_leds_mux_data >> 3) & 1); /* Number 19 LED */
- output_set_lamp_value(15, (m_leds_mux_data >> 4) & 1); /* Number 15 LED */
- output_set_lamp_value(32, (m_leds_mux_data >> 5) & 1); /* Number 32 LED */
- output_set_lamp_value( 0, (m_leds_mux_data >> 6) & 1); /* Number 0 LED */
- output_set_lamp_value(26, (m_leds_mux_data >> 7) & 1); /* Number 26 LED */
+ machine().output().set_lamp_value( 2, (m_leds_mux_data >> 0) & 1); /* Number 2 LED */
+ machine().output().set_lamp_value(21, (m_leds_mux_data >> 1) & 1); /* Number 21 LED */
+ machine().output().set_lamp_value( 4, (m_leds_mux_data >> 2) & 1); /* Number 4 LED */
+ machine().output().set_lamp_value(19, (m_leds_mux_data >> 3) & 1); /* Number 19 LED */
+ machine().output().set_lamp_value(15, (m_leds_mux_data >> 4) & 1); /* Number 15 LED */
+ machine().output().set_lamp_value(32, (m_leds_mux_data >> 5) & 1); /* Number 32 LED */
+ machine().output().set_lamp_value( 0, (m_leds_mux_data >> 6) & 1); /* Number 0 LED */
+ machine().output().set_lamp_value(26, (m_leds_mux_data >> 7) & 1); /* Number 26 LED */
break;
}
case 0x04:
{
- output_set_lamp_value( 3, (m_leds_mux_data >> 0) & 1); /* Number 3 LED */
- output_set_lamp_value(35, (m_leds_mux_data >> 1) & 1); /* Number 35 LED */
- output_set_lamp_value(12, (m_leds_mux_data >> 2) & 1); /* Number 12 LED */
- output_set_lamp_value(28, (m_leds_mux_data >> 3) & 1); /* Number 28 LED */
- output_set_lamp_value( 7, (m_leds_mux_data >> 4) & 1); /* Number 7 LED */
- output_set_lamp_value(29, (m_leds_mux_data >> 5) & 1); /* Number 29 LED */
- output_set_lamp_value(18, (m_leds_mux_data >> 6) & 1); /* Number 18 LED */
+ machine().output().set_lamp_value( 3, (m_leds_mux_data >> 0) & 1); /* Number 3 LED */
+ machine().output().set_lamp_value(35, (m_leds_mux_data >> 1) & 1); /* Number 35 LED */
+ machine().output().set_lamp_value(12, (m_leds_mux_data >> 2) & 1); /* Number 12 LED */
+ machine().output().set_lamp_value(28, (m_leds_mux_data >> 3) & 1); /* Number 28 LED */
+ machine().output().set_lamp_value( 7, (m_leds_mux_data >> 4) & 1); /* Number 7 LED */
+ machine().output().set_lamp_value(29, (m_leds_mux_data >> 5) & 1); /* Number 29 LED */
+ machine().output().set_lamp_value(18, (m_leds_mux_data >> 6) & 1); /* Number 18 LED */
break;
}
case 0x08:
{
- output_set_lamp_value(22, (m_leds_mux_data >> 0) & 1); /* Number 22 LED */
- output_set_lamp_value( 9, (m_leds_mux_data >> 1) & 1); /* Number 9 LED */
- output_set_lamp_value(31, (m_leds_mux_data >> 2) & 1); /* Number 31 LED */
- output_set_lamp_value(14, (m_leds_mux_data >> 3) & 1); /* Number 14 LED */
- output_set_lamp_value(20, (m_leds_mux_data >> 4) & 1); /* Number 20 LED */
- output_set_lamp_value( 1, (m_leds_mux_data >> 5) & 1); /* Number 1 LED */
- output_set_lamp_value(33, (m_leds_mux_data >> 6) & 1); /* Number 33 LED */
+ machine().output().set_lamp_value(22, (m_leds_mux_data >> 0) & 1); /* Number 22 LED */
+ machine().output().set_lamp_value( 9, (m_leds_mux_data >> 1) & 1); /* Number 9 LED */
+ machine().output().set_lamp_value(31, (m_leds_mux_data >> 2) & 1); /* Number 31 LED */
+ machine().output().set_lamp_value(14, (m_leds_mux_data >> 3) & 1); /* Number 14 LED */
+ machine().output().set_lamp_value(20, (m_leds_mux_data >> 4) & 1); /* Number 20 LED */
+ machine().output().set_lamp_value( 1, (m_leds_mux_data >> 5) & 1); /* Number 1 LED */
+ machine().output().set_lamp_value(33, (m_leds_mux_data >> 6) & 1); /* Number 33 LED */
break;
}
case 0x10:
{
- output_set_lamp_value(16, (m_leds_mux_data >> 0) & 1); /* Number 16 LED */
- output_set_lamp_value(24, (m_leds_mux_data >> 1) & 1); /* Number 24 LED */
- output_set_lamp_value( 5, (m_leds_mux_data >> 2) & 1); /* Number 5 LED */
- output_set_lamp_value(10, (m_leds_mux_data >> 3) & 1); /* Number 10 LED */
- output_set_lamp_value(23, (m_leds_mux_data >> 4) & 1); /* Number 23 LED */
- output_set_lamp_value( 8, (m_leds_mux_data >> 5) & 1); /* Number 8 LED */
- output_set_lamp_value(30, (m_leds_mux_data >> 6) & 1); /* Number 30 LED */
+ machine().output().set_lamp_value(16, (m_leds_mux_data >> 0) & 1); /* Number 16 LED */
+ machine().output().set_lamp_value(24, (m_leds_mux_data >> 1) & 1); /* Number 24 LED */
+ machine().output().set_lamp_value( 5, (m_leds_mux_data >> 2) & 1); /* Number 5 LED */
+ machine().output().set_lamp_value(10, (m_leds_mux_data >> 3) & 1); /* Number 10 LED */
+ machine().output().set_lamp_value(23, (m_leds_mux_data >> 4) & 1); /* Number 23 LED */
+ machine().output().set_lamp_value( 8, (m_leds_mux_data >> 5) & 1); /* Number 8 LED */
+ machine().output().set_lamp_value(30, (m_leds_mux_data >> 6) & 1); /* Number 30 LED */
break;
}
@@ -500,7 +500,7 @@ WRITE8_MEMBER(kas89_state::led_mux_select_w)
{
for ( i = 0; i < 37; i++ )
{
- output_set_lamp_value(i, 1); /* All LEDs ON */
+ machine().output().set_lamp_value(i, 1); /* All LEDs ON */
}
}
}
diff --git a/src/mame/drivers/kenseim.cpp b/src/mame/drivers/kenseim.cpp
index 00a06c52462..926a504179c 100644
--- a/src/mame/drivers/kenseim.cpp
+++ b/src/mame/drivers/kenseim.cpp
@@ -190,14 +190,14 @@ public:
{
char temp[32];
sprintf(temp, "molea_%d", i);
- output_set_value(temp, mole_state_a[i]);
+ machine().output().set_value(temp, mole_state_a[i]);
}
for (int i = 0; i < 6; i++)
{
char temp[32];
sprintf(temp, "moleb_%d", i);
- output_set_value(temp, mole_state_b[i]);
+ machine().output().set_value(temp, mole_state_b[i]);
}
}
@@ -260,7 +260,7 @@ public:
void kenseim_state::set_leds(UINT32 ledstates)
{
for (int i=0; i<20; i++)
- output_set_lamp_value(i+1, ((ledstates & (1 << i)) != 0));
+ machine().output().set_lamp_value(i+1, ((ledstates & (1 << i)) != 0));
}
// could be wrong
@@ -354,8 +354,8 @@ WRITE8_MEMBER(kenseim_state::cpu_portc_w)
// d7: right start button lamp
machine().bookkeeping().coin_lockout_w(0, (data & 0x10) ? 0 : 1); // toggles if you attempt to insert a coin when there are already 15 coins inserted
machine().bookkeeping().coin_counter_w(0, (data & 0x20) ? 0 : 1);
- output_set_value("startlamp1", (data & 0x80) ? 0 : 1);
- output_set_value("startlamp2", (data & 0x40) ? 0 : 1);
+ machine().output().set_value("startlamp1", (data & 0x80) ? 0 : 1);
+ machine().output().set_value("startlamp2", (data & 0x40) ? 0 : 1);
}
diff --git a/src/mame/drivers/kim1.cpp b/src/mame/drivers/kim1.cpp
index eabedbe6315..86cb4039594 100644
--- a/src/mame/drivers/kim1.cpp
+++ b/src/mame/drivers/kim1.cpp
@@ -236,7 +236,7 @@ WRITE8_MEMBER( kim1_state::kim1_u2_write_a )
{
if ( data & 0x80 )
{
- output_set_digit_value( idx-4, data & 0x7f );
+ machine().output().set_digit_value( idx-4, data & 0x7f );
m_led_time[idx - 4] = 15;
}
}
@@ -290,7 +290,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(kim1_state::kim1_update_leds)
if ( m_led_time[i] )
m_led_time[i]--;
else
- output_set_digit_value( i, 0 );
+ machine().output().set_digit_value( i, 0 );
}
}
diff --git a/src/mame/drivers/kingdrby.cpp b/src/mame/drivers/kingdrby.cpp
index 5939a503db5..eadb20d8218 100644
--- a/src/mame/drivers/kingdrby.cpp
+++ b/src/mame/drivers/kingdrby.cpp
@@ -391,8 +391,8 @@ WRITE8_MEMBER(kingdrby_state::led_array_w)
they goes from 0 to 5, to indicate the number.
If one player bets something, the other led will toggle between p1 and p2 bets.
*/
- output_set_digit_value(0xf + offset, led_map[(data & 0xf0) >> 4]);
- output_set_digit_value(0x0 + offset, led_map[(data & 0x0f) >> 0]);
+ machine().output().set_digit_value(0xf + offset, led_map[(data & 0xf0) >> 4]);
+ machine().output().set_digit_value(0x0 + offset, led_map[(data & 0x0f) >> 0]);
}
diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp
index 9ac53694e40..b81163b83b7 100644
--- a/src/mame/drivers/konamigx.cpp
+++ b/src/mame/drivers/konamigx.cpp
@@ -981,7 +981,7 @@ WRITE32_MEMBER(konamigx_state::type4_prot_w)
// cabinet lamps for type 1 games
WRITE32_MEMBER(konamigx_state::type1_cablamps_w)
{
- set_led_status(machine(), 0, (data>>24)&1);
+ machine().output().set_led_value(0, (data>>24)&1);
}
/**********************************************************************************/
diff --git a/src/mame/drivers/kopunch.cpp b/src/mame/drivers/kopunch.cpp
index 85c00fa98a0..475f33088b9 100644
--- a/src/mame/drivers/kopunch.cpp
+++ b/src/mame/drivers/kopunch.cpp
@@ -113,7 +113,7 @@ READ8_MEMBER(kopunch_state::sensors2_r)
WRITE8_MEMBER(kopunch_state::lamp_w)
{
- set_led_status(machine(), 0, ~data & 0x80);
+ machine().output().set_led_value(0, ~data & 0x80);
}
WRITE8_MEMBER(kopunch_state::coin_w)
diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp
index ebdc29dfefd..fa91477f6b0 100644
--- a/src/mame/drivers/ksys573.cpp
+++ b/src/mame/drivers/ksys573.cpp
@@ -880,11 +880,11 @@ WRITE16_MEMBER( ksys573_state::ge765pwbba_w )
break;
case 0x40:
- output_set_value( "motor", data & 0xff );
+ machine().output().set_value( "motor", data & 0xff );
break;
case 0x44:
- output_set_value( "brake", data & 0xff );
+ machine().output().set_value( "brake", data & 0xff );
break;
case 0x50:
@@ -1079,19 +1079,19 @@ WRITE8_MEMBER( ksys573_state::ddr_output_callback )
switch( offset )
{
case 0:
- output_set_value( "foot 1p up", !data );
+ machine().output().set_value( "foot 1p up", !data );
break;
case 1:
- output_set_value( "foot 1p left", !data );
+ machine().output().set_value( "foot 1p left", !data );
break;
case 2:
- output_set_value( "foot 1p right", !data );
+ machine().output().set_value( "foot 1p right", !data );
break;
case 3:
- output_set_value( "foot 1p down", !data );
+ machine().output().set_value( "foot 1p down", !data );
break;
case 4:
@@ -1103,19 +1103,19 @@ WRITE8_MEMBER( ksys573_state::ddr_output_callback )
break;
case 8:
- output_set_value( "foot 2p up", !data );
+ machine().output().set_value( "foot 2p up", !data );
break;
case 9:
- output_set_value( "foot 2p left", !data );
+ machine().output().set_value( "foot 2p left", !data );
break;
case 10:
- output_set_value( "foot 2p right", !data );
+ machine().output().set_value( "foot 2p right", !data );
break;
case 11:
- output_set_value( "foot 2p down", !data );
+ machine().output().set_value( "foot 2p down", !data );
break;
case 12:
@@ -1127,32 +1127,32 @@ WRITE8_MEMBER( ksys573_state::ddr_output_callback )
break;
case 17:
- output_set_led_value( 0, !data ); // start 1
+ machine().output().set_led_value( 0, !data ); // start 1
break;
case 18:
- output_set_led_value( 1, !data ); // start 2
+ machine().output().set_led_value( 1, !data ); // start 2
break;
case 20:
- output_set_value( "body right low", !data );
+ machine().output().set_value( "body right low", !data );
break;
case 21:
- output_set_value( "body left low", !data );
+ machine().output().set_value( "body left low", !data );
break;
case 22:
- output_set_value( "body left high", !data );
+ machine().output().set_value( "body left high", !data );
break;
case 23:
- output_set_value( "body right high", !data );
+ machine().output().set_value( "body right high", !data );
break;
case 28: // digital
case 30: // analogue
- output_set_value( "speaker", !data );
+ machine().output().set_value( "speaker", !data );
break;
default:
@@ -1173,22 +1173,22 @@ DRIVER_INIT_MEMBER( ksys573_state, ddr )
WRITE_LINE_MEMBER( ksys573_state::gtrfrks_lamps_b7 )
{
- output_set_value( "spot left", state );
+ machine().output().set_value( "spot left", state );
}
WRITE_LINE_MEMBER( ksys573_state::gtrfrks_lamps_b6 )
{
- output_set_value( "spot right", state );
+ machine().output().set_value( "spot right", state );
}
WRITE_LINE_MEMBER( ksys573_state::gtrfrks_lamps_b5 )
{
- output_set_led_value( 0, state ); // start left
+ machine().output().set_led_value( 0, state ); // start left
}
WRITE_LINE_MEMBER( ksys573_state::gtrfrks_lamps_b4 )
{
- output_set_led_value( 1, state ); // start right
+ machine().output().set_led_value( 1, state ); // start right
}
/* ddr solo */
@@ -1205,39 +1205,39 @@ WRITE8_MEMBER( ksys573_state::ddrsolo_output_callback )
break;
case 8:
- output_set_value( "extra 4", !data );
+ machine().output().set_value( "extra 4", !data );
break;
case 9:
- output_set_value( "extra 2", !data );
+ machine().output().set_value( "extra 2", !data );
break;
case 10:
- output_set_value( "extra 1", !data );
+ machine().output().set_value( "extra 1", !data );
break;
case 11:
- output_set_value( "extra 3", !data );
+ machine().output().set_value( "extra 3", !data );
break;
case 16:
- output_set_value( "speaker", !data );
+ machine().output().set_value( "speaker", !data );
break;
case 20:
- output_set_led_value( 0, !data ); // start
+ machine().output().set_led_value( 0, !data ); // start
break;
case 21:
- output_set_value( "body center", !data );
+ machine().output().set_value( "body center", !data );
break;
case 22:
- output_set_value( "body right", !data );
+ machine().output().set_value( "body right", !data );
break;
case 23:
- output_set_value( "body left", !data );
+ machine().output().set_value( "body left", !data );
break;
default:
@@ -1254,52 +1254,52 @@ WRITE8_MEMBER( ksys573_state::drmn_output_callback )
{
case 0: // drmn2+
case 16: // drmn
- output_set_value( "hi-hat", !data );
+ machine().output().set_value( "hi-hat", !data );
break;
case 1: // drmn2+
case 17: // drmn
- output_set_value( "high tom", !data );
+ machine().output().set_value( "high tom", !data );
break;
case 2: // drmn2+
case 18: // drmn
- output_set_value( "low tom", !data );
+ machine().output().set_value( "low tom", !data );
break;
case 3: // drmn2+
case 19: // drmn
- output_set_value( "snare", !data );
+ machine().output().set_value( "snare", !data );
break;
case 8: // drmn2+
case 30: // drmn
- output_set_value( "spot left & right", !data );
+ machine().output().set_value( "spot left & right", !data );
break;
case 9: // drmn2+
case 31: // drmn
- output_set_value( "neon top", data );
+ machine().output().set_value( "neon top", data );
break;
case 11: // drmn2+
case 27: // drmn
- output_set_value( "neon woofer", data );
+ machine().output().set_value( "neon woofer", data );
break;
case 12: // drmn2+
case 20: // drmn
- output_set_value( "cymbal", !data );
+ machine().output().set_value( "cymbal", !data );
break;
case 13: // drmn2+
case 21: // drmn
- output_set_led_value( 0, data ); // start
+ machine().output().set_led_value( 0, data ); // start
break;
case 14: // drmn2+
case 22: // drmn
- output_set_value( "select button", data );
+ machine().output().set_value( "select button", data );
break;
case 23: // drmn
@@ -1324,111 +1324,111 @@ WRITE8_MEMBER( ksys573_state::dmx_output_callback )
switch( offset )
{
case 0:
- output_set_value( "blue io 8", !data );
+ machine().output().set_value( "blue io 8", !data );
break;
case 1:
- output_set_value( "blue io 9", !data );
+ machine().output().set_value( "blue io 9", !data );
break;
case 2:
- output_set_value( "red io 9", !data );
+ machine().output().set_value( "red io 9", !data );
break;
case 3:
- output_set_value( "red io 8", !data );
+ machine().output().set_value( "red io 8", !data );
break;
case 4:
- output_set_value( "blue io 6", !data );
+ machine().output().set_value( "blue io 6", !data );
break;
case 5:
- output_set_value( "blue io 7", !data );
+ machine().output().set_value( "blue io 7", !data );
break;
case 6:
- output_set_value( "red io 7", !data );
+ machine().output().set_value( "red io 7", !data );
break;
case 7:
- output_set_value( "red io 6", !data );
+ machine().output().set_value( "red io 6", !data );
break;
case 8:
- output_set_value( "blue io 4", !data );
+ machine().output().set_value( "blue io 4", !data );
break;
case 9:
- output_set_value( "blue io 5", !data );
+ machine().output().set_value( "blue io 5", !data );
break;
case 10:
- output_set_value( "red io 5", !data );
+ machine().output().set_value( "red io 5", !data );
break;
case 11:
- output_set_value( "red io 4", !data );
+ machine().output().set_value( "red io 4", !data );
break;
case 12:
- output_set_value( "blue io 10", !data );
+ machine().output().set_value( "blue io 10", !data );
break;
case 13:
- output_set_value( "blue io 11", !data );
+ machine().output().set_value( "blue io 11", !data );
break;
case 14:
- output_set_value( "red io 11", !data );
+ machine().output().set_value( "red io 11", !data );
break;
case 15:
- output_set_value( "red io 10", !data );
+ machine().output().set_value( "red io 10", !data );
break;
case 16:
- output_set_value( "blue io 0", !data );
+ machine().output().set_value( "blue io 0", !data );
break;
case 17:
- output_set_value( "blue io 1", !data );
+ machine().output().set_value( "blue io 1", !data );
break;
case 18:
- output_set_value( "red io 1", !data );
+ machine().output().set_value( "red io 1", !data );
break;
case 19:
- output_set_value( "red io 0", !data );
+ machine().output().set_value( "red io 0", !data );
break;
case 20:
- output_set_value( "blue io 2", !data );
+ machine().output().set_value( "blue io 2", !data );
break;
case 21:
- output_set_value( "blue io 3", !data );
+ machine().output().set_value( "blue io 3", !data );
break;
case 22:
- output_set_value( "red io 3", !data );
+ machine().output().set_value( "red io 3", !data );
break;
case 23:
- output_set_value( "red io 2", !data );
+ machine().output().set_value( "red io 2", !data );
break;
case 28:
- output_set_value( "yellow spot light", !data );
+ machine().output().set_value( "yellow spot light", !data );
break;
case 29:
- output_set_value( "blue spot light", !data );
+ machine().output().set_value( "blue spot light", !data );
break;
case 31:
- output_set_value( "pink spot light", !data );
+ machine().output().set_value( "pink spot light", !data );
break;
default:
@@ -1439,32 +1439,32 @@ WRITE8_MEMBER( ksys573_state::dmx_output_callback )
WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b0 )
{
- output_set_value( "left 2p", state );
+ machine().output().set_value( "left 2p", state );
}
WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b1 )
{
- output_set_led_value( 1, state ); // start 1p
+ machine().output().set_led_value( 1, state ); // start 1p
}
WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b2 )
{
- output_set_value( "right 2p", state );
+ machine().output().set_value( "right 2p", state );
}
WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b3 )
{
- output_set_value( "left 1p", state );
+ machine().output().set_value( "left 1p", state );
}
WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b4 )
{
- output_set_led_value( 0, state ); // start 2p
+ machine().output().set_led_value( 0, state ); // start 2p
}
WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b5 )
{
- output_set_value( "right 1p", state );
+ machine().output().set_value( "right 1p", state );
}
/* salary man champ */
@@ -1499,13 +1499,13 @@ WRITE_LINE_MEMBER( ksys573_state::salarymc_lamp_clk )
verboselog( 0, "unknown bits in salarymc_lamp_shift %08x\n", m_salarymc_lamp_shift & ~0xe38 );
}
- output_set_value( "player 1 red", ( m_salarymc_lamp_shift >> 11 ) & 1 );
- output_set_value( "player 1 green", ( m_salarymc_lamp_shift >> 10 ) & 1 );
- output_set_value( "player 1 blue", ( m_salarymc_lamp_shift >> 9 ) & 1 );
+ machine().output().set_value( "player 1 red", ( m_salarymc_lamp_shift >> 11 ) & 1 );
+ machine().output().set_value( "player 1 green", ( m_salarymc_lamp_shift >> 10 ) & 1 );
+ machine().output().set_value( "player 1 blue", ( m_salarymc_lamp_shift >> 9 ) & 1 );
- output_set_value( "player 2 red", ( m_salarymc_lamp_shift >> 5 ) & 1 );
- output_set_value( "player 2 green", ( m_salarymc_lamp_shift >> 4 ) & 1 );
- output_set_value( "player 2 blue", ( m_salarymc_lamp_shift >> 3 ) & 1 );
+ machine().output().set_value( "player 2 red", ( m_salarymc_lamp_shift >> 5 ) & 1 );
+ machine().output().set_value( "player 2 green", ( m_salarymc_lamp_shift >> 4 ) & 1 );
+ machine().output().set_value( "player 2 blue", ( m_salarymc_lamp_shift >> 3 ) & 1 );
m_salarymc_lamp_bits = 0;
m_salarymc_lamp_shift = 0;
@@ -1561,10 +1561,10 @@ WRITE_LINE_MEMBER( ksys573_state::hyperbbc_lamp_strobe1 )
{
if( state && !m_hyperbbc_lamp_strobe1 )
{
- output_set_value( "player 1 red", m_hyperbbc_lamp_red );
- output_set_value( "player 1 green", m_hyperbbc_lamp_green );
- output_set_value( "player 1 blue", m_hyperbbc_lamp_blue );
- output_set_value( "player 1 start", m_hyperbbc_lamp_start );
+ machine().output().set_value( "player 1 red", m_hyperbbc_lamp_red );
+ machine().output().set_value( "player 1 green", m_hyperbbc_lamp_green );
+ machine().output().set_value( "player 1 blue", m_hyperbbc_lamp_blue );
+ machine().output().set_value( "player 1 start", m_hyperbbc_lamp_start );
}
m_hyperbbc_lamp_strobe1 = state;
@@ -1574,10 +1574,10 @@ WRITE_LINE_MEMBER( ksys573_state::hyperbbc_lamp_strobe2 )
{
if( state && !m_hyperbbc_lamp_strobe2 )
{
- output_set_value( "player 2 red", m_hyperbbc_lamp_red );
- output_set_value( "player 2 green", m_hyperbbc_lamp_green );
- output_set_value( "player 2 blue", m_hyperbbc_lamp_blue );
- output_set_value( "player 2 start", m_hyperbbc_lamp_start );
+ machine().output().set_value( "player 2 red", m_hyperbbc_lamp_red );
+ machine().output().set_value( "player 2 green", m_hyperbbc_lamp_green );
+ machine().output().set_value( "player 2 blue", m_hyperbbc_lamp_blue );
+ machine().output().set_value( "player 2 start", m_hyperbbc_lamp_start );
}
m_hyperbbc_lamp_strobe2 = state;
@@ -1587,10 +1587,10 @@ WRITE_LINE_MEMBER( ksys573_state::hyperbbc_lamp_strobe3 )
{
if( state && !m_hyperbbc_lamp_strobe3 )
{
- output_set_value( "player 3 red", m_hyperbbc_lamp_red );
- output_set_value( "player 3 green", m_hyperbbc_lamp_green );
- output_set_value( "player 3 blue", m_hyperbbc_lamp_blue );
- output_set_value( "player 3 start", m_hyperbbc_lamp_start );
+ machine().output().set_value( "player 3 red", m_hyperbbc_lamp_red );
+ machine().output().set_value( "player 3 green", m_hyperbbc_lamp_green );
+ machine().output().set_value( "player 3 blue", m_hyperbbc_lamp_blue );
+ machine().output().set_value( "player 3 start", m_hyperbbc_lamp_start );
}
m_hyperbbc_lamp_strobe3 = state;
@@ -1642,42 +1642,42 @@ WRITE8_MEMBER( ksys573_state::mamboagg_output_callback )
switch( offset )
{
case 4:
- output_set_value( "fire lamp left", !data );
+ machine().output().set_value( "fire lamp left", !data );
break;
case 5:
- output_set_value( "fire fan left", !data );
+ machine().output().set_value( "fire fan left", !data );
break;
case 6:
- output_set_value( "fire fan right", !data );
+ machine().output().set_value( "fire fan right", !data );
break;
case 7:
- output_set_value( "fire lamp right", !data );
+ machine().output().set_value( "fire lamp right", !data );
break;
case 28:
- output_set_value( "conga left", !data );
+ machine().output().set_value( "conga left", !data );
break;
case 29:
- output_set_value( "conga right", !data );
+ machine().output().set_value( "conga right", !data );
break;
case 31:
- output_set_value( "conga centre", !data );
+ machine().output().set_value( "conga centre", !data );
break;
}
}
WRITE_LINE_MEMBER( ksys573_state::mamboagg_lamps_b3 )
{
- output_set_led_value( 0, state ); // start 1p
+ machine().output().set_led_value( 0, state ); // start 1p
}
WRITE_LINE_MEMBER( ksys573_state::mamboagg_lamps_b4 )
{
- output_set_value( "select right", state );
+ machine().output().set_value( "select right", state );
}
WRITE_LINE_MEMBER( ksys573_state::mamboagg_lamps_b5 )
{
- output_set_value( "select left", state );
+ machine().output().set_value( "select left", state );
}
@@ -1736,34 +1736,34 @@ WRITE8_MEMBER( ksys573_state::punchmania_output_callback )
switch( offset )
{
case 8:
- output_set_value( "select left right", !data );
+ machine().output().set_value( "select left right", !data );
break;
case 9:
pad_light[ 2 ] = !data;
- output_set_value( "left bottom lamp", !data );
+ machine().output().set_value( "left bottom lamp", !data );
break;
case 10:
pad_light[ 1 ] = !data;
- output_set_value( "left middle lamp", !data );
+ machine().output().set_value( "left middle lamp", !data );
break;
case 11:
- output_set_value( "start lamp", !data );
+ machine().output().set_value( "start lamp", !data );
break;
case 12:
pad_light[ 0 ] = !data;
- output_set_value( "left top lamp", !data );
+ machine().output().set_value( "left top lamp", !data );
break;
case 13:
pad_light[ 4 ] = !data;
- output_set_value( "right middle lamp", !data );
+ machine().output().set_value( "right middle lamp", !data );
break;
case 14:
pad_light[ 3 ] = !data;
- output_set_value( "right top lamp", !data );
+ machine().output().set_value( "right top lamp", !data );
break;
case 15:
pad_light[ 5 ] = !data;
- output_set_value( "right bottom lamp", !data );
+ machine().output().set_value( "right bottom lamp", !data );
break;
case 16:
if( data )
diff --git a/src/mame/drivers/kungfur.cpp b/src/mame/drivers/kungfur.cpp
index e6bf38c2d71..4f78bcea40f 100644
--- a/src/mame/drivers/kungfur.cpp
+++ b/src/mame/drivers/kungfur.cpp
@@ -124,20 +124,20 @@ WRITE8_MEMBER(kungfur_state::kungfur_output_w)
{
int offs = i << 3 | (data & 7);
if (lut_digits[offs])
- output_set_digit_value(lut_digits[offs] - 1, m_latch[i]);
+ machine().output().set_digit_value(lut_digits[offs] - 1, m_latch[i]);
}
// 2.6 goes to level lamps
if ((data & 7) == 6)
{
for (int i = 0; i < 5; i++)
- output_set_lamp_value(i, m_latch[2] >> i & 1);
+ machine().output().set_lamp_value(i, m_latch[2] >> i & 1);
}
// d7: game-over lamp, d3-d4: marquee lamps
- output_set_lamp_value(5, data >> 7 & 1);
- output_set_lamp_value(6, data >> 3 & 1);
- output_set_lamp_value(7, data >> 4 & 1);
+ machine().output().set_lamp_value(5, data >> 7 & 1);
+ machine().output().set_lamp_value(6, data >> 3 & 1);
+ machine().output().set_lamp_value(7, data >> 4 & 1);
// d5: N/C?
// d6: coincounter
diff --git a/src/mame/drivers/lc80.cpp b/src/mame/drivers/lc80.cpp
index 046bd69af0e..2f8e559f81a 100644
--- a/src/mame/drivers/lc80.cpp
+++ b/src/mame/drivers/lc80.cpp
@@ -141,7 +141,7 @@ void lc80_state::update_display()
for (i = 0; i < 6; i++)
{
- if (!BIT(m_digit, i)) output_set_digit_value(5 - i, m_segment);
+ if (!BIT(m_digit, i)) machine().output().set_digit_value(5 - i, m_segment);
}
}
@@ -211,7 +211,7 @@ WRITE8_MEMBER( lc80_state::pio1_pb_w )
m_speaker->level_w(!BIT(data, 1));
/* OUT led */
- output_set_led_value(0, !BIT(data, 1));
+ machine().output().set_led_value(0, !BIT(data, 1));
/* keyboard */
m_digit = data >> 2;
diff --git a/src/mame/drivers/lethalj.cpp b/src/mame/drivers/lethalj.cpp
index 902f13d22d0..db18b4dc111 100644
--- a/src/mame/drivers/lethalj.cpp
+++ b/src/mame/drivers/lethalj.cpp
@@ -177,16 +177,16 @@ WRITE16_MEMBER(lethalj_state::ripribit_control_w)
{
machine().bookkeeping().coin_counter_w(0, data & 1);
m_ticket->write(space, 0, ((data >> 1) & 1) << 7);
- output_set_lamp_value(0, (data >> 2) & 1);
+ machine().output().set_lamp_value(0, (data >> 2) & 1);
}
WRITE16_MEMBER(lethalj_state::cfarm_control_w)
{
m_ticket->write(space, 0, ((data >> 0) & 1) << 7);
- output_set_lamp_value(0, (data >> 2) & 1);
- output_set_lamp_value(1, (data >> 3) & 1);
- output_set_lamp_value(2, (data >> 4) & 1);
+ machine().output().set_lamp_value(0, (data >> 2) & 1);
+ machine().output().set_lamp_value(1, (data >> 3) & 1);
+ machine().output().set_lamp_value(2, (data >> 4) & 1);
machine().bookkeeping().coin_counter_w(0, (data >> 7) & 1);
}
@@ -194,9 +194,9 @@ WRITE16_MEMBER(lethalj_state::cfarm_control_w)
WRITE16_MEMBER(lethalj_state::cclownz_control_w)
{
m_ticket->write(space, 0, ((data >> 0) & 1) << 7);
- output_set_lamp_value(0, (data >> 2) & 1);
- output_set_lamp_value(1, (data >> 4) & 1);
- output_set_lamp_value(2, (data >> 5) & 1);
+ machine().output().set_lamp_value(0, (data >> 2) & 1);
+ machine().output().set_lamp_value(1, (data >> 4) & 1);
+ machine().output().set_lamp_value(2, (data >> 5) & 1);
machine().bookkeeping().coin_counter_w(0, (data >> 6) & 1);
}
diff --git a/src/mame/drivers/liberatr.cpp b/src/mame/drivers/liberatr.cpp
index 8e91f4e9afc..1d819801ef9 100644
--- a/src/mame/drivers/liberatr.cpp
+++ b/src/mame/drivers/liberatr.cpp
@@ -161,7 +161,7 @@ void liberatr_state::machine_start()
WRITE8_MEMBER( liberatr_state::led_w )
{
- set_led_status(machine(), offset, ~data & 0x10);
+ machine().output().set_led_value(offset, ~data & 0x10);
}
diff --git a/src/mame/drivers/lockon.cpp b/src/mame/drivers/lockon.cpp
index 9cd3536ea4d..b387401808e 100644
--- a/src/mame/drivers/lockon.cpp
+++ b/src/mame/drivers/lockon.cpp
@@ -428,7 +428,7 @@ WRITE8_MEMBER(lockon_state::ym2203_out_b)
machine().bookkeeping().coin_counter_w(2, data & 0x20);
/* 'Lock-On' lamp */
- set_led_status(machine(), 1, !(data & 0x10));
+ machine().output().set_led_value(1, !(data & 0x10));
}
/*************************************
diff --git a/src/mame/drivers/ltd.cpp b/src/mame/drivers/ltd.cpp
index 59bac085cee..ec7958ae956 100644
--- a/src/mame/drivers/ltd.cpp
+++ b/src/mame/drivers/ltd.cpp
@@ -315,21 +315,21 @@ WRITE8_MEMBER( ltd_state::port1_w )
if (m_clear)
{
if (row>7)
- output_set_digit_value(row+2, segment); // P2
+ machine().output().set_digit_value(row+2, segment); // P2
else
- output_set_digit_value(row, segment); // P1
+ machine().output().set_digit_value(row, segment); // P1
}
break;
case 8:
if (m_clear)
{
if (row>13)
- output_set_digit_value(row+26, segment); // credits / ball
+ machine().output().set_digit_value(row+26, segment); // credits / ball
else
if (row>7)
- output_set_digit_value(row+22, segment); // P4
+ machine().output().set_digit_value(row+22, segment); // P4
else
- output_set_digit_value(row+20, segment); // P3
+ machine().output().set_digit_value(row+20, segment); // P3
}
break;
}
@@ -370,8 +370,8 @@ DRIVER_INIT_MEMBER( ltd_state, ltd )
DRIVER_INIT_MEMBER( ltd_state, atla_ltd )
{
m_game = 1;
- output_set_digit_value(0, 0x3f);
- output_set_digit_value(10, 0x3f);
+ machine().output().set_digit_value(0, 0x3f);
+ machine().output().set_digit_value(10, 0x3f);
}
DRIVER_INIT_MEMBER( ltd_state, bhol_ltd )
@@ -401,24 +401,24 @@ TIMER_DEVICE_CALLBACK_MEMBER( ltd_state::timer_r )
switch(m_out_offs-0x60)
{
case 0:
- output_set_digit_value(1, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(2, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(1, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(2, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 1:
- output_set_digit_value(11, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(12, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(11, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(12, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 2:
- output_set_digit_value(3, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(4, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(3, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(4, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 3:
- output_set_digit_value(13, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(14, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(13, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(14, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 8:
- output_set_digit_value(41, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(40, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(41, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(40, patterns[m_p_ram[m_out_offs]>>4]);
break;
}
break;
@@ -428,32 +428,32 @@ TIMER_DEVICE_CALLBACK_MEMBER( ltd_state::timer_r )
switch(m_out_offs-0x60)
{
case 0:
- output_set_digit_value(0, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(1, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(0, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(1, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 1:
- output_set_digit_value(10, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(11, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(10, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(11, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 2:
- output_set_digit_value(2, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(3, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(2, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(3, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 3:
- output_set_digit_value(12, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(13, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(12, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(13, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 4:
- output_set_digit_value(4, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(5, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(4, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(5, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 5:
- output_set_digit_value(14, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(15, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(14, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(15, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 8:
- output_set_digit_value(41, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(40, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(41, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(40, patterns[m_p_ram[m_out_offs]>>4]);
break;
}
break;
@@ -463,44 +463,44 @@ TIMER_DEVICE_CALLBACK_MEMBER( ltd_state::timer_r )
switch(m_out_offs-0x60)
{
case 0:
- output_set_digit_value(0, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(1, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(0, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(1, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 1:
- output_set_digit_value(2, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(3, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(2, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(3, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 2:
- output_set_digit_value(4, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(5, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(4, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(5, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 3:
- output_set_digit_value(10, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(11, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(10, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(11, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 4:
- output_set_digit_value(12, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(13, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(12, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(13, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 5:
- output_set_digit_value(14, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(15, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(14, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(15, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 6:
- output_set_digit_value(20, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(21, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(20, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(21, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 7:
- output_set_digit_value(22, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(23, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(22, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(23, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 8:
- output_set_digit_value(24, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(25, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(24, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(25, patterns[m_p_ram[m_out_offs]>>4]);
break;
case 9:
- output_set_digit_value(40, patterns[m_p_ram[m_out_offs]&15]);
- output_set_digit_value(41, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(40, patterns[m_p_ram[m_out_offs]&15]);
+ machine().output().set_digit_value(41, patterns[m_p_ram[m_out_offs]>>4]);
break;
}
break;
diff --git a/src/mame/drivers/luckgrln.cpp b/src/mame/drivers/luckgrln.cpp
index 126ec5490e7..6d10f7265e3 100644
--- a/src/mame/drivers/luckgrln.cpp
+++ b/src/mame/drivers/luckgrln.cpp
@@ -521,14 +521,14 @@ WRITE8_MEMBER(luckgrln_state::lamps_a_w)
x--- ---- TAKE
*/
- output_set_lamp_value(0, (data >> 0) & 1); /* HOLD1 */
- output_set_lamp_value(1, (data >> 1) & 1); /* HOLD2 */
- output_set_lamp_value(2, (data >> 2) & 1); /* HOLD3 */
- output_set_lamp_value(3, (data >> 3) & 1); /* HOLD4 */
- output_set_lamp_value(4, (data >> 4) & 1); /* HOLD5 */
- output_set_lamp_value(5, (data >> 5) & 1); /* START */
- output_set_lamp_value(6, (data >> 6) & 1); /* BET */
- output_set_lamp_value(7, (data >> 7) & 1); /* TAKE */
+ machine().output().set_lamp_value(0, (data >> 0) & 1); /* HOLD1 */
+ machine().output().set_lamp_value(1, (data >> 1) & 1); /* HOLD2 */
+ machine().output().set_lamp_value(2, (data >> 2) & 1); /* HOLD3 */
+ machine().output().set_lamp_value(3, (data >> 3) & 1); /* HOLD4 */
+ machine().output().set_lamp_value(4, (data >> 4) & 1); /* HOLD5 */
+ machine().output().set_lamp_value(5, (data >> 5) & 1); /* START */
+ machine().output().set_lamp_value(6, (data >> 6) & 1); /* BET */
+ machine().output().set_lamp_value(7, (data >> 7) & 1); /* TAKE */
}
WRITE8_MEMBER(luckgrln_state::lamps_b_w)
@@ -544,10 +544,10 @@ WRITE8_MEMBER(luckgrln_state::lamps_b_w)
xx-- ---- unused
*/
- output_set_lamp_value(8, (data >> 0) & 1); /* D-UP */
- output_set_lamp_value(9, (data >> 1) & 1); /* HIGH */
- output_set_lamp_value(10, (data >> 2) & 1); /* LOW */
- output_set_lamp_value(11, (data >> 3) & 1); /* CANCEL */
+ machine().output().set_lamp_value(8, (data >> 0) & 1); /* D-UP */
+ machine().output().set_lamp_value(9, (data >> 1) & 1); /* HIGH */
+ machine().output().set_lamp_value(10, (data >> 2) & 1); /* LOW */
+ machine().output().set_lamp_value(11, (data >> 3) & 1); /* CANCEL */
}
WRITE8_MEMBER(luckgrln_state::counters_w)
diff --git a/src/mame/drivers/lucky74.cpp b/src/mame/drivers/lucky74.cpp
index ae654165df3..d87822ddbc8 100644
--- a/src/mame/drivers/lucky74.cpp
+++ b/src/mame/drivers/lucky74.cpp
@@ -874,10 +874,10 @@ WRITE8_MEMBER(lucky74_state::lamps_a_w)
---- xx-- BIG + SMALL (need to be individualized)
*/
- output_set_lamp_value(8, (data >> 0) & 1); /* D-UP */
- output_set_lamp_value(9, (data >> 1) & 1); /* TAKE SCORE */
- output_set_lamp_value(10, (data >> 2) & 1); /* BIG */
- output_set_lamp_value(11, (data >> 3) & 1); /* SMALL */
+ machine().output().set_lamp_value(8, (data >> 0) & 1); /* D-UP */
+ machine().output().set_lamp_value(9, (data >> 1) & 1); /* TAKE SCORE */
+ machine().output().set_lamp_value(10, (data >> 2) & 1); /* BIG */
+ machine().output().set_lamp_value(11, (data >> 3) & 1); /* SMALL */
}
WRITE8_MEMBER(lucky74_state::lamps_b_w)
@@ -894,14 +894,14 @@ WRITE8_MEMBER(lucky74_state::lamps_b_w)
x--- ---- CANCEL (should lit start too?)
*/
- output_set_lamp_value(0, (data >> 0) & 1); /* HOLD1 */
- output_set_lamp_value(1, (data >> 1) & 1); /* HOLD2 */
- output_set_lamp_value(2, (data >> 2) & 1); /* HOLD3 */
- output_set_lamp_value(3, (data >> 3) & 1); /* HOLD4 */
- output_set_lamp_value(4, (data >> 4) & 1); /* HOLD5 */
- output_set_lamp_value(5, (data >> 5) & 1); /* BET */
- output_set_lamp_value(6, ((data >> 6) & 1)|((data >> 7) & 1)); /* START */
- output_set_lamp_value(7, (data >> 7) & 1); /* CANCEL */
+ machine().output().set_lamp_value(0, (data >> 0) & 1); /* HOLD1 */
+ machine().output().set_lamp_value(1, (data >> 1) & 1); /* HOLD2 */
+ machine().output().set_lamp_value(2, (data >> 2) & 1); /* HOLD3 */
+ machine().output().set_lamp_value(3, (data >> 3) & 1); /* HOLD4 */
+ machine().output().set_lamp_value(4, (data >> 4) & 1); /* HOLD5 */
+ machine().output().set_lamp_value(5, (data >> 5) & 1); /* BET */
+ machine().output().set_lamp_value(6, ((data >> 6) & 1)|((data >> 7) & 1)); /* START */
+ machine().output().set_lamp_value(7, (data >> 7) & 1); /* CANCEL */
}
diff --git a/src/mame/drivers/m79amb.cpp b/src/mame/drivers/m79amb.cpp
index 2d7a5c0836c..40dcbddeda5 100644
--- a/src/mame/drivers/m79amb.cpp
+++ b/src/mame/drivers/m79amb.cpp
@@ -111,7 +111,7 @@ WRITE8_MEMBER(m79amb_state::m79amb_8002_w)
{
/* D1 may also be watchdog reset */
/* port goes to 0x7f to turn on explosion lamp */
- output_set_value("EXP_LAMP", data ? 1 : 0);
+ machine().output().set_value("EXP_LAMP", data ? 1 : 0);
}
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, m79amb_state )
diff --git a/src/mame/drivers/magic10.cpp b/src/mame/drivers/magic10.cpp
index 211cd05d6ea..cbd1a031f50 100644
--- a/src/mame/drivers/magic10.cpp
+++ b/src/mame/drivers/magic10.cpp
@@ -270,14 +270,14 @@ WRITE16_MEMBER(magic10_state::magic10_out_w)
// popmessage("lamps: %02X", data);
- output_set_lamp_value(1, (data & 1)); /* Lamp 1 - HOLD 1 */
- output_set_lamp_value(2, (data >> 1) & 1); /* Lamp 2 - HOLD 2 */
- output_set_lamp_value(3, (data >> 2) & 1); /* Lamp 3 - HOLD 3 */
- output_set_lamp_value(4, (data >> 3) & 1); /* Lamp 4 - HOLD 4 */
- output_set_lamp_value(5, (data >> 4) & 1); /* Lamp 5 - HOLD 5 */
- output_set_lamp_value(6, (data >> 5) & 1); /* Lamp 6 - START */
- output_set_lamp_value(7, (data >> 6) & 1); /* Lamp 7 - PLAY (BET/TAKE/CANCEL) */
- output_set_lamp_value(8, (data >> 8) & 1); /* Lamp 8 - PAYOUT/SUPERGAME */
+ machine().output().set_lamp_value(1, (data & 1)); /* Lamp 1 - HOLD 1 */
+ machine().output().set_lamp_value(2, (data >> 1) & 1); /* Lamp 2 - HOLD 2 */
+ machine().output().set_lamp_value(3, (data >> 2) & 1); /* Lamp 3 - HOLD 3 */
+ machine().output().set_lamp_value(4, (data >> 3) & 1); /* Lamp 4 - HOLD 4 */
+ machine().output().set_lamp_value(5, (data >> 4) & 1); /* Lamp 5 - HOLD 5 */
+ machine().output().set_lamp_value(6, (data >> 5) & 1); /* Lamp 6 - START */
+ machine().output().set_lamp_value(7, (data >> 6) & 1); /* Lamp 7 - PLAY (BET/TAKE/CANCEL) */
+ machine().output().set_lamp_value(8, (data >> 8) & 1); /* Lamp 8 - PAYOUT/SUPERGAME */
machine().bookkeeping().coin_counter_w(0, data & 0x400);
}
diff --git a/src/mame/drivers/mainevt.cpp b/src/mame/drivers/mainevt.cpp
index 99ecb9851da..0682cd41962 100644
--- a/src/mame/drivers/mainevt.cpp
+++ b/src/mame/drivers/mainevt.cpp
@@ -68,10 +68,10 @@ WRITE8_MEMBER(mainevt_state::mainevt_coin_w)
{
machine().bookkeeping().coin_counter_w(0, data & 0x10);
machine().bookkeeping().coin_counter_w(1, data & 0x20);
- set_led_status(machine(), 0, data & 0x01);
- set_led_status(machine(), 1, data & 0x02);
- set_led_status(machine(), 2, data & 0x04);
- set_led_status(machine(), 3, data & 0x08);
+ machine().output().set_led_value(0, data & 0x01);
+ machine().output().set_led_value(1, data & 0x02);
+ machine().output().set_led_value(2, data & 0x04);
+ machine().output().set_led_value(3, data & 0x08);
}
WRITE8_MEMBER(mainevt_state::mainevt_sh_irqtrigger_w)
diff --git a/src/mame/drivers/majorpkr.cpp b/src/mame/drivers/majorpkr.cpp
index 73443543037..029fc705855 100644
--- a/src/mame/drivers/majorpkr.cpp
+++ b/src/mame/drivers/majorpkr.cpp
@@ -663,13 +663,13 @@ WRITE8_MEMBER(majorpkr_state::lamps_a_w)
-x-- ---- Small lamp.
x--- ---- Unknown.
*/
- output_set_lamp_value(0, (data) & 1); /* Lamp 0: Hold 1 */
- output_set_lamp_value(1, (data >> 1) & 1); /* Lamp 1: Hold 2 */
- output_set_lamp_value(2, (data >> 2) & 1); /* Lamp 2: Hold 3 */
- output_set_lamp_value(3, (data >> 3) & 1); /* Lamp 3: Hold 4 */
- output_set_lamp_value(4, (data >> 4) & 1); /* Lamp 4: Hold 5 */
- output_set_lamp_value(5, (data >> 5) & 1); /* Lamp 5: Big or Small (need identification) */
- output_set_lamp_value(6, (data >> 6) & 1); /* Lamp 6: Big or Small (need identification) */
+ machine().output().set_lamp_value(0, (data) & 1); /* Lamp 0: Hold 1 */
+ machine().output().set_lamp_value(1, (data >> 1) & 1); /* Lamp 1: Hold 2 */
+ machine().output().set_lamp_value(2, (data >> 2) & 1); /* Lamp 2: Hold 3 */
+ machine().output().set_lamp_value(3, (data >> 3) & 1); /* Lamp 3: Hold 4 */
+ machine().output().set_lamp_value(4, (data >> 4) & 1); /* Lamp 4: Hold 5 */
+ machine().output().set_lamp_value(5, (data >> 5) & 1); /* Lamp 5: Big or Small (need identification) */
+ machine().output().set_lamp_value(6, (data >> 6) & 1); /* Lamp 6: Big or Small (need identification) */
if (data & 0x80)
logerror("Lamps A: Write to 13h: %02x\n", data);
@@ -689,12 +689,12 @@ WRITE8_MEMBER(majorpkr_state::lamps_b_w)
--x- ---- Fever lamp.
xx-- ---- Unknown.
*/
- output_set_lamp_value(7, (data) & 1); /* Lamp 7: Bet */
- output_set_lamp_value(8, (data >> 1) & 1); /* Lamp 8: Draw */
- output_set_lamp_value(9, (data >> 2) & 1); /* Lamp 9: Cancel */
- output_set_lamp_value(10, (data >> 3) & 1); /* Lamp 10: Take */
- output_set_lamp_value(11, (data >> 4) & 1); /* Lamp 11: D-UP */
- output_set_lamp_value(12, (data >> 5) & 1); /* Lamp 12: Fever */
+ machine().output().set_lamp_value(7, (data) & 1); /* Lamp 7: Bet */
+ machine().output().set_lamp_value(8, (data >> 1) & 1); /* Lamp 8: Draw */
+ machine().output().set_lamp_value(9, (data >> 2) & 1); /* Lamp 9: Cancel */
+ machine().output().set_lamp_value(10, (data >> 3) & 1); /* Lamp 10: Take */
+ machine().output().set_lamp_value(11, (data >> 4) & 1); /* Lamp 11: D-UP */
+ machine().output().set_lamp_value(12, (data >> 5) & 1); /* Lamp 12: Fever */
if (data & 0xc0)
logerror("Lamps B: Write to 14h: %02x\n", data);
diff --git a/src/mame/drivers/mappy.cpp b/src/mame/drivers/mappy.cpp
index e36ebb8bbb2..f3eeae0fd3e 100644
--- a/src/mame/drivers/mappy.cpp
+++ b/src/mame/drivers/mappy.cpp
@@ -1624,8 +1624,8 @@ WRITE8_MEMBER(mappy_state::out_mux)
WRITE8_MEMBER(mappy_state::out_lamps)
{
- set_led_status(machine(), 0, data & 1);
- set_led_status(machine(), 1, data & 2);
+ machine().output().set_led_value(0, data & 1);
+ machine().output().set_led_value(1, data & 2);
machine().bookkeeping().coin_lockout_global_w(data & 4);
machine().bookkeeping().coin_counter_w(0, ~data & 8);
}
diff --git a/src/mame/drivers/maxaflex.cpp b/src/mame/drivers/maxaflex.cpp
index d29164ba6aa..aab69617691 100644
--- a/src/mame/drivers/maxaflex.cpp
+++ b/src/mame/drivers/maxaflex.cpp
@@ -165,10 +165,10 @@ WRITE8_MEMBER(maxaflex_state::mcu_portB_w)
/* latch for lamps */
if ((diff & 0x40) && !(data & 0x40))
{
- output_set_lamp_value(0, (m_portC_out >> 0) & 1);
- output_set_lamp_value(1, (m_portC_out >> 1) & 1);
- output_set_lamp_value(2, (m_portC_out >> 2) & 1);
- output_set_lamp_value(3, (m_portC_out >> 3) & 1);
+ machine().output().set_lamp_value(0, (m_portC_out >> 0) & 1);
+ machine().output().set_lamp_value(1, (m_portC_out >> 1) & 1);
+ machine().output().set_lamp_value(2, (m_portC_out >> 2) & 1);
+ machine().output().set_lamp_value(3, (m_portC_out >> 3) & 1);
}
}
@@ -194,9 +194,9 @@ WRITE8_MEMBER(maxaflex_state::mcu_portC_w)
/* displays */
switch( m_portB_out & 0x3 )
{
- case 0x0: output_set_digit_value(0, ls48_map[m_portC_out]); break;
- case 0x1: output_set_digit_value(1, ls48_map[m_portC_out]); break;
- case 0x2: output_set_digit_value(2, ls48_map[m_portC_out]); break;
+ case 0x0: machine().output().set_digit_value(0, ls48_map[m_portC_out]); break;
+ case 0x1: machine().output().set_digit_value(1, ls48_map[m_portC_out]); break;
+ case 0x2: machine().output().set_digit_value(2, ls48_map[m_portC_out]); break;
case 0x3: break;
}
}
@@ -410,13 +410,13 @@ void maxaflex_state::machine_reset()
m_tdr = m_tcr = 0;
m_mcu_timer = machine().device<timer_device>("mcu_timer");
- output_set_lamp_value(0, 0);
- output_set_lamp_value(1, 0);
- output_set_lamp_value(2, 0);
- output_set_lamp_value(3, 0);
- output_set_digit_value(0, 0x00);
- output_set_digit_value(1, 0x00);
- output_set_digit_value(2, 0x00);
+ machine().output().set_lamp_value(0, 0);
+ machine().output().set_lamp_value(1, 0);
+ machine().output().set_lamp_value(2, 0);
+ machine().output().set_lamp_value(3, 0);
+ machine().output().set_digit_value(0, 0x00);
+ machine().output().set_digit_value(1, 0x00);
+ machine().output().set_digit_value(2, 0x00);
}
TIMER_DEVICE_CALLBACK_MEMBER( maxaflex_state::mf_interrupt )
diff --git a/src/mame/drivers/maygay1b.cpp b/src/mame/drivers/maygay1b.cpp
index 68baa532a57..53f0843320c 100644
--- a/src/mame/drivers/maygay1b.cpp
+++ b/src/mame/drivers/maygay1b.cpp
@@ -159,7 +159,7 @@ WRITE8_MEMBER(maygay1b_state::m1_pia_portb_w)
{
if ( data & (1 << i) )
{
- output_set_indexed_value("triac", i, data & (1 << i));
+ machine().output().set_indexed_value("triac", i, data & (1 << i));
}
}
}
@@ -289,8 +289,8 @@ WRITE8_MEMBER(maygay1b_state::reel12_w)
m_reel0->update( data & 0x0F);
m_reel1->update((data>>4) & 0x0F);
- awp_draw_reel("reel1", m_reel0);
- awp_draw_reel("reel2", m_reel1);
+ awp_draw_reel(machine(),"reel1", m_reel0);
+ awp_draw_reel(machine(),"reel2", m_reel1);
}
WRITE8_MEMBER(maygay1b_state::reel34_w)
@@ -298,8 +298,8 @@ WRITE8_MEMBER(maygay1b_state::reel34_w)
m_reel2->update( data & 0x0F);
m_reel3->update((data>>4) & 0x0F);
- awp_draw_reel("reel3", m_reel2);
- awp_draw_reel("reel4", m_reel3);
+ awp_draw_reel(machine(),"reel3", m_reel2);
+ awp_draw_reel(machine(),"reel4", m_reel3);
}
WRITE8_MEMBER(maygay1b_state::reel56_w)
@@ -307,8 +307,8 @@ WRITE8_MEMBER(maygay1b_state::reel56_w)
m_reel4->update( data & 0x0F);
m_reel5->update((data>>4) & 0x0F);
- awp_draw_reel("reel5", m_reel4);
- awp_draw_reel("reel6", m_reel5);
+ awp_draw_reel(machine(),"reel5", m_reel4);
+ awp_draw_reel(machine(),"reel6", m_reel5);
}
READ8_MEMBER(maygay1b_state::m1_duart_r)
@@ -550,7 +550,7 @@ WRITE8_MEMBER( maygay1b_state::lamp_data_w )
for (int i = 0; i < 8; i++)
{
- output_set_lamp_value((8*m_lamp_strobe)+i, ((data & (1 << i)) !=0));
+ machine().output().set_lamp_value((8*m_lamp_strobe)+i, ((data & (1 << i)) !=0));
}
m_old_lamp_strobe = m_lamp_strobe;
}
@@ -575,7 +575,7 @@ WRITE8_MEMBER( maygay1b_state::lamp_data_2_w )
for (int i = 0; i < 8; i++)
{
- output_set_lamp_value((8*m_lamp_strobe)+i+128, ((data & (1 << i)) !=0));
+ machine().output().set_lamp_value((8*m_lamp_strobe)+i+128, ((data & (1 << i)) !=0));
}
m_old_lamp_strobe2 = m_lamp_strobe2;
}
diff --git a/src/mame/drivers/maygayv1.cpp b/src/mame/drivers/maygayv1.cpp
index 36f074865aa..44c4d515e1f 100644
--- a/src/mame/drivers/maygayv1.cpp
+++ b/src/mame/drivers/maygayv1.cpp
@@ -523,7 +523,7 @@ WRITE8_MEMBER( maygayv1_state::lamp_data_w )
for (int i = 0; i < 8; i++)
{
- output_set_lamp_value((8*m_lamp_strobe)+i, ((data & (1 << i)) !=0));
+ machine().output().set_lamp_value((8*m_lamp_strobe)+i, ((data & (1 << i)) !=0));
}
m_old_lamp_strobe = m_lamp_strobe;
}
diff --git a/src/mame/drivers/mazerbla.cpp b/src/mame/drivers/mazerbla.cpp
index e18df263c85..0419a61f3ed 100644
--- a/src/mame/drivers/mazerbla.cpp
+++ b/src/mame/drivers/mazerbla.cpp
@@ -876,7 +876,7 @@ WRITE8_MEMBER(mazerbla_state::zpu_led_w)
{
/* 0x6e - reset (offset = 0)*/
/* 0x6f - set */
- set_led_status(machine(), 0, offset & 1);
+ machine().output().set_led_value(0, offset & 1);
}
WRITE8_MEMBER(mazerbla_state::zpu_lamps_w)
@@ -884,8 +884,8 @@ WRITE8_MEMBER(mazerbla_state::zpu_lamps_w)
/* bit 4 = /LAMP0 */
/* bit 5 = /LAMP1 */
- /*set_led_status(machine(), 0, (data & 0x10) >> 4);*/
- /*set_led_status(machine(), 1, (data & 0x20) >> 4);*/
+ /*machine().output().set_led_value(0, (data & 0x10) >> 4);*/
+ /*machine().output().set_led_value(1, (data & 0x20) >> 4);*/
}
WRITE8_MEMBER(mazerbla_state::zpu_coin_counter_w)
@@ -897,13 +897,13 @@ WRITE8_MEMBER(mazerbla_state::zpu_coin_counter_w)
WRITE8_MEMBER(mazerbla_state::cfb_led_w)
{
/* bit 7 - led on */
- set_led_status(machine(), 2, BIT(data, 7));
+ machine().output().set_led_value(2, BIT(data, 7));
}
WRITE8_MEMBER(mazerbla_state::gg_led_ctrl_w)
{
/* bit 0, bit 1 - led on */
- set_led_status(machine(), 1, BIT(data, 0));
+ machine().output().set_led_value(1, BIT(data, 0));
}
@@ -918,7 +918,7 @@ WRITE8_MEMBER(mazerbla_state::vsb_ls273_audio_control_w)
m_vsb_ls273 = data;
/* bit 5 - led on */
- set_led_status(machine(), 1, BIT(data, 5));
+ machine().output().set_led_value(1, BIT(data, 5));
}
READ8_MEMBER(mazerbla_state::soundcommand_r)
diff --git a/src/mame/drivers/mbdtower.cpp b/src/mame/drivers/mbdtower.cpp
index 4bc6a99450d..78fe0aea9b1 100644
--- a/src/mame/drivers/mbdtower.cpp
+++ b/src/mame/drivers/mbdtower.cpp
@@ -107,7 +107,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mbdtower_state::motor_sim_tick)
// on change, output info
if (m_motor_pos != m_motor_pos_prev)
- output_set_value("motor_pos", 100 * (m_motor_pos / (float)0x80));
+ machine().output().set_value("motor_pos", 100 * (m_motor_pos / (float)0x80));
/* 3 display cards per hole, like this:
@@ -119,7 +119,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mbdtower_state::motor_sim_tick)
*/
int card_pos = m_motor_pos >> 4 & 7;
if (card_pos != (m_motor_pos_prev >> 4 & 7))
- output_set_value("card_pos", card_pos);
+ machine().output().set_value("card_pos", card_pos);
m_motor_pos_prev = m_motor_pos;
}
@@ -139,7 +139,7 @@ WRITE16_MEMBER(mbdtower_state::write_r)
// R9: motor on
if ((m_r ^ data) & 0x200)
- output_set_value("motor_on", data >> 9 & 1);
+ machine().output().set_value("motor_on", data >> 9 & 1);
if (data & 0x200)
m_motor_on = true;
diff --git a/src/mame/drivers/mcr.cpp b/src/mame/drivers/mcr.cpp
index a02781e4d56..26296cda52f 100644
--- a/src/mame/drivers/mcr.cpp
+++ b/src/mame/drivers/mcr.cpp
@@ -421,24 +421,24 @@ READ8_MEMBER(mcr_state::dpoker_ip0_r)
WRITE8_MEMBER(mcr_state::dpoker_lamps1_w)
{
// cpanel button lamps (white)
- output_set_lamp_value(0, data >> 0 & 1); // hold 1
- output_set_lamp_value(1, data >> 4 & 1); // hold 2
- output_set_lamp_value(2, data >> 5 & 1); // hold 3
- output_set_lamp_value(3, data >> 6 & 1); // hold 4
- output_set_lamp_value(4, data >> 7 & 1); // hold 5
- output_set_lamp_value(5, data >> 1 & 1); // deal
- output_set_lamp_value(6, data >> 2 & 1); // cancel
- output_set_lamp_value(7, data >> 3 & 1); // stand
+ machine().output().set_lamp_value(0, data >> 0 & 1); // hold 1
+ machine().output().set_lamp_value(1, data >> 4 & 1); // hold 2
+ machine().output().set_lamp_value(2, data >> 5 & 1); // hold 3
+ machine().output().set_lamp_value(3, data >> 6 & 1); // hold 4
+ machine().output().set_lamp_value(4, data >> 7 & 1); // hold 5
+ machine().output().set_lamp_value(5, data >> 1 & 1); // deal
+ machine().output().set_lamp_value(6, data >> 2 & 1); // cancel
+ machine().output().set_lamp_value(7, data >> 3 & 1); // stand
}
WRITE8_MEMBER(mcr_state::dpoker_lamps2_w)
{
// d5: button lamp: service or change
- output_set_lamp_value(8, data >> 5 & 1);
+ machine().output().set_lamp_value(8, data >> 5 & 1);
// d0-d4: marquee lamps: coin 1 to 5 --> output lamps 9 to 13
for (int i = 0; i < 5; i++)
- output_set_lamp_value(9 + i, data >> i & 1);
+ machine().output().set_lamp_value(9 + i, data >> i & 1);
// d6, d7: unused?
}
@@ -590,7 +590,7 @@ WRITE8_MEMBER(mcr_state::dotron_op4_w)
*/
/* bit 7 = FL1 (J1-3) on flasher control board */
/* bit 6 = FL0 (J1-4) on flasher control board */
- output_set_value("backlight", (data >> 6) & 1);
+ machine().output().set_value("backlight", (data >> 6) & 1);
/*
Lamp Sequencer:
diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp
index cc0a1347ce1..31649c68653 100644
--- a/src/mame/drivers/mcr3.cpp
+++ b/src/mame/drivers/mcr3.cpp
@@ -321,9 +321,9 @@ WRITE8_MEMBER(mcr3_state::powerdrv_op5_w)
/* bit 3 -> J1-10 = lamp 1 */
/* bit 2 -> J1-8 = lamp 2 */
/* bit 1 -> J1-6 = lamp 3 */
- set_led_status(machine(), 0, (data >> 3) & 1);
- set_led_status(machine(), 1, (data >> 2) & 1);
- set_led_status(machine(), 2, (data >> 1) & 1);
+ machine().output().set_led_value(0, (data >> 3) & 1);
+ machine().output().set_led_value(1, (data >> 2) & 1);
+ machine().output().set_led_value(2, (data >> 1) & 1);
/* remaining bits go to standard connections */
mcrmono_control_port_w(space, offset, data);
@@ -364,9 +364,9 @@ WRITE8_MEMBER(mcr3_state::stargrds_op5_w)
/* bit 2 controls light #0 */
/* bit 3 controls light #1 */
/* bit 4 controls light #2 */
- set_led_status(machine(), 0, (data >> 2) & 1);
- set_led_status(machine(), 1, (data >> 3) & 1);
- set_led_status(machine(), 2, (data >> 4) & 1);
+ machine().output().set_led_value(0, (data >> 2) & 1);
+ machine().output().set_led_value(1, (data >> 3) & 1);
+ machine().output().set_led_value(2, (data >> 4) & 1);
/* remaining bits go to standard connections */
mcrmono_control_port_w(space, offset, data);
@@ -431,7 +431,7 @@ WRITE8_MEMBER(mcr3_state::spyhunt_op4_w)
/* bit 2 -> J1-11 (A2) */
/* bit 1 -> J1-10 (A1) */
/* bit 0 -> J1-12 (A0) */
- output_set_value(lampname[data & 7], (data >> 3) & 1);
+ machine().output().set_value(lampname[data & 7], (data >> 3) & 1);
}
m_last_op4 = data;
diff --git a/src/mame/drivers/megatech.cpp b/src/mame/drivers/megatech.cpp
index a455dc369a6..11073ad076d 100644
--- a/src/mame/drivers/megatech.cpp
+++ b/src/mame/drivers/megatech.cpp
@@ -478,11 +478,11 @@ WRITE8_MEMBER(mtech_state::bios_ctrl_w )
{
if (offset == 1)
{
- output_set_value("Alarm_sound", BIT(data, 7));
+ machine().output().set_value("Alarm_sound", BIT(data, 7));
m_bios_ctrl_inputs = data & 0x04; // Genesis/SMS input ports disable bit
}
else if (offset == 2)
- output_set_value("Flash_screen", BIT(data, 1));
+ machine().output().set_value("Flash_screen", BIT(data, 1));
m_bios_ctrl[offset] = data;
}
diff --git a/src/mame/drivers/mekd2.cpp b/src/mame/drivers/mekd2.cpp
index e7912697d07..7ee575303a6 100644
--- a/src/mame/drivers/mekd2.cpp
+++ b/src/mame/drivers/mekd2.cpp
@@ -282,7 +282,7 @@ WRITE8_MEMBER( mekd2_state::mekd2_digit_w )
for (i = 0; i < 6; i++)
{
if (BIT(data, i))
- output_set_digit_value(i, ~m_segment & 0x7f);
+ machine().output().set_digit_value(i, ~m_segment & 0x7f);
}
}
m_digit = data;
diff --git a/src/mame/drivers/mephisto.cpp b/src/mame/drivers/mephisto.cpp
index 1bb0e074bab..b442a0a0cf2 100644
--- a/src/mame/drivers/mephisto.cpp
+++ b/src/mame/drivers/mephisto.cpp
@@ -137,9 +137,9 @@ protected:
WRITE8_MEMBER( mephisto_state::write_lcd )
{
- if (m_led7 == 0) output_set_digit_value(m_lcd_shift_counter,data); // 0x109 MM IV // 0x040 MM V
+ if (m_led7 == 0) machine().output().set_digit_value(m_lcd_shift_counter,data); // 0x109 MM IV // 0x040 MM V
- //output_set_digit_value(m_lcd_shift_counter,data ^ m_p_ram[0x165]); // 0x109 MM IV // 0x040 MM V
+ //machine().output().set_digit_value(m_lcd_shift_counter,data ^ m_p_ram[0x165]); // 0x109 MM IV // 0x040 MM V
m_lcd_shift_counter--;
m_lcd_shift_counter &= 3;
}
@@ -192,7 +192,7 @@ WRITE8_MEMBER( mephisto_state::write_led )
data &= 0x80;
if (data==0)m_led_status &= 255-(1<<offset) ; else m_led_status|=1<<offset;
- if (offset<6)output_set_led_value(LED_offset+offset, m_led_status&1<<offset?1:0);
+ if (offset<6)machine().output().set_led_value(LED_offset+offset, m_led_status&1<<offset?1:0);
if (offset==7) m_led7=data& 0x80 ? 0x00 :0xff;
logerror("LEDs Offset = %d Data = %d\n",offset,data);
}
@@ -208,7 +208,7 @@ WRITE8_MEMBER( mephisto_state::write_led_mm2 )
m_led_status|=1<<offset;
if (offset<6)
- output_set_led_value(LED_offset+offset, m_led_status&1<<offset?1:0);
+ machine().output().set_led_value(LED_offset+offset, m_led_status&1<<offset?1:0);
if (offset==7)
m_led7= BIT(data, 7) ? 0xff :0x00; //MM2
@@ -341,19 +341,19 @@ void mephisto_state::machine_reset()
/* adjust artwork depending on current emulation*/
if (!strcmp(machine().system().name,"mm2") )
- output_set_value("MM",1);
+ machine().output().set_value("MM",1);
else if (!strcmp(machine().system().name,"mm4") )
- output_set_value("MM",2);
+ machine().output().set_value("MM",2);
else if (!strcmp(machine().system().name,"mm4tk") )
- output_set_value("MM",5);
+ machine().output().set_value("MM",5);
else if (!strcmp(machine().system().name,"mm5tk") )
- output_set_value("MM",5);
+ machine().output().set_value("MM",5);
else if (!strcmp(machine().system().name,"mm5") )
- output_set_value("MM",3);
+ machine().output().set_value("MM",3);
else if (!strcmp(machine().system().name,"mm50") )
- output_set_value("MM",3);
+ machine().output().set_value("MM",3);
else if (!strcmp(machine().system().name,"rebel5") )
- output_set_value("MM",4);
+ machine().output().set_value("MM",4);
}
diff --git a/src/mame/drivers/merit.cpp b/src/mame/drivers/merit.cpp
index 1623b62a357..a63218dae84 100644
--- a/src/mame/drivers/merit.cpp
+++ b/src/mame/drivers/merit.cpp
@@ -318,21 +318,21 @@ WRITE_LINE_MEMBER(merit_state::vsync_changed)
WRITE8_MEMBER(merit_state::led1_w)
{
/* 5 button lamps player 1 */
- set_led_status(machine(), 0,~data & 0x01);
- set_led_status(machine(), 1,~data & 0x02);
- set_led_status(machine(), 2,~data & 0x04);
- set_led_status(machine(), 3,~data & 0x08);
- set_led_status(machine(), 4,~data & 0x10);
+ machine().output().set_led_value(0,~data & 0x01);
+ machine().output().set_led_value(1,~data & 0x02);
+ machine().output().set_led_value(2,~data & 0x04);
+ machine().output().set_led_value(3,~data & 0x08);
+ machine().output().set_led_value(4,~data & 0x10);
}
WRITE8_MEMBER(merit_state::led2_w)
{
/* 5 button lamps player 2 */
- set_led_status(machine(), 5,~data & 0x01);
- set_led_status(machine(), 6,~data & 0x02);
- set_led_status(machine(), 7,~data & 0x04);
- set_led_status(machine(), 8,~data & 0x08);
- set_led_status(machine(), 9,~data & 0x10);
+ machine().output().set_led_value(5,~data & 0x01);
+ machine().output().set_led_value(6,~data & 0x02);
+ machine().output().set_led_value(7,~data & 0x04);
+ machine().output().set_led_value(8,~data & 0x08);
+ machine().output().set_led_value(9,~data & 0x10);
/* coin counter */
machine().bookkeeping().coin_counter_w(0,0x80-(data & 0x80));
diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp
index 794ab9a46de..1644e80c8f4 100644
--- a/src/mame/drivers/meritm.cpp
+++ b/src/mame/drivers/meritm.cpp
@@ -864,13 +864,13 @@ READ8_MEMBER(meritm_state::meritm_8255_port_c_r)
WRITE8_MEMBER(meritm_state::meritm_crt250_port_b_w)
{
//popmessage("Lamps: %d %d %d %d %d %d %d", BIT(data,0), BIT(data,1), BIT(data,2), BIT(data,3), BIT(data,4), BIT(data,5), BIT(data,6) );
- output_set_value("P1 DISC 1 LAMP", !BIT(data,0));
- output_set_value("P1 DISC 2 LAMP", !BIT(data,1));
- output_set_value("P1 DISC 3 LAMP", !BIT(data,2));
- output_set_value("P1 DISC 4 LAMP", !BIT(data,3));
- output_set_value("P1 DISC 5 LAMP", !BIT(data,4));
- output_set_value("P1 PLAY LAMP", !BIT(data,5));
- output_set_value("P1 CANCEL LAMP", !BIT(data,6));
+ machine().output().set_value("P1 DISC 1 LAMP", !BIT(data,0));
+ machine().output().set_value("P1 DISC 2 LAMP", !BIT(data,1));
+ machine().output().set_value("P1 DISC 3 LAMP", !BIT(data,2));
+ machine().output().set_value("P1 DISC 4 LAMP", !BIT(data,3));
+ machine().output().set_value("P1 DISC 5 LAMP", !BIT(data,4));
+ machine().output().set_value("P1 PLAY LAMP", !BIT(data,5));
+ machine().output().set_value("P1 CANCEL LAMP", !BIT(data,6));
}
/*************************************
diff --git a/src/mame/drivers/meyc8080.cpp b/src/mame/drivers/meyc8080.cpp
index 7f093ff1c53..17d3151c734 100644
--- a/src/mame/drivers/meyc8080.cpp
+++ b/src/mame/drivers/meyc8080.cpp
@@ -179,11 +179,11 @@ WRITE8_MEMBER(meyc8080_state::lights_1_w)
xxxx ---- Seems unused...
*/
- output_set_lamp_value(0, (data) & 1); /* Lamp 0 */
- output_set_lamp_value(1, (data >> 1) & 1); /* Lamp 1 */
- output_set_lamp_value(2, (data >> 2) & 1); /* Lamp 2 */
- output_set_lamp_value(3, (data >> 3) & 1); /* Lamp 3 */
- output_set_lamp_value(4, (data >> 4) & 1); /* Lamp 4 */
+ machine().output().set_lamp_value(0, (data) & 1); /* Lamp 0 */
+ machine().output().set_lamp_value(1, (data >> 1) & 1); /* Lamp 1 */
+ machine().output().set_lamp_value(2, (data >> 2) & 1); /* Lamp 2 */
+ machine().output().set_lamp_value(3, (data >> 3) & 1); /* Lamp 3 */
+ machine().output().set_lamp_value(4, (data >> 4) & 1); /* Lamp 4 */
logerror("lights 1: %02x\n", data);
}
@@ -226,13 +226,13 @@ WRITE8_MEMBER(meyc8080_state::lights_2_w)
xxx- ---- Unknown.
*/
- output_set_lamp_value(5, (data) & 1); /* Lamp 5 */
- output_set_lamp_value(6, (data >> 1) & 1); /* Lamp 6 */
- output_set_lamp_value(7, (data >> 2) & 1); /* Lamp 7 */
- output_set_lamp_value(8, (data >> 3) & 1); /* Lamp 8 */
- output_set_lamp_value(9, (data >> 4) & 1); /* Lamp 9 */
+ machine().output().set_lamp_value(5, (data) & 1); /* Lamp 5 */
+ machine().output().set_lamp_value(6, (data >> 1) & 1); /* Lamp 6 */
+ machine().output().set_lamp_value(7, (data >> 2) & 1); /* Lamp 7 */
+ machine().output().set_lamp_value(8, (data >> 3) & 1); /* Lamp 8 */
+ machine().output().set_lamp_value(9, (data >> 4) & 1); /* Lamp 9 */
- output_set_lamp_value(10, (data >> 5) & 1); /* Lamp 10 (Game-Over) */
+ machine().output().set_lamp_value(10, (data >> 5) & 1); /* Lamp 10 (Game-Over) */
logerror("lights 2: %02x\n", data);
}
diff --git a/src/mame/drivers/meyc8088.cpp b/src/mame/drivers/meyc8088.cpp
index ddc5621cb69..4fdc6593789 100644
--- a/src/mame/drivers/meyc8088.cpp
+++ b/src/mame/drivers/meyc8088.cpp
@@ -255,14 +255,14 @@ WRITE8_MEMBER(meyc8088_state::meyc8088_lights1_w)
{
// lite 1-8
for (int i = 0; i < 8; i++)
- output_set_lamp_value(i, ~data >> i & 1);
+ machine().output().set_lamp_value(i, ~data >> i & 1);
}
WRITE8_MEMBER(meyc8088_state::meyc8088_lights2_w)
{
// lite 9-16
for (int i = 0; i < 8; i++)
- output_set_lamp_value(i + 8, ~data >> i & 1);
+ machine().output().set_lamp_value(i + 8, ~data >> i & 1);
}
WRITE8_MEMBER(meyc8088_state::meyc8088_common_w)
diff --git a/src/mame/drivers/mgames.cpp b/src/mame/drivers/mgames.cpp
index ab63eea304f..9b31f807ff9 100644
--- a/src/mame/drivers/mgames.cpp
+++ b/src/mame/drivers/mgames.cpp
@@ -361,8 +361,8 @@ READ8_MEMBER(mgames_state::mixport_r)
WRITE8_MEMBER(mgames_state::outport0_w)
{
- output_set_lamp_value(1, (data & 1)); /* Lamp 1 - BET */
- output_set_lamp_value(5, (data >> 1) & 1); /* Lamp 5 - HOLD 1 */
+ machine().output().set_lamp_value(1, (data & 1)); /* Lamp 1 - BET */
+ machine().output().set_lamp_value(5, (data >> 1) & 1); /* Lamp 5 - HOLD 1 */
m_output[0] = data;
popmessage("outport0 : %02X %02X %02X %02X %02X %02X %02X %02X", m_output[0], m_output[1], m_output[2], m_output[3], m_output[4], m_output[5], m_output[6], m_output[7]);
@@ -382,8 +382,8 @@ WRITE8_MEMBER(mgames_state::outport0_w)
WRITE8_MEMBER(mgames_state::outport1_w)
{
- output_set_lamp_value(2, (data & 1)); /* Lamp 2 - DEAL */
- output_set_lamp_value(6, (data >> 1) & 1); /* Lamp 6 - HOLD 2 */
+ machine().output().set_lamp_value(2, (data & 1)); /* Lamp 2 - DEAL */
+ machine().output().set_lamp_value(6, (data >> 1) & 1); /* Lamp 6 - HOLD 2 */
m_output[1] = data;
popmessage("outport1 : %02X %02X %02X %02X %02X %02X %02X %02X", m_output[0], m_output[1], m_output[2], m_output[3], m_output[4], m_output[5], m_output[6], m_output[7]);
@@ -403,8 +403,8 @@ WRITE8_MEMBER(mgames_state::outport1_w)
WRITE8_MEMBER(mgames_state::outport2_w)
{
- output_set_lamp_value(3, (data & 1)); /* Lamp 3 - CANCEL */
- output_set_lamp_value(7, (data >> 1) & 1); /* Lamp 7 - HOLD 3 */
+ machine().output().set_lamp_value(3, (data & 1)); /* Lamp 3 - CANCEL */
+ machine().output().set_lamp_value(7, (data >> 1) & 1); /* Lamp 7 - HOLD 3 */
m_output[2] = data;
popmessage("outport2 : %02X %02X %02X %02X %02X %02X %02X %02X", m_output[0], m_output[1], m_output[2], m_output[3], m_output[4], m_output[5], m_output[6], m_output[7]);
@@ -424,8 +424,8 @@ WRITE8_MEMBER(mgames_state::outport2_w)
WRITE8_MEMBER(mgames_state::outport3_w)
{
- output_set_lamp_value(4, (data & 1)); /* Lamp 4 - STAND */
- output_set_lamp_value(8, (data >> 1) & 1); /* Lamp 8 - HOLD 4 */
+ machine().output().set_lamp_value(4, (data & 1)); /* Lamp 4 - STAND */
+ machine().output().set_lamp_value(8, (data >> 1) & 1); /* Lamp 8 - HOLD 4 */
m_output[3] = data;
popmessage("outport3 : %02X %02X %02X %02X %02X %02X %02X %02X", m_output[0], m_output[1], m_output[2], m_output[3], m_output[4], m_output[5], m_output[6], m_output[7]);
@@ -445,7 +445,7 @@ WRITE8_MEMBER(mgames_state::outport3_w)
WRITE8_MEMBER(mgames_state::outport4_w)
{
- output_set_lamp_value(9, (data >> 1) & 1); /* Lamp 9 - HOLD 5 */
+ machine().output().set_lamp_value(9, (data >> 1) & 1); /* Lamp 9 - HOLD 5 */
m_output[4] = data;
popmessage("outport4 : %02X %02X %02X %02X %02X %02X %02X %02X", m_output[0], m_output[1], m_output[2], m_output[3], m_output[4], m_output[5], m_output[6], m_output[7]);
diff --git a/src/mame/drivers/mgavegas.cpp b/src/mame/drivers/mgavegas.cpp
index bb1cbade09a..0bc40601768 100644
--- a/src/mame/drivers/mgavegas.cpp
+++ b/src/mame/drivers/mgavegas.cpp
@@ -160,38 +160,38 @@ private:
void mgavegas_state::update_lamp(){
- //output_set_value("AUXS", m_auxs); //unused
- output_set_value("MGA4", m_anal&0x01);
- output_set_value("MGA3", m_anacl&0x01);
- output_set_value("MGA2", m_anacr&0x01);
- output_set_value("MGA", m_anar&0x01);
- output_set_value("PL", m_pl&0x01);
- output_set_value("PC", m_pc&0x01);
- output_set_value("PR", m_pr&0x01);
- output_set_value("250", m_luz_250_rul&0x01);
- output_set_value("1002", m_luz_100_rul&0x01);
- output_set_value("50", m_luz_50_rlul&0x01);
- output_set_value("252", m_luz_25_lrul&0x01);
- output_set_value("25", m_luz_25_rrul&0x01);
- output_set_value("FL", m_fl&0x01);
- output_set_value("FC", m_fc&0x01);
- output_set_value("FR", m_fr&0x01);
- output_set_value("INSERTCOIN", m_insert_coin&0x01);
- output_set_value("NOCAMBIO", m_no_cambio&0x01);
- output_set_value("FUSE", m_fuse&0x01);
- output_set_value("FALTA", m_falta&0x01);
- //output_set_value("ANAG", m_anag&0x01); //unused
- output_set_value("CL", m_cl&0x01);
- output_set_value("CC", m_cc&0x01);
- output_set_value("CR", m_cr&0x01);
- output_set_value("PREMIOS", m_premio_s&0x01);
- output_set_value("100", m_100&0x01);
- output_set_value("200", m_200&0x01);
- output_set_value("300", m_300&0x01);
- output_set_value("500", m_500&0x01);
- output_set_value("ML", m_ml&0x01);
- output_set_value("MC", m_mc&0x01);
- output_set_value("MR", m_mr&0x01);
+ //machine().output().set_value("AUXS", m_auxs); //unused
+ machine().output().set_value("MGA4", m_anal&0x01);
+ machine().output().set_value("MGA3", m_anacl&0x01);
+ machine().output().set_value("MGA2", m_anacr&0x01);
+ machine().output().set_value("MGA", m_anar&0x01);
+ machine().output().set_value("PL", m_pl&0x01);
+ machine().output().set_value("PC", m_pc&0x01);
+ machine().output().set_value("PR", m_pr&0x01);
+ machine().output().set_value("250", m_luz_250_rul&0x01);
+ machine().output().set_value("1002", m_luz_100_rul&0x01);
+ machine().output().set_value("50", m_luz_50_rlul&0x01);
+ machine().output().set_value("252", m_luz_25_lrul&0x01);
+ machine().output().set_value("25", m_luz_25_rrul&0x01);
+ machine().output().set_value("FL", m_fl&0x01);
+ machine().output().set_value("FC", m_fc&0x01);
+ machine().output().set_value("FR", m_fr&0x01);
+ machine().output().set_value("INSERTCOIN", m_insert_coin&0x01);
+ machine().output().set_value("NOCAMBIO", m_no_cambio&0x01);
+ machine().output().set_value("FUSE", m_fuse&0x01);
+ machine().output().set_value("FALTA", m_falta&0x01);
+ //machine().output().set_value("ANAG", m_anag&0x01); //unused
+ machine().output().set_value("CL", m_cl&0x01);
+ machine().output().set_value("CC", m_cc&0x01);
+ machine().output().set_value("CR", m_cr&0x01);
+ machine().output().set_value("PREMIOS", m_premio_s&0x01);
+ machine().output().set_value("100", m_100&0x01);
+ machine().output().set_value("200", m_200&0x01);
+ machine().output().set_value("300", m_300&0x01);
+ machine().output().set_value("500", m_500&0x01);
+ machine().output().set_value("ML", m_ml&0x01);
+ machine().output().set_value("MC", m_mc&0x01);
+ machine().output().set_value("MR", m_mr&0x01);
/*
m_inh=BIT(data, 3);
m_printer=BIT(data, 6); //not_used
diff --git a/src/mame/drivers/micropin.cpp b/src/mame/drivers/micropin.cpp
index 8fd5c720568..feed6f7891a 100644
--- a/src/mame/drivers/micropin.cpp
+++ b/src/mame/drivers/micropin.cpp
@@ -189,8 +189,8 @@ WRITE8_MEMBER( micropin_state::p50a_w )
if (m_counter == 1)
{
static const UINT8 patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0x58, 0x4c, 0x62, 0x69, 0x78, 0 }; // 7448
- output_set_digit_value(m_row, patterns[data&15]);
- output_set_digit_value(m_row+20, patterns[data>>4]);
+ machine().output().set_digit_value(m_row, patterns[data&15]);
+ machine().output().set_digit_value(m_row+20, patterns[data>>4]);
}
}
@@ -200,8 +200,8 @@ WRITE8_MEMBER( micropin_state::p50b_w )
if (m_counter == 2)
{
static const UINT8 patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0x58, 0x4c, 0x62, 0x69, 0x78, 0 }; // 7448
- output_set_digit_value(m_row+40, patterns[data&15]);
- output_set_digit_value(m_row+60, patterns[data>>4]);
+ machine().output().set_digit_value(m_row+40, patterns[data&15]);
+ machine().output().set_digit_value(m_row+60, patterns[data>>4]);
}
}
@@ -213,7 +213,7 @@ WRITE_LINE_MEMBER( micropin_state::p50ca2_w )
char wordnum[8];
sprintf(wordnum,"led%d", m_row);
m_led_time[m_row] = 48; // 12 gives blinking leds; they blink in pinmame but is it correct?
- output_set_value(wordnum, 0); // turn on
+ machine().output().set_value(wordnum, 0); // turn on
}
}
@@ -259,7 +259,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( micropin_state::timer_a )
if (m_led_time[i] == 0)
{
sprintf(wordnum,"led%d", i);
- output_set_value(wordnum, 1); // turn off
+ machine().output().set_value(wordnum, 1); // turn off
}
}
}
diff --git a/src/mame/drivers/midzeus.cpp b/src/mame/drivers/midzeus.cpp
index f221468faae..d6ae8ff8038 100644
--- a/src/mame/drivers/midzeus.cpp
+++ b/src/mame/drivers/midzeus.cpp
@@ -311,7 +311,7 @@ WRITE32_MEMBER(midzeus_state::crusnexo_leds_w)
case 1: /* controls lamps */
for (bit = 0; bit < 8; bit++)
- output_set_lamp_value(bit, (data >> bit) & 1);
+ machine().output().set_lamp_value(bit, (data >> bit) & 1);
break;
case 2: /* sets state of selected LEDs */
@@ -319,13 +319,13 @@ WRITE32_MEMBER(midzeus_state::crusnexo_leds_w)
/* selection bits 4-6 select the 3 7-segment LEDs */
for (bit = 4; bit < 7; bit++)
if ((crusnexo_leds_select & (1 << bit)) == 0)
- output_set_digit_value(bit, ~data & 0xff);
+ machine().output().set_digit_value(bit, ~data & 0xff);
/* selection bits 0-2 select the tachometer LEDs */
for (bit = 0; bit < 3; bit++)
if ((crusnexo_leds_select & (1 << bit)) == 0)
for (led = 0; led < 8; led++)
- output_set_led_value(bit * 8 + led, (~data >> led) & 1);
+ machine().output().set_led_value(bit * 8 + led, (~data >> led) & 1);
break;
case 3: /* selects which set of LEDs we are addressing */
diff --git a/src/mame/drivers/mil4000.cpp b/src/mame/drivers/mil4000.cpp
index 30e29985c98..d780c68b807 100644
--- a/src/mame/drivers/mil4000.cpp
+++ b/src/mame/drivers/mil4000.cpp
@@ -299,13 +299,13 @@ WRITE16_MEMBER(mil4000_state::output_w)
for(i=0;i<3;i++)
machine().bookkeeping().coin_counter_w(i, data & 0x2000);
- output_set_lamp_value(0, (data) & 1); /* HOLD1 */
- output_set_lamp_value(1, (data >> 1) & 1); /* HOLD2 */
- output_set_lamp_value(2, (data >> 2) & 1); /* HOLD3 */
- output_set_lamp_value(3, (data >> 3) & 1); /* HOLD4 */
- output_set_lamp_value(4, (data >> 4) & 1); /* HOLD5 */
- output_set_lamp_value(5, (data >> 5) & 1); /* START */
- output_set_lamp_value(6, (data >> 6) & 1); /* PREMIO */
+ machine().output().set_lamp_value(0, (data) & 1); /* HOLD1 */
+ machine().output().set_lamp_value(1, (data >> 1) & 1); /* HOLD2 */
+ machine().output().set_lamp_value(2, (data >> 2) & 1); /* HOLD3 */
+ machine().output().set_lamp_value(3, (data >> 3) & 1); /* HOLD4 */
+ machine().output().set_lamp_value(4, (data >> 4) & 1); /* HOLD5 */
+ machine().output().set_lamp_value(5, (data >> 5) & 1); /* START */
+ machine().output().set_lamp_value(6, (data >> 6) & 1); /* PREMIO */
// popmessage("%04x\n",data);
}
diff --git a/src/mame/drivers/miniboy7.cpp b/src/mame/drivers/miniboy7.cpp
index 0350aea554a..be85c0d7404 100644
--- a/src/mame/drivers/miniboy7.cpp
+++ b/src/mame/drivers/miniboy7.cpp
@@ -303,11 +303,11 @@ WRITE8_MEMBER(miniboy7_state::ay_pa_w)
data = data ^ 0xff;
-// output_set_lamp_value(0, (data) & 1); // [----x]
-// output_set_lamp_value(1, (data >> 1) & 1); // [---x-]
-// output_set_lamp_value(2, (data >> 2) & 1); // [--x--]
-// output_set_lamp_value(3, (data >> 3) & 1); // [-x---]
-// output_set_lamp_value(4, (data >> 4) & 1); // [x----]
+// machine().output().set_lamp_value(0, (data) & 1); // [----x]
+// machine().output().set_lamp_value(1, (data >> 1) & 1); // [---x-]
+// machine().output().set_lamp_value(2, (data >> 2) & 1); // [--x--]
+// machine().output().set_lamp_value(3, (data >> 3) & 1); // [-x---]
+// machine().output().set_lamp_value(4, (data >> 4) & 1); // [x----]
machine().bookkeeping().coin_counter_w(0, data & 0x40); // counter
diff --git a/src/mame/drivers/minicom.cpp b/src/mame/drivers/minicom.cpp
index 5c7a77217c2..460140d1a12 100644
--- a/src/mame/drivers/minicom.cpp
+++ b/src/mame/drivers/minicom.cpp
@@ -87,7 +87,7 @@ void minicom_state::machine_reset()
m_display_data = 0;
for (int i=0; i<20; i++)
- output_set_digit_value(i, 0);
+ machine().output().set_digit_value(i, 0);
}
READ8_MEMBER(minicom_state::minicom_io_r)
@@ -212,7 +212,7 @@ WRITE8_MEMBER(minicom_state::minicom_io_w)
if (BIT(changed,4) || BIT(changed,5))
{
- output_set_digit_value(m_digit_index, BITSWAP16(m_display_data, 9, 1, 3, 11, 12, 4, 2, 10, 14, 6, 7, 5, 0, 15, 13, 8) & 0x3FFF);
+ machine().output().set_digit_value(m_digit_index, BITSWAP16(m_display_data, 9, 1, 3, 11, 12, 4, 2, 10, 14, 6, 7, 5, 0, 15, 13, 8) & 0x3FFF);
}
m_p[offset]=data;
}
diff --git a/src/mame/drivers/missile.cpp b/src/mame/drivers/missile.cpp
index 857f7447f26..4994543c8d8 100644
--- a/src/mame/drivers/missile.cpp
+++ b/src/mame/drivers/missile.cpp
@@ -731,8 +731,8 @@ WRITE8_MEMBER(missile_state::missile_w)
machine().bookkeeping().coin_counter_w(0, data & 0x20);
machine().bookkeeping().coin_counter_w(1, data & 0x10);
machine().bookkeeping().coin_counter_w(2, data & 0x08);
- set_led_status(machine(), 1, ~data & 0x04);
- set_led_status(machine(), 0, ~data & 0x02);
+ machine().output().set_led_value(1, ~data & 0x04);
+ machine().output().set_led_value(0, ~data & 0x02);
m_ctrld = data & 1;
}
diff --git a/src/mame/drivers/mk1.cpp b/src/mame/drivers/mk1.cpp
index 04d7ddbb73f..e6edd15f611 100644
--- a/src/mame/drivers/mk1.cpp
+++ b/src/mame/drivers/mk1.cpp
@@ -156,8 +156,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(mk1_state::mk1_update_leds)
{
for (int i = 0; i < 4; i++)
{
- output_set_digit_value(i, m_led[i] >> 1);
- output_set_led_value(i, m_led[i] & 0x01);
+ machine().output().set_digit_value(i, m_led[i] >> 1);
+ machine().output().set_led_value(i, m_led[i] & 0x01);
m_led[i] = 0;
}
}
diff --git a/src/mame/drivers/mk14.cpp b/src/mame/drivers/mk14.cpp
index 2f6106c8e5e..1afccf469cf 100644
--- a/src/mame/drivers/mk14.cpp
+++ b/src/mame/drivers/mk14.cpp
@@ -60,7 +60,7 @@ READ8_MEMBER( mk14_state::keyboard_r )
WRITE8_MEMBER( mk14_state::display_w )
{
if (offset < 8 )
- output_set_digit_value(offset, data);
+ machine().output().set_digit_value(offset, data);
else
{
//logerror("write %02x to %02x\n",data,offset);
diff --git a/src/mame/drivers/mk2.cpp b/src/mame/drivers/mk2.cpp
index bd0277641fd..8f2e0f6067b 100644
--- a/src/mame/drivers/mk2.cpp
+++ b/src/mame/drivers/mk2.cpp
@@ -119,12 +119,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(mk2_state::update_leds)
int i;
for (i=0; i<4; i++)
- output_set_digit_value(i, m_led[i]);
+ machine().output().set_digit_value(i, m_led[i]);
- output_set_led_value(0, BIT(m_led[4], 3));
- output_set_led_value(1, BIT(m_led[4], 5));
- output_set_led_value(2, BIT(m_led[4], 4));
- output_set_led_value(3, BIT(m_led[4], 4) ? 0 : 1);
+ machine().output().set_led_value(0, BIT(m_led[4], 3));
+ machine().output().set_led_value(1, BIT(m_led[4], 5));
+ machine().output().set_led_value(2, BIT(m_led[4], 4));
+ machine().output().set_led_value(3, BIT(m_led[4], 4) ? 0 : 1);
m_led[0]= m_led[1]= m_led[2]= m_led[3]= m_led[4]= 0;
}
diff --git a/src/mame/drivers/mkit09.cpp b/src/mame/drivers/mkit09.cpp
index 4775835d973..8a5759d4a1c 100644
--- a/src/mame/drivers/mkit09.cpp
+++ b/src/mame/drivers/mkit09.cpp
@@ -171,7 +171,7 @@ WRITE8_MEMBER( mkit09_state::pa_w )
data ^= 0xff;
if (m_keydata > 3)
{
- output_set_digit_value(m_keydata, BITSWAP8(data, 7, 0, 5, 6, 4, 2, 1, 3));
+ machine().output().set_digit_value(m_keydata, BITSWAP8(data, 7, 0, 5, 6, 4, 2, 1, 3));
m_keydata = 0;
}
diff --git a/src/mame/drivers/mmd1.cpp b/src/mame/drivers/mmd1.cpp
index 99c4f4569b0..cc2cf1aa315 100644
--- a/src/mame/drivers/mmd1.cpp
+++ b/src/mame/drivers/mmd1.cpp
@@ -180,38 +180,38 @@ public:
WRITE8_MEMBER( mmd1_state::mmd1_port0_w )
{
- output_set_value("p0_7", BIT(data,7) ? 0 : 1);
- output_set_value("p0_6", BIT(data,6) ? 0 : 1);
- output_set_value("p0_5", BIT(data,5) ? 0 : 1);
- output_set_value("p0_4", BIT(data,4) ? 0 : 1);
- output_set_value("p0_3", BIT(data,3) ? 0 : 1);
- output_set_value("p0_2", BIT(data,2) ? 0 : 1);
- output_set_value("p0_1", BIT(data,1) ? 0 : 1);
- output_set_value("p0_0", BIT(data,0) ? 0 : 1);
+ machine().output().set_value("p0_7", BIT(data,7) ? 0 : 1);
+ machine().output().set_value("p0_6", BIT(data,6) ? 0 : 1);
+ machine().output().set_value("p0_5", BIT(data,5) ? 0 : 1);
+ machine().output().set_value("p0_4", BIT(data,4) ? 0 : 1);
+ machine().output().set_value("p0_3", BIT(data,3) ? 0 : 1);
+ machine().output().set_value("p0_2", BIT(data,2) ? 0 : 1);
+ machine().output().set_value("p0_1", BIT(data,1) ? 0 : 1);
+ machine().output().set_value("p0_0", BIT(data,0) ? 0 : 1);
}
WRITE8_MEMBER( mmd1_state::mmd1_port1_w )
{
- output_set_value("p1_7", BIT(data,7) ? 0 : 1);
- output_set_value("p1_6", BIT(data,6) ? 0 : 1);
- output_set_value("p1_5", BIT(data,5) ? 0 : 1);
- output_set_value("p1_4", BIT(data,4) ? 0 : 1);
- output_set_value("p1_3", BIT(data,3) ? 0 : 1);
- output_set_value("p1_2", BIT(data,2) ? 0 : 1);
- output_set_value("p1_1", BIT(data,1) ? 0 : 1);
- output_set_value("p1_0", BIT(data,0) ? 0 : 1);
+ machine().output().set_value("p1_7", BIT(data,7) ? 0 : 1);
+ machine().output().set_value("p1_6", BIT(data,6) ? 0 : 1);
+ machine().output().set_value("p1_5", BIT(data,5) ? 0 : 1);
+ machine().output().set_value("p1_4", BIT(data,4) ? 0 : 1);
+ machine().output().set_value("p1_3", BIT(data,3) ? 0 : 1);
+ machine().output().set_value("p1_2", BIT(data,2) ? 0 : 1);
+ machine().output().set_value("p1_1", BIT(data,1) ? 0 : 1);
+ machine().output().set_value("p1_0", BIT(data,0) ? 0 : 1);
}
WRITE8_MEMBER( mmd1_state::mmd1_port2_w )
{
- output_set_value("p2_7", BIT(data,7) ? 0 : 1);
- output_set_value("p2_6", BIT(data,6) ? 0 : 1);
- output_set_value("p2_5", BIT(data,5) ? 0 : 1);
- output_set_value("p2_4", BIT(data,4) ? 0 : 1);
- output_set_value("p2_3", BIT(data,3) ? 0 : 1);
- output_set_value("p2_2", BIT(data,2) ? 0 : 1);
- output_set_value("p2_1", BIT(data,1) ? 0 : 1);
- output_set_value("p2_0", BIT(data,0) ? 0 : 1);
+ machine().output().set_value("p2_7", BIT(data,7) ? 0 : 1);
+ machine().output().set_value("p2_6", BIT(data,6) ? 0 : 1);
+ machine().output().set_value("p2_5", BIT(data,5) ? 0 : 1);
+ machine().output().set_value("p2_4", BIT(data,4) ? 0 : 1);
+ machine().output().set_value("p2_3", BIT(data,3) ? 0 : 1);
+ machine().output().set_value("p2_2", BIT(data,2) ? 0 : 1);
+ machine().output().set_value("p2_1", BIT(data,1) ? 0 : 1);
+ machine().output().set_value("p2_0", BIT(data,0) ? 0 : 1);
}
// keyboard has a keydown and a keyup code. Keyup = last keydown + bit 7 set
@@ -394,7 +394,7 @@ WRITE8_MEMBER( mmd1_state::mmd2_scanlines_w )
WRITE8_MEMBER( mmd1_state::mmd2_digit_w )
{
if (m_digit < 9)
- output_set_digit_value(m_digit, data);
+ machine().output().set_digit_value(m_digit, data);
}
READ8_MEMBER( mmd1_state::mmd2_kbd_r )
@@ -413,16 +413,16 @@ READ8_MEMBER( mmd1_state::mmd2_kbd_r )
WRITE8_MEMBER( mmd1_state::mmd2_status_callback )
{
// operate the HALT LED
- output_set_value("led_halt", ~data & I8085_STATUS_HLTA);
+ machine().output().set_value("led_halt", ~data & I8085_STATUS_HLTA);
// operate the HOLD LED - this should connect to the HLDA pin,
// but it isn't emulated, using WO instead (whatever that does).
- output_set_value("led_hold", data & I8085_STATUS_WO);
+ machine().output().set_value("led_hold", data & I8085_STATUS_WO);
}
WRITE_LINE_MEMBER( mmd1_state::mmd2_inte_callback )
{
// operate the INTE LED
- output_set_value("led_inte", state);
+ machine().output().set_value("led_inte", state);
}
MACHINE_RESET_MEMBER(mmd1_state,mmd1)
diff --git a/src/mame/drivers/mmodular.cpp b/src/mame/drivers/mmodular.cpp
index e1ff1b638e4..c1686affb9b 100644
--- a/src/mame/drivers/mmodular.cpp
+++ b/src/mame/drivers/mmodular.cpp
@@ -254,16 +254,16 @@ WRITE8_MEMBER(polgar_state::write_polgar_IO)
if (BIT(data,7) && BIT(data, 4)) {
for (i = 0;i < 8;i++)
- output_set_led_value(i,!BIT(latch_data,i));
+ machine().output().set_led_value(i,!BIT(latch_data,i));
}
else if (BIT(data,6) && BIT(data,5)) {
for (i = 0;i < 8;i++)
- output_set_led_value(10+i,!BIT(latch_data,7-i));
+ machine().output().set_led_value(10+i,!BIT(latch_data,7-i));
}
else if (!data && (!strcmp(machine().system().name,"milano"))) {
for (i=0;i<8;i++) {
- output_set_led_value(i,!BIT(latch_data,i));
- output_set_led_value(10+i,!BIT(latch_data,7-i));
+ machine().output().set_led_value(i,!BIT(latch_data,i));
+ machine().output().set_led_value(10+i,!BIT(latch_data,7-i));
}
}
@@ -407,8 +407,8 @@ WRITE16_MEMBER(polgar_state::diablo68_write_LCD)
WRITE8_MEMBER(polgar_state::milano_write_LED)
{
UINT8 LED_offset = 100;
- if (data == 0xff) output_set_led_value(LED_offset+offset,1);
- else output_set_led_value(LED_offset+offset,0);
+ if (data == 0xff) machine().output().set_led_value(LED_offset+offset,1);
+ else machine().output().set_led_value(LED_offset+offset,0);
//logerror("LEDs Offset = %d Data = %d\n",offset,data);
}
@@ -419,8 +419,8 @@ WRITE8_MEMBER(polgar_state::megaiv_write_LED)
m_beeper->set_state(1);
else
m_beeper->set_state(0);
- output_set_led_value(102,BIT(data,1)?1:0);
- output_set_led_value(107,BIT(data,6)?1:0);
+ machine().output().set_led_value(102,BIT(data,1)?1:0);
+ machine().output().set_led_value(107,BIT(data,6)?1:0);
// logerror("LEDs FUNC = %02x found = %d\n",data,found);
logerror("LED mask %d\n",data);
@@ -455,26 +455,26 @@ if (start == 1) {
*/
if ((data & 0x68) == 0x68) {
- output_set_led_value(103,BIT(data,4)?0:1); // POS
- output_set_led_value(107,BIT(data,7)?0:1); // white
+ machine().output().set_led_value(103,BIT(data,4)?0:1); // POS
+ machine().output().set_led_value(107,BIT(data,7)?0:1); // white
found = 1;
}
if ((data & 0x64) == 0x64) {
- output_set_led_value(102,BIT(data,4)?0:1); // MEM
- output_set_led_value(106,BIT(data,7)?0:1); // black
+ machine().output().set_led_value(102,BIT(data,4)?0:1); // MEM
+ machine().output().set_led_value(106,BIT(data,7)?0:1); // black
found = 1;
}
if ((data & 0xa2) == 0xa2) {
- output_set_led_value(101,BIT(data,4)?0:1); // INFO
- output_set_led_value(105,BIT(data,6)?0:1); // FUNC
+ machine().output().set_led_value(101,BIT(data,4)?0:1); // INFO
+ machine().output().set_led_value(105,BIT(data,6)?0:1); // FUNC
found = 1;
}
if ((data & 0xa1) == 0xa1) {
- output_set_led_value(100,BIT(data,4)?0:1); // TRN
- output_set_led_value(104,BIT(data,6)?0:1); // LVL
+ machine().output().set_led_value(100,BIT(data,4)?0:1); // TRN
+ machine().output().set_led_value(104,BIT(data,6)?0:1); // LVL
found = 1;
}
@@ -507,8 +507,8 @@ WRITE32_MEMBER(polgar_state::write_LED_BPL32)
data >>= 24;
for (i=0;i<8;i++) {
- output_set_led_value(i,BIT(data,i));
- output_set_led_value(10+i,!BIT(BPL32latch_data,7-i));
+ machine().output().set_led_value(i,BIT(data,i));
+ machine().output().set_led_value(10+i,!BIT(BPL32latch_data,7-i));
}
logerror("LEDs Offset = %d Data = %08x Latch = %08x\n",offset,data,BPL32latch_data);
@@ -528,7 +528,7 @@ WRITE8_MEMBER(polgar_state::polgar_write_LED)
led_status|=1<<offset;
}
- if (offset < 6) output_set_led_value(LED_offset+offset, led_status&1<<offset?1:0);
+ if (offset < 6) machine().output().set_led_value(LED_offset+offset, led_status&1<<offset?1:0);
logerror("LEDs Offset = %d Data = %d\n",offset,data);
}
@@ -577,10 +577,10 @@ WRITE8_MEMBER(polgar_state::monteciv_write_LCD)
tempchar = 0;
}
if (whichchar == 4) {
- output_set_digit_value(0,charstodisplay[0]);
- output_set_digit_value(1,charstodisplay[1]);
- output_set_digit_value(2,charstodisplay[2]);
- output_set_digit_value(3,charstodisplay[3]);
+ machine().output().set_digit_value(0,charstodisplay[0]);
+ machine().output().set_digit_value(1,charstodisplay[1]);
+ machine().output().set_digit_value(2,charstodisplay[2]);
+ machine().output().set_digit_value(3,charstodisplay[3]);
whichchar = 0;
}
}
@@ -602,10 +602,10 @@ WRITE8_MEMBER(polgar_state::monteciv_write_LCD)
tempchar = 0;
}
if (whichchar == 4) {
- output_set_digit_value(4+0,charstodisplay[0]);
- output_set_digit_value(4+1,charstodisplay[1]);
- output_set_digit_value(4+2,charstodisplay[2]);
- output_set_digit_value(4+3,charstodisplay[3]);
+ machine().output().set_digit_value(4+0,charstodisplay[0]);
+ machine().output().set_digit_value(4+1,charstodisplay[1]);
+ machine().output().set_digit_value(4+2,charstodisplay[2]);
+ machine().output().set_digit_value(4+3,charstodisplay[3]);
whichchar = 0;
}
}
@@ -758,15 +758,15 @@ READ8_MEMBER(polgar_state::read_keys_board_monteciv)
data = ioport("BUTTONS_MONTE2")->read();
#if 0
if (data) {
- output_set_digit_value(0,64);
- output_set_digit_value(1,113+128);
- output_set_digit_value(2,190);
- output_set_digit_value(3,64);
-
- output_set_digit_value(4,246-128);
- output_set_digit_value(5,247-128);
- output_set_digit_value(6,219-128);
- output_set_digit_value(7,249-128);
+ machine().output().set_digit_value(0,64);
+ machine().output().set_digit_value(1,113+128);
+ machine().output().set_digit_value(2,190);
+ machine().output().set_digit_value(3,64);
+
+ machine().output().set_digit_value(4,246-128);
+ machine().output().set_digit_value(5,247-128);
+ machine().output().set_digit_value(6,219-128);
+ machine().output().set_digit_value(7,249-128);
}
#endif
} else {
diff --git a/src/mame/drivers/model1.cpp b/src/mame/drivers/model1.cpp
index 3d40fe656ff..e7bfefe7332 100644
--- a/src/mame/drivers/model1.cpp
+++ b/src/mame/drivers/model1.cpp
@@ -663,12 +663,12 @@ WRITE16_MEMBER(model1_state::io_w)
{
if(offset == 0x0f){
// tested in vr, vf, swa, wingwar
- set_led_status(machine(), 0, data & 0x4); // START (1)
- set_led_status(machine(), 1, data & 0x8); // VIEW1 (START2 - VF)
- set_led_status(machine(), 2, data & 0x10); // VIEW2 (VIEW - SWA)
- set_led_status(machine(), 3, data & 0x20); // VIEW3
- set_led_status(machine(), 4, data & 0x40); // VIEW4
- set_led_status(machine(), 5, data & 0x80); // RACE LEADER
+ machine().output().set_led_value(0, data & 0x4); // START (1)
+ machine().output().set_led_value(1, data & 0x8); // VIEW1 (START2 - VF)
+ machine().output().set_led_value(2, data & 0x10); // VIEW2 (VIEW - SWA)
+ machine().output().set_led_value(3, data & 0x20); // VIEW3
+ machine().output().set_led_value(4, data & 0x40); // VIEW4
+ machine().output().set_led_value(5, data & 0x80); // RACE LEADER
m_lamp_state = data;
return;
}
diff --git a/src/mame/drivers/monzagp.cpp b/src/mame/drivers/monzagp.cpp
index 7a76f855ee8..a6dc8914fb8 100644
--- a/src/mame/drivers/monzagp.cpp
+++ b/src/mame/drivers/monzagp.cpp
@@ -355,7 +355,7 @@ WRITE8_MEMBER(monzagp_state::port_w)
{
// 74LS47 BCD-to-Seven-Segment Decoder
static UINT8 bcd2hex[] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0x58, 0x4c, 0x62, 0x49, 0x78, 0x00 };
- output_set_digit_value(ram_offset >> 3, bcd2hex[data & 0x0f]);
+ machine().output().set_digit_value(ram_offset >> 3, bcd2hex[data & 0x0f]);
}
}
if (!(m_p1 & 0x80))
diff --git a/src/mame/drivers/mpf1.cpp b/src/mame/drivers/mpf1.cpp
index 4366184a820..715930e4af0 100644
--- a/src/mame/drivers/mpf1.cpp
+++ b/src/mame/drivers/mpf1.cpp
@@ -237,12 +237,12 @@ INPUT_PORTS_END
TIMER_CALLBACK_MEMBER(mpf1_state::led_refresh)
{
- if (BIT(m_lednum, 5)) output_set_digit_value(0, param);
- if (BIT(m_lednum, 4)) output_set_digit_value(1, param);
- if (BIT(m_lednum, 3)) output_set_digit_value(2, param);
- if (BIT(m_lednum, 2)) output_set_digit_value(3, param);
- if (BIT(m_lednum, 1)) output_set_digit_value(4, param);
- if (BIT(m_lednum, 0)) output_set_digit_value(5, param);
+ if (BIT(m_lednum, 5)) machine().output().set_digit_value(0, param);
+ if (BIT(m_lednum, 4)) machine().output().set_digit_value(1, param);
+ if (BIT(m_lednum, 3)) machine().output().set_digit_value(2, param);
+ if (BIT(m_lednum, 2)) machine().output().set_digit_value(3, param);
+ if (BIT(m_lednum, 1)) machine().output().set_digit_value(4, param);
+ if (BIT(m_lednum, 0)) machine().output().set_digit_value(5, param);
}
READ8_MEMBER( mpf1_state::ppi_pa_r )
@@ -291,7 +291,7 @@ WRITE8_MEMBER( mpf1_state::ppi_pc_w )
}
/* bit 7, tape output, tone and led */
- set_led_status(machine(), 0, !BIT(data, 7));
+ machine().output().set_led_value(0, !BIT(data, 7));
m_speaker->level_w(BIT(data, 7));
m_cassette->output( BIT(data, 7) ? 1.0 : -1.0);
}
@@ -312,7 +312,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mpf1_state::check_halt_callback)
// halt-LED; the red one, is turned on when the processor is halted
// TODO: processor seems to halt, but restarts(?) at 0x0000 after a while -> fix
INT64 led_halt = m_maincpu->state_int(Z80_HALT);
- set_led_status(machine(), 1, led_halt);
+ machine().output().set_led_value(1, led_halt);
}
void mpf1_state::machine_start()
diff --git a/src/mame/drivers/mpu3.cpp b/src/mame/drivers/mpu3.cpp
index be5ead09948..d07603bd8a5 100644
--- a/src/mame/drivers/mpu3.cpp
+++ b/src/mame/drivers/mpu3.cpp
@@ -235,7 +235,7 @@ void mpu3_state::update_triacs()
for (i = 0; i < 8; i++)
{
- output_set_indexed_value("triac", i, triacdata & (1 << i));
+ machine().output().set_indexed_value("triac", i, triacdata & (1 << i));
}
}
@@ -453,7 +453,7 @@ WRITE8_MEMBER(mpu3_state::pia_ic4_porta_w)
if(m_led_strobe != m_input_strobe)
{
swizzle = ((m_ic4_input_a & 0x01) << 2)+(m_ic4_input_a & 0x02)+((m_ic4_input_a & 0x4) >> 2)+(m_ic4_input_a & 0x08)+((m_ic4_input_a & 0x10) << 2)+(m_ic4_input_a & 0x20)+((m_ic4_input_a & 0x40) >> 2);
- output_set_digit_value(7 - m_input_strobe,swizzle);
+ machine().output().set_digit_value(7 - m_input_strobe,swizzle);
}
m_led_strobe = m_input_strobe;
}
@@ -488,7 +488,7 @@ WRITE8_MEMBER(mpu3_state::pia_ic4_portb_w)
for (i = 0; i < 8; i++)
{
- output_set_lamp_value((8*m_input_strobe)+i, ((data & (1 << i)) !=0));
+ machine().output().set_lamp_value((8*m_input_strobe)+i, ((data & (1 << i)) !=0));
}
m_lamp_strobe = m_input_strobe;
}
@@ -516,10 +516,10 @@ WRITE8_MEMBER(mpu3_state::pia_ic5_porta_w)
m_reel1->update((data>>2) & 0x03);
m_reel2->update((data>>4) & 0x03);
m_reel3->update((data>>6) & 0x03);
- awp_draw_reel("reel1", m_reel0);
- awp_draw_reel("reel2", m_reel1);
- awp_draw_reel("reel3", m_reel2);
- awp_draw_reel("reel4", m_reel3);
+ awp_draw_reel(machine(),"reel1", m_reel0);
+ awp_draw_reel(machine(),"reel2", m_reel1);
+ awp_draw_reel(machine(),"reel3", m_reel2);
+ awp_draw_reel(machine(),"reel4", m_reel3);
}
READ8_MEMBER(mpu3_state::pia_ic5_portb_r)
diff --git a/src/mame/drivers/mpu4hw.cpp b/src/mame/drivers/mpu4hw.cpp
index 34f869dc46f..60433f3a40f 100644
--- a/src/mame/drivers/mpu4hw.cpp
+++ b/src/mame/drivers/mpu4hw.cpp
@@ -296,7 +296,7 @@ void mpu4_state::lamp_extend_small(int data)
{
for (i = 0; i < 5; i++)
{
- output_set_lamp_value((8*column)+i+128,((lamp_ext_data & (1 << i)) != 0));
+ machine().output().set_lamp_value((8*column)+i+128,((lamp_ext_data & (1 << i)) != 0));
}
}
m_lamp_strobe_ext_persistence ++;
@@ -328,7 +328,7 @@ void mpu4_state::lamp_extend_large(int data,int column,int active)
{
for (i = 0; i < 8; i++)
{//CHECK, this includes bit 7
- output_set_lamp_value((8*column)+i+128+lampbase ,(data & (1 << i)) != 0);
+ machine().output().set_lamp_value((8*column)+i+128+lampbase ,(data & (1 << i)) != 0);
}
m_lamp_strobe_ext = column;
}
@@ -358,9 +358,9 @@ void mpu4_state::led_write_latch(int latch, int data, int column)
}
for(j=0; j<8; j++)
{
- output_set_indexed_value("mpu4led",(8*column)+j,(data & (1 << j)) !=0);
+ machine().output().set_indexed_value("mpu4led",(8*column)+j,(data & (1 << j)) !=0);
}
- output_set_digit_value(column * 8, data);
+ machine().output().set_digit_value(column * 8, data);
m_last_latch = diff;
}
@@ -379,43 +379,43 @@ void mpu4_state::update_meters()
case FIVE_REEL_5TO8:
m_reel4->update(((data >> 4) & 0x0f));
data = (data & 0x0F); //Strip reel data from meter drives, leaving active elements
- awp_draw_reel("reel5", m_reel4);
+ awp_draw_reel(machine(),"reel5", m_reel4);
break;
case FIVE_REEL_8TO5:
m_reel4->update((((data & 0x01) + ((data & 0x08) >> 2) + ((data & 0x20) >> 3) + ((data & 0x80) >> 4)) & 0x0f)) ;
data = 0x00; //Strip all reel data from meter drives, nothing is connected
- awp_draw_reel("reel5", m_reel4);
+ awp_draw_reel(machine(),"reel5", m_reel4);
break;
case FIVE_REEL_3TO6:
m_reel4->update(((data >> 2) & 0x0f));
data = 0x00; //Strip all reel data from meter drives
- awp_draw_reel("reel5", m_reel4);
+ awp_draw_reel(machine(),"reel5", m_reel4);
break;
case SIX_REEL_1TO8:
m_reel4->update( data & 0x0f);
m_reel5->update((data >> 4) & 0x0f);
data = 0x00; //Strip all reel data from meter drives
- awp_draw_reel("reel5", m_reel4);
- awp_draw_reel("reel6", m_reel5);
+ awp_draw_reel(machine(),"reel5", m_reel4);
+ awp_draw_reel(machine(),"reel6", m_reel5);
break;
case SIX_REEL_5TO8:
m_reel4->update(((data >> 4) & 0x0f));
data = 0x00; //Strip all reel data from meter drives
- awp_draw_reel("reel5", m_reel4);
+ awp_draw_reel(machine(),"reel5", m_reel4);
break;
case SEVEN_REEL:
m_reel0->update((((data & 0x01) + ((data & 0x08) >> 2) + ((data & 0x20) >> 3) + ((data & 0x80) >> 4)) & 0x0f)) ;
data = 0x00; //Strip all reel data from meter drives
- awp_draw_reel("reel1", m_reel0);
+ awp_draw_reel(machine(),"reel1", m_reel0);
break;
case FLUTTERBOX: //The backbox fan assembly fits in a reel unit sized box, wired to the remote meter pin, so we can handle it here
- output_set_value("flutterbox", data & 0x80);
+ machine().output().set_value("flutterbox", data & 0x80);
data &= ~0x80; //Strip flutterbox data from meter drives
break;
}
@@ -570,7 +570,7 @@ WRITE8_MEMBER(mpu4_state::pia_ic3_porta_w)
for (i = 0; i < 8; i++)
{
- output_set_lamp_value((8*m_input_strobe)+i, ((data & (1 << i)) !=0));
+ machine().output().set_lamp_value((8*m_input_strobe)+i, ((data & (1 << i)) !=0));
}
m_lamp_strobe = m_input_strobe;
}
@@ -588,7 +588,7 @@ WRITE8_MEMBER(mpu4_state::pia_ic3_portb_w)
{
for (i = 0; i < 8; i++)
{
- output_set_lamp_value((8*m_input_strobe)+i+64, ((data & (1 << i)) !=0));
+ machine().output().set_lamp_value((8*m_input_strobe)+i+64, ((data & (1 << i)) !=0));
}
m_lamp_strobe2 = m_input_strobe;
}
@@ -605,12 +605,12 @@ WRITE8_MEMBER(mpu4_state::pia_ic3_portb_w)
for (i = 0; i < 8; i++)
{
- if (output_get_lamp_value(lamps1[i])) pled_segs[0] |= (1 << i);
- if (output_get_lamp_value(lamps2[i])) pled_segs[1] |= (1 << i);
+ if (machine().output().get_lamp_value(lamps1[i])) pled_segs[0] |= (1 << i);
+ if (machine().output().get_lamp_value(lamps2[i])) pled_segs[1] |= (1 << i);
}
- output_set_digit_value(8,pled_segs[0]);
- output_set_digit_value(9,pled_segs[1]);
+ machine().output().set_digit_value(8,pled_segs[0]);
+ machine().output().set_digit_value(9,pled_segs[1]);
}
}
}
@@ -717,9 +717,9 @@ WRITE8_MEMBER(mpu4_state::pia_ic4_porta_w)
{
for(i=0; i<8; i++)
{
- output_set_indexed_value("mpu4led",((7 - m_input_strobe) * 8) +i,(data & (1 << i)) !=0);
+ machine().output().set_indexed_value("mpu4led",((7 - m_input_strobe) * 8) +i,(data & (1 << i)) !=0);
}
- output_set_digit_value(7 - m_input_strobe,data);
+ machine().output().set_digit_value(7 - m_input_strobe,data);
}
m_led_strobe = m_input_strobe;
}
@@ -865,9 +865,9 @@ WRITE8_MEMBER(mpu4_state::pia_ic5_porta_w)
{
for(i=0; i<8; i++)
{
- output_set_indexed_value("mpu4led",((m_input_strobe + 8) * 8) +i,(data & (1 << i)) !=0);
+ machine().output().set_indexed_value("mpu4led",((m_input_strobe + 8) * 8) +i,(data & (1 << i)) !=0);
}
- output_set_digit_value((m_input_strobe+8),data);
+ machine().output().set_digit_value((m_input_strobe+8),data);
}
break;
@@ -888,9 +888,9 @@ WRITE8_MEMBER(mpu4_state::pia_ic5_porta_w)
{
for(i=0; i<8; i++)
{
- output_set_indexed_value("mpu4led",(((8*(m_last_b7 >>7))+ m_input_strobe) * 8) +i,(~data & (1 << i)) !=0);
+ machine().output().set_indexed_value("mpu4led",(((8*(m_last_b7 >>7))+ m_input_strobe) * 8) +i,(~data & (1 << i)) !=0);
}
- output_set_digit_value(((8*(m_last_b7 >>7))+m_input_strobe),~data);
+ machine().output().set_digit_value(((8*(m_last_b7 >>7))+m_input_strobe),~data);
}
break;
@@ -902,16 +902,16 @@ WRITE8_MEMBER(mpu4_state::pia_ic5_porta_w)
{
m_reel4->update( data &0x0F);
m_reel5->update((data >> 4)&0x0F);
- awp_draw_reel("reel5", m_reel4);
- awp_draw_reel("reel6", m_reel5);
+ awp_draw_reel(machine(),"reel5", m_reel4);
+ awp_draw_reel(machine(),"reel6", m_reel5);
}
else
if (m_reel_mux == SEVEN_REEL)
{
m_reel1->update( data &0x0F);
m_reel2->update((data >> 4)&0x0F);
- awp_draw_reel("reel2", m_reel1);
- awp_draw_reel("reel3", m_reel2);
+ awp_draw_reel(machine(),"reel2", m_reel1);
+ awp_draw_reel(machine(),"reel3", m_reel2);
}
if (core_stricmp(machine().system().name, "m4gambal") == 0)
@@ -1126,15 +1126,15 @@ WRITE8_MEMBER(mpu4_state::pia_ic6_portb_w)
{
m_reel3->update( data &0x0F);
m_reel4->update((data >> 4)&0x0F);
- awp_draw_reel("reel4", m_reel3);
- awp_draw_reel("reel5", m_reel4);
+ awp_draw_reel(machine(),"reel4", m_reel3);
+ awp_draw_reel(machine(),"reel5", m_reel4);
}
else if (m_reels)
{
m_reel0->update( data &0x0F);
m_reel1->update((data >> 4)&0x0F);
- awp_draw_reel("reel1", m_reel0);
- awp_draw_reel("reel2", m_reel1);
+ awp_draw_reel(machine(),"reel1", m_reel0);
+ awp_draw_reel(machine(),"reel2", m_reel1);
}
}
@@ -1182,15 +1182,15 @@ WRITE8_MEMBER(mpu4_state::pia_ic7_porta_w)
{
m_reel5->update( data &0x0F);
m_reel6->update((data >> 4)&0x0F);
- awp_draw_reel("reel6", m_reel5);
- awp_draw_reel("reel7", m_reel7);
+ awp_draw_reel(machine(),"reel6", m_reel5);
+ awp_draw_reel(machine(),"reel7", m_reel7);
}
else if (m_reels)
{
m_reel2->update( data &0x0F);
m_reel3->update((data >> 4)&0x0F);
- awp_draw_reel("reel3", m_reel2);
- awp_draw_reel("reel4", m_reel3);
+ awp_draw_reel(machine(),"reel3", m_reel2);
+ awp_draw_reel(machine(),"reel4", m_reel3);
}
}
@@ -1280,7 +1280,7 @@ WRITE8_MEMBER(mpu4_state::pia_ic8_portb_w)
LOG_IC8(("%s: IC8 PIA Port B Set to %2x (OUTPUT PORT, TRIACS)\n", machine().describe_context(),data));
for (i = 0; i < 8; i++)
{
- output_set_indexed_value("triac", i, data & (1 << i));
+ machine().output().set_indexed_value("triac", i, data & (1 << i));
}
}
diff --git a/src/mame/drivers/mpu5hw.cpp b/src/mame/drivers/mpu5hw.cpp
index 12fc17a2bd9..f0dbd8a22f2 100644
--- a/src/mame/drivers/mpu5hw.cpp
+++ b/src/mame/drivers/mpu5hw.cpp
@@ -234,9 +234,9 @@ WRITE8_MEMBER(mpu5_state::asic_w8)
}
case 0x0b:
{
- output_set_value("statuslamp1", ((data&0x10) != 0));
+ machine().output().set_value("statuslamp1", ((data&0x10) != 0));
- output_set_value("statuslamp2", ((data&0x20) != 0));
+ machine().output().set_value("statuslamp2", ((data&0x20) != 0));
if (data & 0x40)
{
diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp
index e38cb36b1cc..03f133601d8 100644
--- a/src/mame/drivers/multfish.cpp
+++ b/src/mame/drivers/multfish.cpp
@@ -854,14 +854,14 @@ WRITE8_MEMBER(igrosoft_gamble_state::igrosoft_gamble_lamps1_w)
-X-- ---- Start Lamp 34A
X--- ---- Bet/Double Lamp 29B
*/
- output_set_lamp_value(1, ((data) & 1)); /* Hold 1 Lamp */
- output_set_lamp_value(2, ((data >> 1) & 1)); /* Hold 2 Lamp */
- output_set_lamp_value(3, ((data >> 2) & 1)); /* Hold 3 Lamp */
- output_set_lamp_value(4, ((data >> 3) & 1)); /* Hold 4 Lamp */
- output_set_lamp_value(5, ((data >> 4) & 1)); /* Hold 5 Lamp */
- output_set_lamp_value(8, ((data >> 5) & 1)); /* Help Lamp */
- output_set_lamp_value(6, ((data >> 6) & 1)); /* Start Lamp */
- output_set_lamp_value(0, ((data >> 7) & 1)); /* Bet/Double Lamp */
+ machine().output().set_lamp_value(1, ((data) & 1)); /* Hold 1 Lamp */
+ machine().output().set_lamp_value(2, ((data >> 1) & 1)); /* Hold 2 Lamp */
+ machine().output().set_lamp_value(3, ((data >> 2) & 1)); /* Hold 3 Lamp */
+ machine().output().set_lamp_value(4, ((data >> 3) & 1)); /* Hold 4 Lamp */
+ machine().output().set_lamp_value(5, ((data >> 4) & 1)); /* Hold 5 Lamp */
+ machine().output().set_lamp_value(8, ((data >> 5) & 1)); /* Help Lamp */
+ machine().output().set_lamp_value(6, ((data >> 6) & 1)); /* Start Lamp */
+ machine().output().set_lamp_value(0, ((data >> 7) & 1)); /* Bet/Double Lamp */
}
WRITE8_MEMBER(igrosoft_gamble_state::igrosoft_gamble_lamps2_w)
@@ -874,10 +874,10 @@ WRITE8_MEMBER(igrosoft_gamble_state::igrosoft_gamble_lamps2_w)
---- -X-- Maxbet Lamp 30B
---X ---- Upper Lamp Green 25B (Demo Mode)
*/
- output_set_lamp_value(9, ((data) & 1)); /* Payout Lamp */
- output_set_lamp_value(12, ((data >> 1) & 1)); /* Upper Lamp Yellow */
- output_set_lamp_value(7, ((data >> 2) & 1)); /* Maxbet Lamp */
- output_set_lamp_value(10, ((data >> 4) & 1)); /* Upper Lamp Green */
+ machine().output().set_lamp_value(9, ((data) & 1)); /* Payout Lamp */
+ machine().output().set_lamp_value(12, ((data >> 1) & 1)); /* Upper Lamp Yellow */
+ machine().output().set_lamp_value(7, ((data >> 2) & 1)); /* Maxbet Lamp */
+ machine().output().set_lamp_value(10, ((data >> 4) & 1)); /* Upper Lamp Green */
}
WRITE8_MEMBER(igrosoft_gamble_state::igrosoft_gamble_lamps3_w)
@@ -887,7 +887,7 @@ WRITE8_MEMBER(igrosoft_gamble_state::igrosoft_gamble_lamps3_w)
7654 3210
---- --X- Upper Lamp Red 26B (Service Mode)
*/
- output_set_lamp_value(11, ((data >> 1) & 1)); /* Upper Lamp Red */
+ machine().output().set_lamp_value(11, ((data >> 1) & 1)); /* Upper Lamp Red */
}
WRITE8_MEMBER(igrosoft_gamble_state::igrosoft_gamble_counters_w)
diff --git a/src/mame/drivers/mw18w.cpp b/src/mame/drivers/mw18w.cpp
index 60ab1471c44..dd872aee07b 100644
--- a/src/mame/drivers/mw18w.cpp
+++ b/src/mame/drivers/mw18w.cpp
@@ -64,7 +64,7 @@ WRITE8_MEMBER(mw18w_state::mw18w_sound1_w)
// d6: bell sound
// d7: backdrop lamp dim control
- output_set_lamp_value(80, data >> 7 & 1);
+ machine().output().set_lamp_value(80, data >> 7 & 1);
}
WRITE8_MEMBER(mw18w_state::mw18w_lamps_w)
@@ -77,7 +77,7 @@ WRITE8_MEMBER(mw18w_state::mw18w_lamps_w)
// refresh lamp status
for (int i = 0; i < 5; i++)
- output_set_lamp_value(col * 10 + i, rows >> i & 1);
+ machine().output().set_lamp_value(col * 10 + i, rows >> i & 1);
/* lamps info:
@@ -142,7 +142,7 @@ WRITE8_MEMBER(mw18w_state::mw18w_led_display_w)
// d4-7: 7442 (BCD to decimal) -> pick digit panel
if ((data & 0xf0) > 0x90) return;
- output_set_digit_value(data >> 4, _7448_map[data & 0xf]);
+ machine().output().set_digit_value(data >> 4, _7448_map[data & 0xf]);
}
WRITE8_MEMBER(mw18w_state::mw18w_irq0_clear_w)
diff --git a/src/mame/drivers/mw8080bw.cpp b/src/mame/drivers/mw8080bw.cpp
index 20ca4906434..a4db1e28a3a 100644
--- a/src/mame/drivers/mw8080bw.cpp
+++ b/src/mame/drivers/mw8080bw.cpp
@@ -300,7 +300,7 @@ WRITE8_MEMBER(mw8080bw_state::seawolf_explosion_lamp_w)
{
UINT8 bits_for_lamp = bits_for_lamps[i];
- output_set_value(lamp_names[i], (data & bits_for_lamp) == bits_for_lamp);
+ machine().output().set_value(lamp_names[i], (data & bits_for_lamp) == bits_for_lamp);
}
}
@@ -310,14 +310,14 @@ WRITE8_MEMBER(mw8080bw_state::seawolf_periscope_lamp_w)
/* the schematics and the connecting diagrams show the
torpedo light order differently, but this order is
confirmed by the software */
- output_set_value("TORP_LAMP_4", (data >> 0) & 0x01);
- output_set_value("TORP_LAMP_3", (data >> 1) & 0x01);
- output_set_value("TORP_LAMP_2", (data >> 2) & 0x01);
- output_set_value("TORP_LAMP_1", (data >> 3) & 0x01);
+ machine().output().set_value("TORP_LAMP_4", (data >> 0) & 0x01);
+ machine().output().set_value("TORP_LAMP_3", (data >> 1) & 0x01);
+ machine().output().set_value("TORP_LAMP_2", (data >> 2) & 0x01);
+ machine().output().set_value("TORP_LAMP_1", (data >> 3) & 0x01);
- output_set_value("READY_LAMP", (data >> 4) & 0x01);
+ machine().output().set_value("READY_LAMP", (data >> 4) & 0x01);
- output_set_value("RELOAD_LAMP", (data >> 5) & 0x01);
+ machine().output().set_value("RELOAD_LAMP", (data >> 5) & 0x01);
}
@@ -2108,7 +2108,7 @@ MACHINE_CONFIG_END
TIMER_DEVICE_CALLBACK_MEMBER(mw8080bw_state::spcenctr_strobe_timer_callback)
{
- output_set_value("STROBE", param && m_spcenctr_strobe_state);
+ machine().output().set_value("STROBE", param && m_spcenctr_strobe_state);
}
@@ -2369,35 +2369,35 @@ READ8_MEMBER(mw8080bw_state::bowler_shift_result_r)
WRITE8_MEMBER(mw8080bw_state::bowler_lights_1_w)
{
- output_set_value("200_LEFT_LIGHT", (data >> 0) & 0x01);
+ machine().output().set_value("200_LEFT_LIGHT", (data >> 0) & 0x01);
- output_set_value("400_LEFT_LIGHT", (data >> 1) & 0x01);
+ machine().output().set_value("400_LEFT_LIGHT", (data >> 1) & 0x01);
- output_set_value("500_LEFT_LIGHT", (data >> 2) & 0x01);
+ machine().output().set_value("500_LEFT_LIGHT", (data >> 2) & 0x01);
- output_set_value("700_LIGHT", (data >> 3) & 0x01);
+ machine().output().set_value("700_LIGHT", (data >> 3) & 0x01);
- output_set_value("500_RIGHT_LIGHT", (data >> 4) & 0x01);
+ machine().output().set_value("500_RIGHT_LIGHT", (data >> 4) & 0x01);
- output_set_value("400_RIGHT_LIGHT", (data >> 5) & 0x01);
+ machine().output().set_value("400_RIGHT_LIGHT", (data >> 5) & 0x01);
- output_set_value("200_RIGHT_LIGHT", (data >> 6) & 0x01);
+ machine().output().set_value("200_RIGHT_LIGHT", (data >> 6) & 0x01);
- output_set_value("X_LEFT_LIGHT", (data >> 7) & 0x01);
- output_set_value("X_RIGHT_LIGHT", (data >> 7) & 0x01);
+ machine().output().set_value("X_LEFT_LIGHT", (data >> 7) & 0x01);
+ machine().output().set_value("X_RIGHT_LIGHT", (data >> 7) & 0x01);
}
WRITE8_MEMBER(mw8080bw_state::bowler_lights_2_w)
{
- output_set_value("REGULATION_GAME_LIGHT", ( data >> 0) & 0x01);
- output_set_value("FLASH_GAME_LIGHT", (~data >> 0) & 0x01);
+ machine().output().set_value("REGULATION_GAME_LIGHT", ( data >> 0) & 0x01);
+ machine().output().set_value("FLASH_GAME_LIGHT", (~data >> 0) & 0x01);
- output_set_value("STRAIGHT_BALL_LIGHT", ( data >> 1) & 0x01);
+ machine().output().set_value("STRAIGHT_BALL_LIGHT", ( data >> 1) & 0x01);
- output_set_value("HOOK_BALL_LIGHT", ( data >> 2) & 0x01);
+ machine().output().set_value("HOOK_BALL_LIGHT", ( data >> 2) & 0x01);
- output_set_value("SELECT_GAME_LIGHT", ( data >> 3) & 0x01);
+ machine().output().set_value("SELECT_GAME_LIGHT", ( data >> 3) & 0x01);
/* D4-D7 are not connected */
}
diff --git a/src/mame/drivers/mwsub.cpp b/src/mame/drivers/mwsub.cpp
index 0dd9e3aed4a..6ca9b757fe6 100644
--- a/src/mame/drivers/mwsub.cpp
+++ b/src/mame/drivers/mwsub.cpp
@@ -67,7 +67,7 @@ WRITE8_MEMBER(submar_state::submar_motor_w)
// d6: stir water
// d7: n/c
for (int i = 0; i < 8; i++)
- output_set_indexed_value("motor", i, data >> i & 1);
+ machine().output().set_indexed_value("motor", i, data >> i & 1);
}
WRITE8_MEMBER(submar_state::submar_lamp_w)
@@ -81,7 +81,7 @@ WRITE8_MEMBER(submar_state::submar_lamp_w)
// d6: front ship hit
// d7: scenery
for (int i = 0; i < 8; i++)
- output_set_lamp_value(i, data >> i & 1);
+ machine().output().set_lamp_value(i, data >> i & 1);
}
WRITE8_MEMBER(submar_state::submar_solenoid_w)
@@ -89,7 +89,7 @@ WRITE8_MEMBER(submar_state::submar_solenoid_w)
// d0-d4: ship1-5
// d5-d7: n/c
for (int i = 0; i < 8; i++)
- output_set_indexed_value("solenoid", i, data >> i & 1);
+ machine().output().set_indexed_value("solenoid", i, data >> i & 1);
}
WRITE8_MEMBER(submar_state::submar_sound_w)
@@ -111,8 +111,8 @@ WRITE8_MEMBER(submar_state::submar_led_w)
{ 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7c,0x07,0x7f,0x67,0x58,0x4c,0x62,0x69,0x78,0x00 };
// 2 digits per write. port 4: time, port 5: score
- output_set_digit_value((offset << 1 & 2) | 0, _7447_map[data >> 4]);
- output_set_digit_value((offset << 1 & 2) | 1, _7447_map[data & 0x0f]);
+ machine().output().set_digit_value((offset << 1 & 2) | 0, _7447_map[data >> 4]);
+ machine().output().set_digit_value((offset << 1 & 2) | 1, _7447_map[data & 0x0f]);
}
WRITE8_MEMBER(submar_state::submar_irq_clear_w)
diff --git a/src/mame/drivers/namcos11.cpp b/src/mame/drivers/namcos11.cpp
index 2f3426fb536..21edb952ab0 100644
--- a/src/mame/drivers/namcos11.cpp
+++ b/src/mame/drivers/namcos11.cpp
@@ -381,10 +381,10 @@ WRITE16_MEMBER(namcos11_state::lightgun_w)
switch( offset )
{
case 0:
- output_set_value( "led0", !( data & 0x08 ) );
- output_set_value( "led1", !( data & 0x04 ) );
- output_set_value( "recoil0", !( data & 0x02 ) );
- output_set_value( "recoil1", !( data & 0x01 ) );
+ machine().output().set_value( "led0", !( data & 0x08 ) );
+ machine().output().set_value( "led1", !( data & 0x04 ) );
+ machine().output().set_value( "recoil0", !( data & 0x02 ) );
+ machine().output().set_value( "recoil1", !( data & 0x01 ) );
verboselog(1, "lightgun_w: outputs (%08x %08x)\n", data, mem_mask );
break;
diff --git a/src/mame/drivers/namcos12.cpp b/src/mame/drivers/namcos12.cpp
index f7c7a0fbce5..0f907fc375e 100644
--- a/src/mame/drivers/namcos12.cpp
+++ b/src/mame/drivers/namcos12.cpp
@@ -1322,13 +1322,13 @@ WRITE16_MEMBER(namcos12_state::system11gun_w)
/* blowback 1 */
/* blowback 2 */
/* Note: output label has been changed for the Engrish Impaired ;-) */
- output_set_value("Player1_Gun_Recoil", (~data & 0x02)>>1);
- output_set_value("Player2_Gun_Recoil", (~data & 0x01));
+ machine().output().set_value("Player1_Gun_Recoil", (~data & 0x02)>>1);
+ machine().output().set_value("Player2_Gun_Recoil", (~data & 0x01));
/* start 1 */
- output_set_value("P2_Start_lamp", (~data & 0x08)>>3);
+ machine().output().set_value("P2_Start_lamp", (~data & 0x08)>>3);
/* start 2 */
- output_set_value("P2_Start_lamp", (~data & 0x04)>>2);
+ machine().output().set_value("P2_Start_lamp", (~data & 0x04)>>2);
verboselog(1, "system11gun_w: outputs (%08x %08x)\n", data, mem_mask );
break;
diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp
index c4a8d0ddf87..2d2d6aecf4e 100644
--- a/src/mame/drivers/namcos2.cpp
+++ b/src/mame/drivers/namcos2.cpp
@@ -473,57 +473,57 @@ $a00000 checks have been seen on the Final Lap boards.
/* 68000/6809/63705 Shared memory area - DUAL PORT Memory */
/*************************************************************/
-static void GollyGhostUpdateLED_c4( int data )
+void namcos2_state::GollyGhostUpdateLED_c4( int data )
{
- output_set_value("zip100", data >> 4);
- output_set_value("zip10", data & 0x0f);
+ machine().output().set_value("zip100", data >> 4);
+ machine().output().set_value("zip10", data & 0x0f);
}
-static void GollyGhostUpdateLED_c6( int data )
+void namcos2_state::GollyGhostUpdateLED_c6( int data )
{
- output_set_value("zip1", data >> 4);
- output_set_value("time10", data & 0x0f);
+ machine().output().set_value("zip1", data >> 4);
+ machine().output().set_value("time10", data & 0x0f);
}
-static void GollyGhostUpdateLED_c8( int data )
+void namcos2_state::GollyGhostUpdateLED_c8( int data )
{
- output_set_value("time1", data >> 4);
- output_set_value("zap100", data & 0x0f);
+ machine().output().set_value("time1", data >> 4);
+ machine().output().set_value("zap100", data & 0x0f);
}
-static void GollyGhostUpdateLED_ca( int data )
+void namcos2_state::GollyGhostUpdateLED_ca( int data )
{
- output_set_value("zap10", data >> 4);
- output_set_value("zap1", data & 0x0f);
+ machine().output().set_value("zap10", data >> 4);
+ machine().output().set_value("zap1", data & 0x0f);
}
-static void GollyGhostUpdateDiorama_c0( int data )
+void namcos2_state::GollyGhostUpdateDiorama_c0( int data )
{
if (data & 0x80)
{
- output_set_value("dollhouse", 1); /* diorama is lit up */
+ machine().output().set_value("dollhouse", 1); /* diorama is lit up */
/* dollhouse controller; solenoids control physical components */
- output_set_value("toybox", (data >> 0) & 1);
- output_set_value("bathroom", (data >> 1) & 1);
- output_set_value("bureau", (data >> 2) & 1);
- output_set_value("refrigerator",(data >> 3) & 1);
- output_set_value("porch", (data >> 4) & 1);
+ machine().output().set_value("toybox", (data >> 0) & 1);
+ machine().output().set_value("bathroom", (data >> 1) & 1);
+ machine().output().set_value("bureau", (data >> 2) & 1);
+ machine().output().set_value("refrigerator",(data >> 3) & 1);
+ machine().output().set_value("porch", (data >> 4) & 1);
/* gun recoils */
- output_set_value("Player1_Gun_Recoil",(data & 0x20)>>5);
- output_set_value("Player2_Gun_Recoil",(data & 0x40)>>6);
+ machine().output().set_value("Player1_Gun_Recoil",(data & 0x20)>>5);
+ machine().output().set_value("Player2_Gun_Recoil",(data & 0x40)>>6);
}
else
{
- output_set_value("dollhouse",0);
- output_set_value("toybox", 0);
- output_set_value("bathroom", 0);
- output_set_value("bureau", 0);
- output_set_value("refrigerator", 0);
- output_set_value("porch", 0);
- output_set_value("Player1_Gun_Recoil",0);
- output_set_value("Player2_Gun_Recoil",0);
+ machine().output().set_value("dollhouse",0);
+ machine().output().set_value("toybox", 0);
+ machine().output().set_value("bathroom", 0);
+ machine().output().set_value("bureau", 0);
+ machine().output().set_value("refrigerator", 0);
+ machine().output().set_value("porch", 0);
+ machine().output().set_value("Player1_Gun_Recoil",0);
+ machine().output().set_value("Player2_Gun_Recoil",0);
}
}
diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp
index 64000211811..6e7090a278b 100644
--- a/src/mame/drivers/namcos22.cpp
+++ b/src/mame/drivers/namcos22.cpp
@@ -1700,7 +1700,7 @@ WRITE16_MEMBER(namcos22_state::namcos22_cpuleds_w)
// on system 22: two rows of 4 red leds
// on super system 22: GYRGYRGY green/yellow/red
for (int i = 0; i < 8; i++)
- output_set_lamp_value(i, (~data << i & 0x80) ? 0 : 1);
+ machine().output().set_lamp_value(i, (~data << i & 0x80) ? 0 : 1);
}
WRITE32_MEMBER(namcos22_state::namcos22s_chipselect_w)
@@ -2975,8 +2975,8 @@ WRITE8_MEMBER(namcos22_state::propcycle_mcu_port5_w)
// prop cycle outputs:
// bit 1 = fan
// bit 2 = button light
- output_set_value("fan0", data & 1);
- set_led_status(machine(), 0, data & 2);
+ machine().output().set_value("fan0", data & 1);
+ machine().output().set_led_value(0, data & 2);
}
static ADDRESS_MAP_START( propcycl_io_map, AS_IO, 8, namcos22_state )
diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp
index 6aa45ec8617..6932fc9f91b 100644
--- a/src/mame/drivers/namcos23.cpp
+++ b/src/mame/drivers/namcos23.cpp
@@ -2766,7 +2766,7 @@ WRITE16_MEMBER(namcos23_state::ctl_w)
if(m_ctl_led != (data & 0xff)) {
m_ctl_led = data & 0xff;
for(int i = 0; i < 8; i++)
- output_set_lamp_value(i, (~data<<i & 0x80) ? 0 : 1);
+ machine().output().set_lamp_value(i, (~data<<i & 0x80) ? 0 : 1);
}
break;
diff --git a/src/mame/drivers/namcos86.cpp b/src/mame/drivers/namcos86.cpp
index 3630d09a316..30957fb1d5b 100644
--- a/src/mame/drivers/namcos86.cpp
+++ b/src/mame/drivers/namcos86.cpp
@@ -280,8 +280,8 @@ WRITE8_MEMBER(namcos86_state::coin_w)
WRITE8_MEMBER(namcos86_state::led_w)
{
- set_led_status(machine(), 0,data & 0x08);
- set_led_status(machine(), 1,data & 0x10);
+ machine().output().set_led_value(0,data & 0x08);
+ machine().output().set_led_value(1,data & 0x10);
}
diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp
index 738a16aae9d..06d8f04dbc2 100644
--- a/src/mame/drivers/neogeo.cpp
+++ b/src/mame/drivers/neogeo.cpp
@@ -1012,15 +1012,15 @@ void neogeo_state::set_outputs( )
{ 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7d,0x07,0x7f,0x6f,0x58,0x4c,0x62,0x69,0x78,0x00 };
/* EL */
- output_set_digit_value(0, led_map[m_el_value]);
+ machine().output().set_digit_value(0, led_map[m_el_value]);
/* LED1 */
- output_set_digit_value(1, led_map[m_led1_value >> 4]);
- output_set_digit_value(2, led_map[m_led1_value & 0x0f]);
+ machine().output().set_digit_value(1, led_map[m_led1_value >> 4]);
+ machine().output().set_digit_value(2, led_map[m_led1_value & 0x0f]);
/* LED2 */
- output_set_digit_value(3, led_map[m_led2_value >> 4]);
- output_set_digit_value(4, led_map[m_led2_value & 0x0f]);
+ machine().output().set_digit_value(3, led_map[m_led2_value >> 4]);
+ machine().output().set_digit_value(4, led_map[m_led2_value & 0x0f]);
}
diff --git a/src/mame/drivers/newbrain.cpp b/src/mame/drivers/newbrain.cpp
index 84699034a75..16b07ec32e5 100644
--- a/src/mame/drivers/newbrain.cpp
+++ b/src/mame/drivers/newbrain.cpp
@@ -472,7 +472,7 @@ WRITE8_MEMBER( newbrain_state::cop_d_w )
m_keydata = m_key_row[m_keylatch]->read();
- output_set_digit_value(m_keylatch, m_segment_data[m_keylatch]);
+ machine().output().set_digit_value(m_keylatch, m_segment_data[m_keylatch]);
}
}
diff --git a/src/mame/drivers/norautp.cpp b/src/mame/drivers/norautp.cpp
index eb168764ab3..2e76d70f20c 100644
--- a/src/mame/drivers/norautp.cpp
+++ b/src/mame/drivers/norautp.cpp
@@ -645,14 +645,14 @@ WRITE8_MEMBER(norautp_state::mainlamps_w)
-x-- ---- * HOLD 5 lamp.
x--- ---- * CANCEL lamp.
*/
- output_set_lamp_value(0, (data >> 0) & 1); /* CHANGE CARD lamp */
- output_set_lamp_value(1, (data >> 1) & 1); /* SAVE / HALF GAMBLE lamp */
- output_set_lamp_value(2, (data >> 2) & 1); /* HOLD 1 lamp */
- output_set_lamp_value(3, (data >> 3) & 1); /* HOLD 2 lamp */
- output_set_lamp_value(4, (data >> 4) & 1); /* HOLD 3 lamp */
- output_set_lamp_value(5, (data >> 5) & 1); /* HOLD 4 lamp */
- output_set_lamp_value(6, (data >> 6) & 1); /* HOLD 5 lamp */
- output_set_lamp_value(7, (data >> 7) & 1); /* CANCEL lamp */
+ machine().output().set_lamp_value(0, (data >> 0) & 1); /* CHANGE CARD lamp */
+ machine().output().set_lamp_value(1, (data >> 1) & 1); /* SAVE / HALF GAMBLE lamp */
+ machine().output().set_lamp_value(2, (data >> 2) & 1); /* HOLD 1 lamp */
+ machine().output().set_lamp_value(3, (data >> 3) & 1); /* HOLD 2 lamp */
+ machine().output().set_lamp_value(4, (data >> 4) & 1); /* HOLD 3 lamp */
+ machine().output().set_lamp_value(5, (data >> 5) & 1); /* HOLD 4 lamp */
+ machine().output().set_lamp_value(6, (data >> 6) & 1); /* HOLD 5 lamp */
+ machine().output().set_lamp_value(7, (data >> 7) & 1); /* CANCEL lamp */
// popmessage("lamps: %02x", data);
}
@@ -670,8 +670,8 @@ WRITE8_MEMBER(norautp_state::soundlamps_w)
xxxx ---- * Discrete Sound Lines.
*/
- output_set_lamp_value(8, (data >> 0) & 1); /* DEAL / DRAW lamp */
- output_set_lamp_value(9, (data >> 1) & 1); /* BET / COLLECT lamp */
+ machine().output().set_lamp_value(8, (data >> 0) & 1); /* DEAL / DRAW lamp */
+ machine().output().set_lamp_value(9, (data >> 1) & 1); /* BET / COLLECT lamp */
/* the 4 MSB are for discrete sound */
m_discrete->write(space, NORAUTP_SND_EN, (data >> 7) & 0x01);
@@ -695,8 +695,8 @@ WRITE8_MEMBER(norautp_state::counterlamps_w)
-x-- ---- + Coin counter related.
x--- ---- + DEFLECT (always activated).
*/
- output_set_lamp_value(10, (data >> 0) & 1); /* HI lamp */
- output_set_lamp_value(11, (data >> 1) & 1); /* LO lamp */
+ machine().output().set_lamp_value(10, (data >> 0) & 1); /* HI lamp */
+ machine().output().set_lamp_value(11, (data >> 1) & 1); /* LO lamp */
machine().bookkeeping().coin_counter_w(0, data & 0x10); /* Coin1/3 counter */
machine().bookkeeping().coin_counter_w(1, data & 0x20); /* Coin2 counter */
diff --git a/src/mame/drivers/nsm.cpp b/src/mame/drivers/nsm.cpp
index aef59d371cf..9011c1bf1c7 100644
--- a/src/mame/drivers/nsm.cpp
+++ b/src/mame/drivers/nsm.cpp
@@ -103,7 +103,7 @@ WRITE8_MEMBER( nsm_state::cru_w )
for (j = 0; j < 5; j++)
{
segments = m_cru_data[8-j]^0xff;
- output_set_digit_value(j * 10 + i, BITSWAP16(segments, 8, 8, 8, 8, 8, 8, 0, 0, 1, 1, 2, 3, 4, 5, 6, 7));
+ machine().output().set_digit_value(j * 10 + i, BITSWAP16(segments, 8, 8, 8, 8, 8, 8, 0, 0, 1, 1, 2, 3, 4, 5, 6, 7));
}
}
}
diff --git a/src/mame/drivers/omegrace.cpp b/src/mame/drivers/omegrace.cpp
index e59884e1a9a..3f7ae783c32 100644
--- a/src/mame/drivers/omegrace.cpp
+++ b/src/mame/drivers/omegrace.cpp
@@ -326,10 +326,10 @@ WRITE8_MEMBER(omegrace_state::omegrace_leds_w)
machine().bookkeeping().coin_counter_w(1,data & 0x02);
/* bits 2 to 5 are the start leds (4 and 5 cocktail only) */
- set_led_status(machine(), 0,~data & 0x04);
- set_led_status(machine(), 1,~data & 0x08);
- set_led_status(machine(), 2,~data & 0x10);
- set_led_status(machine(), 3,~data & 0x20);
+ machine().output().set_led_value(0,~data & 0x04);
+ machine().output().set_led_value(1,~data & 0x08);
+ machine().output().set_led_value(2,~data & 0x10);
+ machine().output().set_led_value(3,~data & 0x20);
/* bit 6 flips screen (not supported) */
}
diff --git a/src/mame/drivers/orbit.cpp b/src/mame/drivers/orbit.cpp
index 7e380c35bc8..1374e19945a 100644
--- a/src/mame/drivers/orbit.cpp
+++ b/src/mame/drivers/orbit.cpp
@@ -76,8 +76,8 @@ void orbit_state::update_misc_flags(address_space &space, UINT8 val)
m_discrete->write(space, ORBIT_WARNING_EN, BIT(m_misc_flags, 7));
- set_led_status(machine(), 0, BIT(m_misc_flags, 3));
- set_led_status(machine(), 1, BIT(m_misc_flags, 6));
+ machine().output().set_led_value(0, BIT(m_misc_flags, 3));
+ machine().output().set_led_value(1, BIT(m_misc_flags, 6));
machine().bookkeeping().coin_lockout_w(0, !BIT(m_misc_flags, 1));
machine().bookkeeping().coin_lockout_w(1, !BIT(m_misc_flags, 1));
diff --git a/src/mame/drivers/othunder.cpp b/src/mame/drivers/othunder.cpp
index da2ab7faf6b..dfed9318232 100644
--- a/src/mame/drivers/othunder.cpp
+++ b/src/mame/drivers/othunder.cpp
@@ -367,8 +367,8 @@ WRITE16_MEMBER(othunder_state::othunder_tc0220ioc_w)
x0000000 eeprom out data */
/* Recoil Piston Motor Status */
- output_set_value("Player1_Recoil_Piston", data & 0x1 );
- output_set_value("Player2_Recoil_Piston", (data & 0x2) >>1 );
+ machine().output().set_value("Player1_Recoil_Piston", data & 0x1 );
+ machine().output().set_value("Player2_Recoil_Piston", (data & 0x2) >>1 );
if (data & 4)
popmessage("OBPRI SET!");
diff --git a/src/mame/drivers/overdriv.cpp b/src/mame/drivers/overdriv.cpp
index 81b67e33a6d..c092620fdaf 100644
--- a/src/mame/drivers/overdriv.cpp
+++ b/src/mame/drivers/overdriv.cpp
@@ -97,7 +97,7 @@ WRITE16_MEMBER(overdriv_state::cpuA_ctrl_w)
/* bit 1 is clear during service mode - function unknown */
- set_led_status(machine(), 0, data & 0x08);
+ machine().output().set_led_value(0, data & 0x08);
machine().bookkeeping().coin_counter_w(0, data & 0x10);
machine().bookkeeping().coin_counter_w(1, data & 0x20);
diff --git a/src/mame/drivers/pacland.cpp b/src/mame/drivers/pacland.cpp
index 95dde079db2..e0313c76d86 100644
--- a/src/mame/drivers/pacland.cpp
+++ b/src/mame/drivers/pacland.cpp
@@ -235,8 +235,8 @@ WRITE8_MEMBER(pacland_state::coin_w)
WRITE8_MEMBER(pacland_state::led_w)
{
- set_led_status(machine(), 0, data & 0x08);
- set_led_status(machine(), 1, data & 0x10);
+ machine().output().set_led_value(0, data & 0x08);
+ machine().output().set_led_value(1, data & 0x10);
}
WRITE8_MEMBER(pacland_state::irq_1_ctrl_w)
diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp
index a1371f35b60..5bc858d7325 100644
--- a/src/mame/drivers/pacman.cpp
+++ b/src/mame/drivers/pacman.cpp
@@ -503,7 +503,7 @@ WRITE8_MEMBER(pacman_state::nmouse_interrupt_vector_w)
WRITE8_MEMBER(pacman_state::pacman_leds_w)
{
- set_led_status(machine(), offset,data & 1);
+ machine().output().set_led_value(offset,data & 1);
}
diff --git a/src/mame/drivers/pc1500.cpp b/src/mame/drivers/pc1500.cpp
index dd55597784a..62c964625f6 100644
--- a/src/mame/drivers/pc1500.cpp
+++ b/src/mame/drivers/pc1500.cpp
@@ -99,20 +99,20 @@ UINT32 pc1500_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
}
}
- output_set_value("BUSY", BIT(m_lcd_data[0x4e], 0));
- output_set_value("SHIFT", BIT(m_lcd_data[0x4e], 1));
- output_set_value("SML", BIT(m_lcd_data[0x4e], 2));
- output_set_value("SMALL", BIT(m_lcd_data[0x4e], 3));
- output_set_value("III", BIT(m_lcd_data[0x4e], 4));
- output_set_value("II", BIT(m_lcd_data[0x4e], 5));
- output_set_value("I", BIT(m_lcd_data[0x4e], 6));
- output_set_value("DEF", BIT(m_lcd_data[0x4e], 7));
- output_set_value("DE", BIT(m_lcd_data[0x4f], 0));
- output_set_value("G", BIT(m_lcd_data[0x4f], 1));
- output_set_value("RAD", BIT(m_lcd_data[0x4f], 2));
- output_set_value("RESERVE", BIT(m_lcd_data[0x4f], 4));
- output_set_value("PRO", BIT(m_lcd_data[0x4f], 5));
- output_set_value("RUN", BIT(m_lcd_data[0x4f], 6));
+ machine().output().set_value("BUSY", BIT(m_lcd_data[0x4e], 0));
+ machine().output().set_value("SHIFT", BIT(m_lcd_data[0x4e], 1));
+ machine().output().set_value("SML", BIT(m_lcd_data[0x4e], 2));
+ machine().output().set_value("SMALL", BIT(m_lcd_data[0x4e], 3));
+ machine().output().set_value("III", BIT(m_lcd_data[0x4e], 4));
+ machine().output().set_value("II", BIT(m_lcd_data[0x4e], 5));
+ machine().output().set_value("I", BIT(m_lcd_data[0x4e], 6));
+ machine().output().set_value("DEF", BIT(m_lcd_data[0x4e], 7));
+ machine().output().set_value("DE", BIT(m_lcd_data[0x4f], 0));
+ machine().output().set_value("G", BIT(m_lcd_data[0x4f], 1));
+ machine().output().set_value("RAD", BIT(m_lcd_data[0x4f], 2));
+ machine().output().set_value("RESERVE", BIT(m_lcd_data[0x4f], 4));
+ machine().output().set_value("PRO", BIT(m_lcd_data[0x4f], 5));
+ machine().output().set_value("RUN", BIT(m_lcd_data[0x4f], 6));
return 0;
}
diff --git a/src/mame/drivers/pc2000.cpp b/src/mame/drivers/pc2000.cpp
index b5aec6f6b9f..03bb62f79e9 100644
--- a/src/mame/drivers/pc2000.cpp
+++ b/src/mame/drivers/pc2000.cpp
@@ -255,10 +255,10 @@ SED1520_UPDATE_CB(gl3000s_screen_update_left)
else if ((x == 75 || x == 77 || x == 79) && yi == 5) points[y][dpos] |= (state << 4);
else if ((x == 75 || x == 77 || x == 79) && yi == 6) points[y][dpos] |= (state << 3);
- else if (y == 1 && x >= 65 && x <= 68 && yi == 7) output_set_indexed_value("LEV", x - 64, state);
- else if (x >= 59 && x <= 60 && yi == 7) output_set_indexed_value("TRY", x - 58 + (y ? 0 : 1), state);
- else if (y == 1 && x >= 61 && x <= 64 && yi == 7) output_set_indexed_value("TICK", x - 59, state);
- else if (y == 0 && x >= 61 && x <= 64 && yi == 7) output_set_indexed_value("TICK", 62 - x + (x >= 63 ? 8 : 0), state);
+ else if (y == 1 && x >= 65 && x <= 68 && yi == 7) device.machine().output().set_indexed_value("LEV", x - 64, state);
+ else if (x >= 59 && x <= 60 && yi == 7) device.machine().output().set_indexed_value("TRY", x - 58 + (y ? 0 : 1), state);
+ else if (y == 1 && x >= 61 && x <= 64 && yi == 7) device.machine().output().set_indexed_value("TICK", x - 59, state);
+ else if (y == 0 && x >= 61 && x <= 64 && yi == 7) device.machine().output().set_indexed_value("TICK", 62 - x + (x >= 63 ? 8 : 0), state);
else if (x < 74 && yi < 7)
{
@@ -270,9 +270,9 @@ SED1520_UPDATE_CB(gl3000s_screen_update_left)
for(int i=0; i < 3; i++)
{
- output_set_indexed_value("TIME", i, sec[i]);
- output_set_indexed_value("P1", i, points[1][i]);
- output_set_indexed_value("P2", i, points[0][i]);
+ device.machine().output().set_indexed_value("TIME", i, sec[i]);
+ device.machine().output().set_indexed_value("P1", i, points[1][i]);
+ device.machine().output().set_indexed_value("P2", i, points[0][i]);
}
return gl3000s_sed1520_screen_update(device, bitmap, cliprect, vram, start_line, adc, 58);
diff --git a/src/mame/drivers/pce220.cpp b/src/mame/drivers/pce220.cpp
index 5247700b56d..b7758beb0fd 100644
--- a/src/mame/drivers/pce220.cpp
+++ b/src/mame/drivers/pce220.cpp
@@ -163,24 +163,24 @@ UINT32 pce220_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
memset(lcd_symbols, 0, sizeof(lcd_symbols));
}
- output_set_value("BUSY" , (lcd_symbols[0] & 0x01) ? 1 : 0);
- output_set_value("CAPS" , (lcd_symbols[0] & 0x02) ? 1 : 0);
- output_set_value("KANA" , (lcd_symbols[0] & 0x04) ? 1 : 0);
- output_set_value("SYO" , (lcd_symbols[0] & 0x08) ? 1 : 0);
- output_set_value("2ndF" , (lcd_symbols[0] & 0x10) ? 1 : 0);
- output_set_value("TEXT" , (lcd_symbols[1] & 0x08) ? 1 : 0);
- output_set_value("CASL" , (lcd_symbols[1] & 0x10) ? 1 : 0);
- output_set_value("PRO" , (lcd_symbols[1] & 0x20) ? 1 : 0);
- output_set_value("RUN" , (lcd_symbols[1] & 0x40) ? 1 : 0);
- output_set_value("BATT" , (lcd_symbols[2] & 0x01) ? 1 : 0);
- output_set_value("E" , (lcd_symbols[2] & 0x02) ? 1 : 0);
- output_set_value("M" , (lcd_symbols[2] & 0x04) ? 1 : 0);
- output_set_value("CONST", (lcd_symbols[2] & 0x08) ? 1 : 0);
- output_set_value("RAD" , (lcd_symbols[2] & 0x10) ? 1 : 0);
- output_set_value("G" , (lcd_symbols[2] & 0x20) ? 1 : 0);
- output_set_value("DE" , (lcd_symbols[2] & 0x40) ? 1 : 0);
- output_set_value("STAT" , (lcd_symbols[3] & 0x20) ? 1 : 0);
- output_set_value("PRINT", (lcd_symbols[3] & 0x40) ? 1 : 0);
+ machine().output().set_value("BUSY" , (lcd_symbols[0] & 0x01) ? 1 : 0);
+ machine().output().set_value("CAPS" , (lcd_symbols[0] & 0x02) ? 1 : 0);
+ machine().output().set_value("KANA" , (lcd_symbols[0] & 0x04) ? 1 : 0);
+ machine().output().set_value("SYO" , (lcd_symbols[0] & 0x08) ? 1 : 0);
+ machine().output().set_value("2ndF" , (lcd_symbols[0] & 0x10) ? 1 : 0);
+ machine().output().set_value("TEXT" , (lcd_symbols[1] & 0x08) ? 1 : 0);
+ machine().output().set_value("CASL" , (lcd_symbols[1] & 0x10) ? 1 : 0);
+ machine().output().set_value("PRO" , (lcd_symbols[1] & 0x20) ? 1 : 0);
+ machine().output().set_value("RUN" , (lcd_symbols[1] & 0x40) ? 1 : 0);
+ machine().output().set_value("BATT" , (lcd_symbols[2] & 0x01) ? 1 : 0);
+ machine().output().set_value("E" , (lcd_symbols[2] & 0x02) ? 1 : 0);
+ machine().output().set_value("M" , (lcd_symbols[2] & 0x04) ? 1 : 0);
+ machine().output().set_value("CONST", (lcd_symbols[2] & 0x08) ? 1 : 0);
+ machine().output().set_value("RAD" , (lcd_symbols[2] & 0x10) ? 1 : 0);
+ machine().output().set_value("G" , (lcd_symbols[2] & 0x20) ? 1 : 0);
+ machine().output().set_value("DE" , (lcd_symbols[2] & 0x40) ? 1 : 0);
+ machine().output().set_value("STAT" , (lcd_symbols[3] & 0x20) ? 1 : 0);
+ machine().output().set_value("PRINT", (lcd_symbols[3] & 0x40) ? 1 : 0);
return 0;
}
@@ -245,23 +245,23 @@ UINT32 pcg850v_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
memset(lcd_symbols, 0, sizeof(lcd_symbols));
}
- output_set_value("RUN" , (lcd_symbols[0] & 0x02) ? 1 : 0);
- output_set_value("PRO" , (lcd_symbols[0] & 0x08) ? 1 : 0);
- output_set_value("TEXT" , (lcd_symbols[0] & 0x40) ? 1 : 0);
- output_set_value("CASL" , (lcd_symbols[1] & 0x08) ? 1 : 0);
- output_set_value("STAT" , (lcd_symbols[2] & 0x01) ? 1 : 0);
- output_set_value("2ndF" , (lcd_symbols[2] & 0x20) ? 1 : 0);
- output_set_value("M" , (lcd_symbols[2] & 0x80) ? 1 : 0);
- output_set_value("CAPS" , (lcd_symbols[3] & 0x04) ? 1 : 0);
- output_set_value("KANA" , (lcd_symbols[3] & 0x80) ? 1 : 0);
- output_set_value("SYO" , (lcd_symbols[4] & 0x02) ? 1 : 0);
- output_set_value("DE" , (lcd_symbols[4] & 0x10) ? 1 : 0);
- output_set_value("G" , (lcd_symbols[4] & 0x40) ? 1 : 0);
- output_set_value("RAD" , (lcd_symbols[5] & 0x01) ? 1 : 0);
- output_set_value("CONST", (lcd_symbols[5] & 0x04) ? 1 : 0);
- output_set_value("PRINT", (lcd_symbols[5] & 0x10) ? 1 : 0);
- output_set_value("BUSY" , (lcd_symbols[5] & 0x40) ? 1 : 0);
- output_set_value("BATT" , (lcd_symbols[5] & 0x80) ? 1 : 0);
+ machine().output().set_value("RUN" , (lcd_symbols[0] & 0x02) ? 1 : 0);
+ machine().output().set_value("PRO" , (lcd_symbols[0] & 0x08) ? 1 : 0);
+ machine().output().set_value("TEXT" , (lcd_symbols[0] & 0x40) ? 1 : 0);
+ machine().output().set_value("CASL" , (lcd_symbols[1] & 0x08) ? 1 : 0);
+ machine().output().set_value("STAT" , (lcd_symbols[2] & 0x01) ? 1 : 0);
+ machine().output().set_value("2ndF" , (lcd_symbols[2] & 0x20) ? 1 : 0);
+ machine().output().set_value("M" , (lcd_symbols[2] & 0x80) ? 1 : 0);
+ machine().output().set_value("CAPS" , (lcd_symbols[3] & 0x04) ? 1 : 0);
+ machine().output().set_value("KANA" , (lcd_symbols[3] & 0x80) ? 1 : 0);
+ machine().output().set_value("SYO" , (lcd_symbols[4] & 0x02) ? 1 : 0);
+ machine().output().set_value("DE" , (lcd_symbols[4] & 0x10) ? 1 : 0);
+ machine().output().set_value("G" , (lcd_symbols[4] & 0x40) ? 1 : 0);
+ machine().output().set_value("RAD" , (lcd_symbols[5] & 0x01) ? 1 : 0);
+ machine().output().set_value("CONST", (lcd_symbols[5] & 0x04) ? 1 : 0);
+ machine().output().set_value("PRINT", (lcd_symbols[5] & 0x10) ? 1 : 0);
+ machine().output().set_value("BUSY" , (lcd_symbols[5] & 0x40) ? 1 : 0);
+ machine().output().set_value("BATT" , (lcd_symbols[5] & 0x80) ? 1 : 0);
return 0;
}
diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp
index 841d98f26d1..c43bb170dd0 100644
--- a/src/mame/drivers/peplus.cpp
+++ b/src/mame/drivers/peplus.cpp
@@ -456,14 +456,14 @@ WRITE8_MEMBER(peplus_state::peplus_cmos_w)
WRITE8_MEMBER(peplus_state::peplus_output_bank_a_w)
{
- output_set_value("pe_bnka0",(data >> 0) & 1); /* Coin Lockout */
- output_set_value("pe_bnka1",(data >> 1) & 1); /* Diverter */
- output_set_value("pe_bnka2",(data >> 2) & 1); /* Bell */
- output_set_value("pe_bnka3",(data >> 3) & 1); /* N/A */
- output_set_value("pe_bnka4",(data >> 4) & 1); /* Hopper 1 */
- output_set_value("pe_bnka5",(data >> 5) & 1); /* Hopper 2 */
- output_set_value("pe_bnka6",(data >> 6) & 1); /* specific to a kind of machine */
- output_set_value("pe_bnka7",(data >> 7) & 1); /* specific to a kind of machine */
+ machine().output().set_value("pe_bnka0",(data >> 0) & 1); /* Coin Lockout */
+ machine().output().set_value("pe_bnka1",(data >> 1) & 1); /* Diverter */
+ machine().output().set_value("pe_bnka2",(data >> 2) & 1); /* Bell */
+ machine().output().set_value("pe_bnka3",(data >> 3) & 1); /* N/A */
+ machine().output().set_value("pe_bnka4",(data >> 4) & 1); /* Hopper 1 */
+ machine().output().set_value("pe_bnka5",(data >> 5) & 1); /* Hopper 2 */
+ machine().output().set_value("pe_bnka6",(data >> 6) & 1); /* specific to a kind of machine */
+ machine().output().set_value("pe_bnka7",(data >> 7) & 1); /* specific to a kind of machine */
m_coin_out_state = 0;
if(((data >> 4) & 1) || ((data >> 5) & 1))
@@ -472,26 +472,26 @@ WRITE8_MEMBER(peplus_state::peplus_output_bank_a_w)
WRITE8_MEMBER(peplus_state::peplus_output_bank_b_w)
{
- output_set_value("pe_bnkb0",(data >> 0) & 1); /* specific to a kind of machine */
- output_set_value("pe_bnkb1",(data >> 1) & 1); /* Deal Spin Start */
- output_set_value("pe_bnkb2",(data >> 2) & 1); /* Cash Out */
- output_set_value("pe_bnkb3",(data >> 3) & 1); /* specific to a kind of machine */
- output_set_value("pe_bnkb4",(data >> 4) & 1); /* Bet 1 / Bet Max */
- output_set_value("pe_bnkb5",(data >> 5) & 1); /* Change Request */
- output_set_value("pe_bnkb6",(data >> 6) & 1); /* Door Open */
- output_set_value("pe_bnkb7",(data >> 7) & 1); /* specific to a kind of machine */
+ machine().output().set_value("pe_bnkb0",(data >> 0) & 1); /* specific to a kind of machine */
+ machine().output().set_value("pe_bnkb1",(data >> 1) & 1); /* Deal Spin Start */
+ machine().output().set_value("pe_bnkb2",(data >> 2) & 1); /* Cash Out */
+ machine().output().set_value("pe_bnkb3",(data >> 3) & 1); /* specific to a kind of machine */
+ machine().output().set_value("pe_bnkb4",(data >> 4) & 1); /* Bet 1 / Bet Max */
+ machine().output().set_value("pe_bnkb5",(data >> 5) & 1); /* Change Request */
+ machine().output().set_value("pe_bnkb6",(data >> 6) & 1); /* Door Open */
+ machine().output().set_value("pe_bnkb7",(data >> 7) & 1); /* specific to a kind of machine */
}
WRITE8_MEMBER(peplus_state::peplus_output_bank_c_w)
{
- output_set_value("pe_bnkc0",(data >> 0) & 1); /* Coin In Meter */
- output_set_value("pe_bnkc1",(data >> 1) & 1); /* Coin Out Meter */
- output_set_value("pe_bnkc2",(data >> 2) & 1); /* Coin Drop Meter */
- output_set_value("pe_bnkc3",(data >> 3) & 1); /* Jackpot Meter */
- output_set_value("pe_bnkc4",(data >> 4) & 1); /* Bill Acceptor Enabled */
- output_set_value("pe_bnkc5",(data >> 5) & 1); /* SDS Out */
- output_set_value("pe_bnkc6",(data >> 6) & 1); /* N/A */
- output_set_value("pe_bnkc7",(data >> 7) & 1); /* Game Meter */
+ machine().output().set_value("pe_bnkc0",(data >> 0) & 1); /* Coin In Meter */
+ machine().output().set_value("pe_bnkc1",(data >> 1) & 1); /* Coin Out Meter */
+ machine().output().set_value("pe_bnkc2",(data >> 2) & 1); /* Coin Drop Meter */
+ machine().output().set_value("pe_bnkc3",(data >> 3) & 1); /* Jackpot Meter */
+ machine().output().set_value("pe_bnkc4",(data >> 4) & 1); /* Bill Acceptor Enabled */
+ machine().output().set_value("pe_bnkc5",(data >> 5) & 1); /* SDS Out */
+ machine().output().set_value("pe_bnkc6",(data >> 6) & 1); /* N/A */
+ machine().output().set_value("pe_bnkc7",(data >> 7) & 1); /* Game Meter */
m_bv_enable_state = (data >> 4) & 1;
}
diff --git a/src/mame/drivers/peyper.cpp b/src/mame/drivers/peyper.cpp
index befc887a0cd..930f52cf4cc 100644
--- a/src/mame/drivers/peyper.cpp
+++ b/src/mame/drivers/peyper.cpp
@@ -118,17 +118,17 @@ WRITE8_MEMBER( peyper_state::disp_w )
switch (q)
{
case 34: // player indicator lights (7-digit only)
- output_set_indexed_value("led_",1,BIT(a,0)); // PLAYER 1
- output_set_indexed_value("led_",2,BIT(a,1)); // PLAYER 2
- output_set_indexed_value("led_",3,BIT(a,2)); // PLAYER 3
- output_set_indexed_value("led_",4,BIT(a,3)); // PLAYER 4
+ machine().output().set_indexed_value("led_",1,BIT(a,0)); // PLAYER 1
+ machine().output().set_indexed_value("led_",2,BIT(a,1)); // PLAYER 2
+ machine().output().set_indexed_value("led_",3,BIT(a,2)); // PLAYER 3
+ machine().output().set_indexed_value("led_",4,BIT(a,3)); // PLAYER 4
break;
case 35: // units digits show 0
- if (!BIT(a,0)) output_set_indexed_value("dpl_",m_disp_layout[32], 0x3f);
- if (!BIT(a,1)) output_set_indexed_value("dpl_",m_disp_layout[33], 0x3f);
- if (!BIT(a,2)) output_set_indexed_value("dpl_",m_disp_layout[34], 0x3f);
- if (!BIT(a,3)) output_set_indexed_value("dpl_",m_disp_layout[35], 0x3f);
+ if (!BIT(a,0)) machine().output().set_indexed_value("dpl_",m_disp_layout[32], 0x3f);
+ if (!BIT(a,1)) machine().output().set_indexed_value("dpl_",m_disp_layout[33], 0x3f);
+ if (!BIT(a,2)) machine().output().set_indexed_value("dpl_",m_disp_layout[34], 0x3f);
+ if (!BIT(a,3)) machine().output().set_indexed_value("dpl_",m_disp_layout[35], 0x3f);
break;
case 36: // game status indicators
@@ -144,13 +144,13 @@ WRITE8_MEMBER( peyper_state::disp_w )
case 38: // player 2 indicators (6-digit only)
case 39: // player 3 indicators (6-digit only)
case 40: // player 4 indicators (6-digit only)
- output_set_indexed_value("led_",q-36,BIT(a,1)); // player indicator
- output_set_indexed_value("dpl_",q-7,BIT(a,2) ? 6:0); // million led (we show blank or 1 in millions digit)
+ machine().output().set_indexed_value("led_",q-36,BIT(a,1)); // player indicator
+ machine().output().set_indexed_value("dpl_",q-7,BIT(a,2) ? 6:0); // million led (we show blank or 1 in millions digit)
// bit 3, looks like it turns on all the decimal points, reason unknown
break;
default: // display a digit
- output_set_indexed_value("dpl_",q,hex_a);
+ machine().output().set_indexed_value("dpl_",q,hex_a);
}
}
}
diff --git a/src/mame/drivers/piggypas.cpp b/src/mame/drivers/piggypas.cpp
index fbf7122791f..887e69c3623 100644
--- a/src/mame/drivers/piggypas.cpp
+++ b/src/mame/drivers/piggypas.cpp
@@ -53,7 +53,7 @@ WRITE8_MEMBER(piggypas_state::ctrl_w)
WRITE8_MEMBER(piggypas_state::mcs51_tx_callback)
{
- output_set_digit_value(m_digit_idx++, BITSWAP8(data,7,6,4,3,2,1,0,5) & 0x7f);
+ machine().output().set_digit_value(m_digit_idx++, BITSWAP8(data,7,6,4,3,2,1,0,5) & 0x7f);
}
static ADDRESS_MAP_START( piggypas_map, AS_PROGRAM, 8, piggypas_state )
diff --git a/src/mame/drivers/pmi80.cpp b/src/mame/drivers/pmi80.cpp
index b82db49ccde..b7491b734f0 100644
--- a/src/mame/drivers/pmi80.cpp
+++ b/src/mame/drivers/pmi80.cpp
@@ -75,7 +75,7 @@ WRITE8_MEMBER( pmi80_state::leds_w )
if (m_ledready)
{
m_ledready = FALSE;
- output_set_digit_value(m_keyrow^0xff, data^0xff);
+ machine().output().set_digit_value(m_keyrow^0xff, data^0xff);
}
}
diff --git a/src/mame/drivers/polepos.cpp b/src/mame/drivers/polepos.cpp
index d793a0262b2..cada34e528e 100644
--- a/src/mame/drivers/polepos.cpp
+++ b/src/mame/drivers/polepos.cpp
@@ -351,8 +351,8 @@ CUSTOM_INPUT_MEMBER(polepos_state::auto_start_r)
WRITE8_MEMBER(polepos_state::out_0)
{
// no start lamps in pole position
-// set_led_status(machine(), 1,data & 1);
-// set_led_status(machine(), 0,data & 2);
+// machine().output().set_led_value(1,data & 1);
+// machine().output().set_led_value(0,data & 2);
machine().bookkeeping().coin_counter_w(1,~data & 4);
machine().bookkeeping().coin_counter_w(0,~data & 8);
}
diff --git a/src/mame/drivers/poly880.cpp b/src/mame/drivers/poly880.cpp
index 26917bcd25e..f72e595f4b8 100644
--- a/src/mame/drivers/poly880.cpp
+++ b/src/mame/drivers/poly880.cpp
@@ -49,7 +49,7 @@ void poly880_state::update_display()
for (i = 0; i < 8; i++)
{
- if (BIT(m_digit, i)) output_set_digit_value(7 - i, m_segment);
+ if (BIT(m_digit, i)) machine().output().set_digit_value(7 - i, m_segment);
}
}
diff --git a/src/mame/drivers/pong.cpp b/src/mame/drivers/pong.cpp
index 56aa2190ccd..8d4beacdd24 100644
--- a/src/mame/drivers/pong.cpp
+++ b/src/mame/drivers/pong.cpp
@@ -209,17 +209,17 @@ public:
NETDEV_ANALOG_CALLBACK_MEMBER(serve_cb)
{
- output_set_value("serve_led", (data < 3.5) ? 1 : 0);
+ machine().output().set_value("serve_led", (data < 3.5) ? 1 : 0);
}
NETDEV_ANALOG_CALLBACK_MEMBER(credit1_cb)
{
- output_set_value("lamp_credit1", (data < 2.0) ? 0 : 1);
+ machine().output().set_value("lamp_credit1", (data < 2.0) ? 0 : 1);
}
NETDEV_ANALOG_CALLBACK_MEMBER(credit2_cb)
{
- output_set_value("lamp_credit2", (data < 2.0) ? 0 : 1);
+ machine().output().set_value("lamp_credit2", (data < 2.0) ? 0 : 1);
}
NETDEV_ANALOG_CALLBACK_MEMBER(coin_counter_cb)
diff --git a/src/mame/drivers/poolshrk.cpp b/src/mame/drivers/poolshrk.cpp
index 3a49c79601b..65a379940f4 100644
--- a/src/mame/drivers/poolshrk.cpp
+++ b/src/mame/drivers/poolshrk.cpp
@@ -55,9 +55,9 @@ WRITE8_MEMBER(poolshrk_state::da_latch_w)
WRITE8_MEMBER(poolshrk_state::led_w)
{
if (offset & 2)
- set_led_status(machine(), 0, offset & 1);
+ machine().output().set_led_value(0, offset & 1);
if (offset & 4)
- set_led_status(machine(), 1, offset & 1);
+ machine().output().set_led_value(1, offset & 1);
}
diff --git a/src/mame/drivers/portrait.cpp b/src/mame/drivers/portrait.cpp
index 0653c9dd745..14cb2275e2c 100644
--- a/src/mame/drivers/portrait.cpp
+++ b/src/mame/drivers/portrait.cpp
@@ -100,11 +100,11 @@ WRITE8_MEMBER(portrait_state::ctrl_w)
machine().bookkeeping().coin_counter_w(2, data & 0x04);
/* the 2 lamps near the camera */
- set_led_status(machine(), 0, data & 0x08);
- set_led_status(machine(), 1, data & 0x40);
+ machine().output().set_led_value(0, data & 0x08);
+ machine().output().set_led_value(1, data & 0x40);
/* shows the black and white photo from the camera */
- output_set_value("photo", (data >> 7) & 1);
+ machine().output().set_value("photo", (data >> 7) & 1);
}
WRITE8_MEMBER(portrait_state::positive_scroll_w)
diff --git a/src/mame/drivers/pro80.cpp b/src/mame/drivers/pro80.cpp
index 68672c6af7b..97fd49ebaaf 100644
--- a/src/mame/drivers/pro80.cpp
+++ b/src/mame/drivers/pro80.cpp
@@ -58,12 +58,12 @@ WRITE8_MEMBER( pro80_state::segment_w )
{
if (m_digit_sel)
{
- if (!BIT(m_digit_sel, 0)) output_set_digit_value(0, data);
- if (!BIT(m_digit_sel, 1)) output_set_digit_value(1, data);
- if (!BIT(m_digit_sel, 2)) output_set_digit_value(2, data);
- if (!BIT(m_digit_sel, 3)) output_set_digit_value(3, data);
- if (!BIT(m_digit_sel, 4)) output_set_digit_value(4, data);
- if (!BIT(m_digit_sel, 5)) output_set_digit_value(5, data);
+ if (!BIT(m_digit_sel, 0)) machine().output().set_digit_value(0, data);
+ if (!BIT(m_digit_sel, 1)) machine().output().set_digit_value(1, data);
+ if (!BIT(m_digit_sel, 2)) machine().output().set_digit_value(2, data);
+ if (!BIT(m_digit_sel, 3)) machine().output().set_digit_value(3, data);
+ if (!BIT(m_digit_sel, 4)) machine().output().set_digit_value(4, data);
+ if (!BIT(m_digit_sel, 5)) machine().output().set_digit_value(5, data);
m_cass->output( BIT(data, 6) ? -1.0 : +1.0);
m_digit_sel = 0;
diff --git a/src/mame/drivers/prophet600.cpp b/src/mame/drivers/prophet600.cpp
index e957ea76ab7..45e4e3ed89b 100644
--- a/src/mame/drivers/prophet600.cpp
+++ b/src/mame/drivers/prophet600.cpp
@@ -124,11 +124,11 @@ WRITE8_MEMBER(prophet600_state::led_w)
}
else if (m_scanrow == 0x20)
{
- output_set_digit_value(0, data);
+ machine().output().set_digit_value(0, data);
}
else if (m_scanrow == 0x40)
{
- output_set_digit_value(1, data);
+ machine().output().set_digit_value(1, data);
}
}
diff --git a/src/mame/drivers/pve500.cpp b/src/mame/drivers/pve500.cpp
index 365bba01138..815b27d5fb4 100644
--- a/src/mame/drivers/pve500.cpp
+++ b/src/mame/drivers/pve500.cpp
@@ -309,7 +309,7 @@ printf("io_expander_w: PORTA (io_SC=%02X)\n", data);
for (int j=0; j<8; j++){
if (!BIT(io_SC,j)){
for (int i=0; i<4; i++)
- output_set_digit_value(8*swap[i] + j, LD_data[i]);
+ machine().output().set_digit_value(8*swap[i] + j, LD_data[i]);
}
}
break;
diff --git a/src/mame/drivers/px4.cpp b/src/mame/drivers/px4.cpp
index 2787206ecfc..77d98336d56 100644
--- a/src/mame/drivers/px4.cpp
+++ b/src/mame/drivers/px4.cpp
@@ -1036,9 +1036,9 @@ WRITE8_MEMBER( px4_state::ioctlr_w )
// bit 3, cartridge reset
- output_set_value("led_0", BIT(data, 4)); // caps lock
- output_set_value("led_1", BIT(data, 5)); // num lock
- output_set_value("led_2", BIT(data, 6)); // "led 2"
+ machine().output().set_value("led_0", BIT(data, 4)); // caps lock
+ machine().output().set_value("led_1", BIT(data, 5)); // num lock
+ machine().output().set_value("led_2", BIT(data, 6)); // "led 2"
m_speaker->level_w(BIT(data, 7));
}
diff --git a/src/mame/drivers/px8.cpp b/src/mame/drivers/px8.cpp
index 6af4feed268..e1fc9633a60 100644
--- a/src/mame/drivers/px8.cpp
+++ b/src/mame/drivers/px8.cpp
@@ -322,9 +322,9 @@ WRITE8_MEMBER( px8_state::gah40m_w )
*/
- output_set_value("led_0", BIT(data, 0));
- output_set_value("led_1", BIT(data, 1));
- output_set_value("led_2", BIT(data, 2));
+ machine().output().set_value("led_0", BIT(data, 0));
+ machine().output().set_value("led_1", BIT(data, 1));
+ machine().output().set_value("led_2", BIT(data, 2));
break;
case GAH40M_IER:
diff --git a/src/mame/drivers/quantum.cpp b/src/mame/drivers/quantum.cpp
index cdb1e8b16c0..409dadbdb47 100644
--- a/src/mame/drivers/quantum.cpp
+++ b/src/mame/drivers/quantum.cpp
@@ -120,8 +120,8 @@ WRITE16_MEMBER(quantum_state::led_w)
/* bit 3 = select second trackball for cocktail mode? */
/* bits 4 and 5 are LED controls */
- set_led_status(machine(), 0, data & 0x10);
- set_led_status(machine(), 1, data & 0x20);
+ machine().output().set_led_value(0, data & 0x10);
+ machine().output().set_led_value(1, data & 0x20);
/* bits 6 and 7 flip screen */
m_avg->set_flip_x (data & 0x40);
diff --git a/src/mame/drivers/quizshow.cpp b/src/mame/drivers/quizshow.cpp
index b67bb95aa20..a1ada2e153d 100644
--- a/src/mame/drivers/quizshow.cpp
+++ b/src/mame/drivers/quizshow.cpp
@@ -133,7 +133,7 @@ WRITE8_MEMBER(quizshow_state::quizshow_lamps1_w)
{
// d0-d3: P1 answer button lamps
for (int i = 0; i < 4; i++)
- output_set_lamp_value(i, data >> i & 1);
+ machine().output().set_lamp_value(i, data >> i & 1);
// d4-d7: N/C
}
@@ -142,7 +142,7 @@ WRITE8_MEMBER(quizshow_state::quizshow_lamps2_w)
{
// d0-d3: P2 answer button lamps
for (int i = 0; i < 4; i++)
- output_set_lamp_value(i + 4, data >> i & 1);
+ machine().output().set_lamp_value(i + 4, data >> i & 1);
// d4-d7: N/C
}
@@ -150,8 +150,8 @@ WRITE8_MEMBER(quizshow_state::quizshow_lamps2_w)
WRITE8_MEMBER(quizshow_state::quizshow_lamps3_w)
{
// d0-d1: start button lamps
- output_set_lamp_value(8, data >> 0 & 1);
- output_set_lamp_value(9, data >> 1 & 1);
+ machine().output().set_lamp_value(8, data >> 0 & 1);
+ machine().output().set_lamp_value(9, data >> 1 & 1);
// d2-d3: unused? (chip is shared with quizshow_tape_control_w)
// d4-d7: N/C
@@ -160,7 +160,7 @@ WRITE8_MEMBER(quizshow_state::quizshow_lamps3_w)
WRITE8_MEMBER(quizshow_state::quizshow_tape_control_w)
{
// d2: enable user category select (changes tape head position)
- output_set_lamp_value(10, data >> 2 & 1);
+ machine().output().set_lamp_value(10, data >> 2 & 1);
m_category_enable = (data & 0xc) == 0xc;
// d3: tape motor
diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp
index 876bfe53c68..6d6556d7852 100644
--- a/src/mame/drivers/rainbow.cpp
+++ b/src/mame/drivers/rainbow.cpp
@@ -875,13 +875,13 @@ void rainbow_state::machine_reset()
hard_disk_file *local_hard_disk;
local_hard_disk = rainbow_hdc_file(0); // one hard disk for now.
- output_set_value("led1", 0);
+ machine().output().set_value("led1", 0);
if (local_hard_disk)
{
hard_disk_info *info;
if ( (info = hard_disk_get_info(local_hard_disk)) )
{
- output_set_value("led1", 1);
+ machine().output().set_value("led1", 1);
UINT32 max_sector = (info->cylinders) * (info->heads) * (info->sectors);
printf("\n%u MB HARD DISK: HEADS (1..8 OK) = %d / CYL. (151..1024 OK) = %d / SPT. (16 OK) = %d / SECTOR_BYTES (128..1024 OK) = %d\n", max_sector * 512 / 1000000,
@@ -910,19 +910,19 @@ void rainbow_state::machine_reset()
m_irq_high = 0;
// RESET ALL LEDs
- output_set_value("led1", 1);
- output_set_value("led2", 1);
- output_set_value("led3", 1);
- output_set_value("led4", 1);
- output_set_value("led5", 1);
- output_set_value("led6", 1);
- output_set_value("led7", 1);
+ machine().output().set_value("led1", 1);
+ machine().output().set_value("led2", 1);
+ machine().output().set_value("led3", 1);
+ machine().output().set_value("led4", 1);
+ machine().output().set_value("led5", 1);
+ machine().output().set_value("led6", 1);
+ machine().output().set_value("led7", 1);
// GREEN KEYBOARD LEDs (1 = on, 0 = off):
- output_set_value("led_wait", 0); // led8
- output_set_value("led_compose", 0); // led9
- output_set_value("led_lock", 0); // led10
- output_set_value("led_hold", 0); // led11
+ machine().output().set_value("led_wait", 0); // led8
+ machine().output().set_value("led_compose", 0); // led9
+ machine().output().set_value("led_lock", 0); // led10
+ machine().output().set_value("led_hold", 0); // led11
m_irq_mask = 0;
}
@@ -1220,7 +1220,7 @@ WRITE_LINE_MEMBER(rainbow_state::hdc_read_sector)
read_status = 2;
logerror("\nTRYING TO READ");
- output_set_value("led1", 0);
+ machine().output().set_value("led1", 0);
int hi = (m_hdc->read(space(AS_PROGRAM), 0x05)) & 0x07;
UINT16 cylinder = (m_hdc->read(space(AS_PROGRAM), 0x04)) | (hi << 8);
@@ -1237,7 +1237,7 @@ WRITE_LINE_MEMBER(rainbow_state::hdc_read_sector)
if ( (info = hard_disk_get_info(local_hard_disk)) )
{
read_status = 4;
- output_set_value("led1", 1);
+ machine().output().set_value("led1", 1);
// Pointer to info + C + H + S
UINT32 lbasector = get_and_print_lbasector(this, info, cylinder, SDH & 0x07, sector_number);
@@ -1293,7 +1293,7 @@ WRITE_LINE_MEMBER(rainbow_state::hdc_write_sector)
&& (drv == 0)
)
{
- output_set_value("led1", 0); // (1 = OFF ) =HARD DISK ACTIVITY =
+ machine().output().set_value("led1", 0); // (1 = OFF ) =HARD DISK ACTIVITY =
MOTOR_DISABLE_counter = 20;
if (rainbow_hdc_file(0) != nullptr)
@@ -1330,7 +1330,7 @@ WRITE_LINE_MEMBER(rainbow_state::hdc_write_sector)
int rainbow_state::do_write_sector()
{
int feedback = 0; // no error
- output_set_value("led1", 0); // ON
+ machine().output().set_value("led1", 0); // ON
hard_disk_file *local_hard_disk;
local_hard_disk = rainbow_hdc_file(0); // one hard disk for now.
@@ -1342,7 +1342,7 @@ int rainbow_state::do_write_sector()
{
feedback = 10;
logerror("\n* TRYING TO WRITE * ");
- output_set_value("led1", 1); // OFF
+ machine().output().set_value("led1", 1); // OFF
UINT8 SDH = (m_hdc->read(space(AS_PROGRAM), 0x06));
@@ -1498,7 +1498,7 @@ WRITE8_MEMBER(rainbow_state::hd_status_68_w)
{
logerror(">> HARD DISC * SET BUFFER READY * <<\n");
- output_set_value("led1", 0); // 1 = OFF (One of the CPU LEDs as DRIVE LED) = HARD DISK ACTIVITY =
+ machine().output().set_value("led1", 0); // 1 = OFF (One of the CPU LEDs as DRIVE LED) = HARD DISK ACTIVITY =
MOTOR_DISABLE_counter = 20;
m_hdc->buffer_ready(true);
@@ -1579,7 +1579,7 @@ WRITE_LINE_MEMBER(rainbow_state::hdc_step)
{
m_hdc_step_latch = true;
- output_set_value("led1", 0); // 1 = OFF (One of the CPU LEDs as DRIVE LED) = HARD DISK ACTIVITY =
+ machine().output().set_value("led1", 0); // 1 = OFF (One of the CPU LEDs as DRIVE LED) = HARD DISK ACTIVITY =
MOTOR_DISABLE_counter = 20;
}
@@ -1729,10 +1729,10 @@ WRITE8_MEMBER(rainbow_state::comm_control_w)
D6 -D5-D4-D3 <- INTERNAL LED NUMBER (DEC PDF)
-4--5--6--7- <- NUMBERS EMBOSSED ON BACK OF PLASTIC HOUSING (see error chart)
*/
- output_set_value("led4", BIT(data, 5)); // LED "D6"
- output_set_value("led5", BIT(data, 7)); // LED "D5"
- output_set_value("led6", BIT(data, 6)); // LED "D4"
- output_set_value("led7", BIT(data, 4)); // LED "D3"
+ machine().output().set_value("led4", BIT(data, 5)); // LED "D6"
+ machine().output().set_value("led5", BIT(data, 7)); // LED "D5"
+ machine().output().set_value("led6", BIT(data, 6)); // LED "D4"
+ machine().output().set_value("led7", BIT(data, 4)); // LED "D3"
// printf("%02x to COMM.CONTROL REGISTER\n", data);
}
@@ -1800,9 +1800,9 @@ WRITE8_MEMBER(rainbow_state::z80_diskdiag_write_w)
D11 D10 -D9 <- INTERNAL LED NUMBER (see PDF)
-1 --2-- 3 <- NUMBERS EMBOSSED ON BACK OF PLASTIC HOUSING (see error chart)
*/
- output_set_value("led1", BIT(data, 4)); // LED "D11"
- output_set_value("led2", BIT(data, 5)); // LED "D10"
- output_set_value("led3", BIT(data, 6)); // LED "D9"
+ machine().output().set_value("led1", BIT(data, 4)); // LED "D11"
+ machine().output().set_value("led2", BIT(data, 5)); // LED "D10"
+ machine().output().set_value("led3", BIT(data, 6)); // LED "D9"
m_zflip = false;
}
@@ -1927,8 +1927,8 @@ READ8_MEMBER(rainbow_state::z80_diskstatus_r)
// Print HEX track number
static UINT8 bcd2hex[] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7d, 0x07, 0x7f, 0x6f, 0x77, 0x7c, 0x39, 0x5e, 0x79, 0x71 };
// 0...9 ,A (0x77), b (0x7c), C (0x39) , d (0x5e), E (0x79), F (0x71)
- output_set_digit_value(0, bcd2hex[(track >> 4) & 0x0f]);
- output_set_digit_value(1, bcd2hex[(track - ((track >> 4) << 4)) & 0x0f]);
+ machine().output().set_digit_value(0, bcd2hex[(track >> 4) & 0x0f]);
+ machine().output().set_digit_value(1, bcd2hex[(track - ((track >> 4) << 4)) & 0x0f]);
}
// D2: TG43 L : 0 = INDICATES TRACK > 43 SIGNAL FROM FDC TO DISK DRIVE.
@@ -1991,11 +1991,11 @@ WRITE8_MEMBER(rainbow_state::z80_diskcontrol_w)
}
}
- output_set_value("driveled0", (selected_drive == 0) ? 1 : 0);
- output_set_value("driveled1", (selected_drive == 1) ? 1 : 0);
+ machine().output().set_value("driveled0", (selected_drive == 0) ? 1 : 0);
+ machine().output().set_value("driveled1", (selected_drive == 1) ? 1 : 0);
- output_set_value("driveled2", (selected_drive == 2) ? 1 : 0);
- output_set_value("driveled3", (selected_drive == 3) ? 1 : 0);
+ machine().output().set_value("driveled2", (selected_drive == 2) ? 1 : 0);
+ machine().output().set_value("driveled3", (selected_drive == 3) ? 1 : 0);
if (selected_drive < 4)
{
@@ -2224,12 +2224,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(rainbow_state::motor_tick)
if (MOTOR_DISABLE_counter < 2)
{
- output_set_value("driveled0", 0); // DRIVE 0 (A)
- output_set_value("driveled1", 0); // DRIVE 1 (B)
- output_set_value("driveled2", 0); // DRIVE 2 (C)
- output_set_value("driveled3", 0); // DRIVE 3 (D)
+ machine().output().set_value("driveled0", 0); // DRIVE 0 (A)
+ machine().output().set_value("driveled1", 0); // DRIVE 1 (B)
+ machine().output().set_value("driveled2", 0); // DRIVE 2 (C)
+ machine().output().set_value("driveled3", 0); // DRIVE 3 (D)
- output_set_value("led1", 1); // 1 = OFF (One of the CPU LEDs as DRIVE LED)
+ machine().output().set_value("led1", 1); // 1 = OFF (One of the CPU LEDs as DRIVE LED)
}
if (m_crtc->MHFU(1)) // MHFU * flag * enabled ?
diff --git a/src/mame/drivers/rallyx.cpp b/src/mame/drivers/rallyx.cpp
index 0590fc37082..7732efd7ca2 100644
--- a/src/mame/drivers/rallyx.cpp
+++ b/src/mame/drivers/rallyx.cpp
@@ -245,11 +245,11 @@ WRITE8_MEMBER(rallyx_state::rallyx_latch_w)
break;
case 0x04:
- set_led_status(machine(), 0, bit);
+ machine().output().set_led_value(0, bit);
break;
case 0x05:
- set_led_status(machine(), 1, bit);
+ machine().output().set_led_value(1, bit);
break;
case 0x06:
diff --git a/src/mame/drivers/ravens.cpp b/src/mame/drivers/ravens.cpp
index e122ab12f72..2e720ccd118 100644
--- a/src/mame/drivers/ravens.cpp
+++ b/src/mame/drivers/ravens.cpp
@@ -120,7 +120,7 @@ READ8_MEMBER( ravens_state::cass_r )
WRITE8_MEMBER( ravens_state::display_w )
{
- output_set_digit_value(offset, data);
+ machine().output().set_digit_value(offset, data);
}
WRITE8_MEMBER( ravens_state::leds_w )
@@ -129,7 +129,7 @@ WRITE8_MEMBER( ravens_state::leds_w )
for (int i = 0; i < 8; i++)
{
sprintf(ledname,"led%d",i);
- output_set_value(ledname, !BIT(data, i));
+ machine().output().set_value(ledname, !BIT(data, i));
}
}
@@ -194,7 +194,7 @@ WRITE8_MEMBER( ravens_state::port1c_w )
MACHINE_RESET_MEMBER( ravens_state, ravens2 )
{
m_term_data = 0x80;
- output_set_digit_value(6, 0);
+ machine().output().set_digit_value(6, 0);
}
diff --git a/src/mame/drivers/re900.cpp b/src/mame/drivers/re900.cpp
index d959a351444..6af04786a0f 100644
--- a/src/mame/drivers/re900.cpp
+++ b/src/mame/drivers/re900.cpp
@@ -127,12 +127,12 @@ READ8_MEMBER(re900_state::re_psg_portA_r)
{
if ((ioport("IN0")->read() & 0x01) == 0)
{
- output_set_lamp_value(0,1); // Operator Key ON
+ machine().output().set_lamp_value(0,1); // Operator Key ON
}
else
{
- output_set_lamp_value(0,0); // Operator Key OFF
+ machine().output().set_lamp_value(0,0); // Operator Key OFF
}
return ioport("IN0")->read();
@@ -144,18 +144,18 @@ READ8_MEMBER(re900_state::re_psg_portB_r)
logerror("llamada a re_psg_portB_r\n");
/* This is a hack to select the active player due to Keyboard size restrictions */
- output_set_lamp_value(m_player,1);
+ machine().output().set_lamp_value(m_player,1);
if (ioport("IN_S")->read())
{
if (!m_stat_a)
{
- output_set_lamp_value(1, 0);
- output_set_lamp_value(2, 0);
- output_set_lamp_value(3, 0);
- output_set_lamp_value(4, 0);
- output_set_lamp_value(5, 0);
- output_set_lamp_value(6, 0);
+ machine().output().set_lamp_value(1, 0);
+ machine().output().set_lamp_value(2, 0);
+ machine().output().set_lamp_value(3, 0);
+ machine().output().set_lamp_value(4, 0);
+ machine().output().set_lamp_value(5, 0);
+ machine().output().set_lamp_value(6, 0);
m_player++;
if (m_player == 7)
@@ -163,7 +163,7 @@ READ8_MEMBER(re900_state::re_psg_portB_r)
m_player = 1;
}
- output_set_lamp_value(m_player, 1); /* It shows active player via layout buttons */
+ machine().output().set_lamp_value(m_player, 1); /* It shows active player via layout buttons */
m_stat_a = 1;
}
}
@@ -212,11 +212,11 @@ WRITE8_MEMBER(re900_state::re_mux_port_B_w)
if (data == 0x7f)
{
- output_set_lamp_value(20 + led, 1);
+ machine().output().set_lamp_value(20 + led, 1);
if (led != m_ledant)
{
- output_set_lamp_value(20 + m_ledant, 0);
+ machine().output().set_lamp_value(20 + m_ledant, 0);
m_ledant = led;
}
}
@@ -224,8 +224,8 @@ WRITE8_MEMBER(re900_state::re_mux_port_B_w)
WRITE8_MEMBER(re900_state::cpu_port_0_w)
{
-// output_set_lamp_value(7,1 ^ ( (data >> 4) & 1)); /* Cont. Sal */
-// output_set_lamp_value(8,1 ^ ( (data >> 5) & 1)); /* Cont. Ent */
+// machine().output().set_lamp_value(7,1 ^ ( (data >> 4) & 1)); /* Cont. Sal */
+// machine().output().set_lamp_value(8,1 ^ ( (data >> 5) & 1)); /* Cont. Ent */
}
WRITE8_MEMBER(re900_state::watchdog_reset_w)
diff --git a/src/mame/drivers/roul.cpp b/src/mame/drivers/roul.cpp
index acd3a3df1da..436d496c486 100644
--- a/src/mame/drivers/roul.cpp
+++ b/src/mame/drivers/roul.cpp
@@ -188,8 +188,8 @@ WRITE8_MEMBER(roul_state::ball_w)
{
int lamp = data;
- output_set_lamp_value(data, 1);
- output_set_lamp_value(m_lamp_old, 0);
+ machine().output().set_lamp_value(data, 1);
+ machine().output().set_lamp_value(m_lamp_old, 0);
m_lamp_old = lamp;
}
diff --git a/src/mame/drivers/rowamet.cpp b/src/mame/drivers/rowamet.cpp
index 58f99179dff..152afeb049d 100644
--- a/src/mame/drivers/rowamet.cpp
+++ b/src/mame/drivers/rowamet.cpp
@@ -199,8 +199,8 @@ TIMER_DEVICE_CALLBACK_MEMBER( rowamet_state::timer_a )
m_out_offs &= 15;
UINT8 digit = m_out_offs << 1;
- output_set_digit_value(digit, patterns[m_p_ram[m_out_offs]>>4]);
- output_set_digit_value(++digit, patterns[m_p_ram[m_out_offs++]&15]);
+ machine().output().set_digit_value(digit, patterns[m_p_ram[m_out_offs]>>4]);
+ machine().output().set_digit_value(++digit, patterns[m_p_ram[m_out_offs++]&15]);
}
static MACHINE_CONFIG_START( rowamet, rowamet_state )
diff --git a/src/mame/drivers/runaway.cpp b/src/mame/drivers/runaway.cpp
index 82580583d83..c87f61139ae 100644
--- a/src/mame/drivers/runaway.cpp
+++ b/src/mame/drivers/runaway.cpp
@@ -70,7 +70,7 @@ READ8_MEMBER(runaway_state::runaway_pot_r)
WRITE8_MEMBER(runaway_state::runaway_led_w)
{
- set_led_status(machine(), offset, ~data & 1);
+ machine().output().set_led_value(offset, ~data & 1);
}
diff --git a/src/mame/drivers/s11.cpp b/src/mame/drivers/s11.cpp
index 536cb68b65b..26e4123ef26 100644
--- a/src/mame/drivers/s11.cpp
+++ b/src/mame/drivers/s11.cpp
@@ -232,7 +232,7 @@ WRITE8_MEMBER( s11_state::dig0_w )
data &= 0x7f;
m_strobe = data & 15;
m_diag = (data & 0x70) >> 4;
- output_set_digit_value(60, patterns[data>>4]); // diag digit
+ machine().output().set_digit_value(60, patterns[data>>4]); // diag digit
m_segment1 = 0;
m_segment2 = 0;
}
@@ -243,7 +243,7 @@ WRITE8_MEMBER( s11_state::dig1_w )
m_segment2 |= 0x20000;
if ((m_segment2 & 0x70000) == 0x30000)
{
- output_set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
m_segment2 |= 0x40000;
}
}
@@ -267,7 +267,7 @@ WRITE8_MEMBER( s11_state::pia2c_pa_w )
m_segment1 |= 0x10000;
if ((m_segment1 & 0x70000) == 0x30000)
{
- output_set_digit_value(m_strobe, BITSWAP16(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(m_strobe, BITSWAP16(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
m_segment1 |= 0x40000;
}
}
@@ -278,7 +278,7 @@ WRITE8_MEMBER( s11_state::pia2c_pb_w )
m_segment1 |= 0x20000;
if ((m_segment1 & 0x70000) == 0x30000)
{
- output_set_digit_value(m_strobe, BITSWAP16(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(m_strobe, BITSWAP16(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
m_segment1 |= 0x40000;
}
}
@@ -301,7 +301,7 @@ WRITE8_MEMBER( s11_state::pia34_pa_w )
m_segment2 |= 0x10000;
if ((m_segment2 & 0x70000) == 0x30000)
{
- output_set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
m_segment2 |= 0x40000;
}
}
diff --git a/src/mame/drivers/s11a.cpp b/src/mame/drivers/s11a.cpp
index 3846e84e087..65f4d8e8d37 100644
--- a/src/mame/drivers/s11a.cpp
+++ b/src/mame/drivers/s11a.cpp
@@ -152,9 +152,9 @@ WRITE8_MEMBER( s11a_state::dig0_w )
data &= 0x7f;
set_strobe(data & 15);
set_diag((data & 0x70) >> 4);
- output_set_digit_value(60, 0); // +5VDC (always on)
- output_set_digit_value(61, get_diag() & 0x01); // connected to PA4
- output_set_digit_value(62, 0); // Blanking (pretty much always on)
+ machine().output().set_digit_value(60, 0); // +5VDC (always on)
+ machine().output().set_digit_value(61, get_diag() & 0x01); // connected to PA4
+ machine().output().set_digit_value(62, 0); // Blanking (pretty much always on)
set_segment1(0);
set_segment2(0);
}
diff --git a/src/mame/drivers/s11b.cpp b/src/mame/drivers/s11b.cpp
index d61ef8cd530..cc1910715ac 100644
--- a/src/mame/drivers/s11b.cpp
+++ b/src/mame/drivers/s11b.cpp
@@ -177,9 +177,9 @@ WRITE8_MEMBER( s11b_state::dig1_w )
if((seg & 0x70000) == 0x30000)
{
if(m_invert)
- output_set_digit_value(get_strobe()+16, BITSWAP16(~seg, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(get_strobe()+16, BITSWAP16(~seg, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
else
- output_set_digit_value(get_strobe()+16, BITSWAP16(seg, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(get_strobe()+16, BITSWAP16(seg, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
seg |= 0x40000;
}
set_segment2(seg);
@@ -193,9 +193,9 @@ WRITE8_MEMBER( s11b_state::pia2c_pa_w )
if((seg & 0x70000) == 0x30000)
{
if(m_invert)
- output_set_digit_value(get_strobe(), BITSWAP16(~seg, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(get_strobe(), BITSWAP16(~seg, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
else
- output_set_digit_value(get_strobe(), BITSWAP16(seg, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(get_strobe(), BITSWAP16(seg, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
seg |= 0x40000;
}
set_segment1(seg);
@@ -209,9 +209,9 @@ WRITE8_MEMBER( s11b_state::pia2c_pb_w )
if((seg & 0x70000) == 0x30000)
{
if(m_invert)
- output_set_digit_value(get_strobe(), BITSWAP16(~seg, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(get_strobe(), BITSWAP16(~seg, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
else
- output_set_digit_value(get_strobe(), BITSWAP16(seg, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(get_strobe(), BITSWAP16(seg, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
seg |= 0x40000;
}
set_segment1(seg);
@@ -225,9 +225,9 @@ WRITE8_MEMBER( s11b_state::pia34_pa_w )
if((seg & 0x70000) == 0x30000)
{
if(m_invert)
- output_set_digit_value(get_strobe()+16, BITSWAP16(~seg, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(get_strobe()+16, BITSWAP16(~seg, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
else
- output_set_digit_value(get_strobe()+16, BITSWAP16(seg, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+ machine().output().set_digit_value(get_strobe()+16, BITSWAP16(seg, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
seg |= 0x40000;
}
set_segment2(seg);
diff --git a/src/mame/drivers/s3.cpp b/src/mame/drivers/s3.cpp
index 9f28c5a0d08..19746100ead 100644
--- a/src/mame/drivers/s3.cpp
+++ b/src/mame/drivers/s3.cpp
@@ -381,8 +381,8 @@ WRITE8_MEMBER( s3_state::dig0_w )
{
m_strobe = data & 15;
m_data_ok = true;
- output_set_value("led0", !BIT(data, 4));
- output_set_value("led1", !BIT(data, 5));
+ machine().output().set_value("led0", !BIT(data, 4));
+ machine().output().set_value("led1", !BIT(data, 5));
}
WRITE8_MEMBER( s3_state::dig1_w )
@@ -390,8 +390,8 @@ WRITE8_MEMBER( s3_state::dig1_w )
static const UINT8 patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0, 0, 0, 0, 0, 0 }; // MC14558
if (m_data_ok)
{
- output_set_digit_value(m_strobe+16, patterns[data&15]);
- output_set_digit_value(m_strobe, patterns[data>>4]);
+ machine().output().set_digit_value(m_strobe+16, patterns[data&15]);
+ machine().output().set_digit_value(m_strobe, patterns[data>>4]);
}
m_data_ok = false;
}
diff --git a/src/mame/drivers/s4.cpp b/src/mame/drivers/s4.cpp
index 4cb5a9a156a..5cec6190787 100644
--- a/src/mame/drivers/s4.cpp
+++ b/src/mame/drivers/s4.cpp
@@ -374,8 +374,8 @@ WRITE8_MEMBER( s4_state::dig0_w )
{
m_strobe = data & 15;
m_data_ok = true;
- output_set_value("led0", !BIT(data, 4));
- output_set_value("led1", !BIT(data, 5));
+ machine().output().set_value("led0", !BIT(data, 4));
+ machine().output().set_value("led1", !BIT(data, 5));
}
WRITE8_MEMBER( s4_state::dig1_w )
@@ -383,8 +383,8 @@ WRITE8_MEMBER( s4_state::dig1_w )
static const UINT8 patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0, 0, 0, 0, 0, 0 }; // MC14558
if (m_data_ok)
{
- output_set_digit_value(m_strobe+16, patterns[data&15]);
- output_set_digit_value(m_strobe, patterns[data>>4]);
+ machine().output().set_digit_value(m_strobe+16, patterns[data&15]);
+ machine().output().set_digit_value(m_strobe, patterns[data>>4]);
}
m_data_ok = false;
}
diff --git a/src/mame/drivers/s6.cpp b/src/mame/drivers/s6.cpp
index b8721517bb1..182b9448177 100644
--- a/src/mame/drivers/s6.cpp
+++ b/src/mame/drivers/s6.cpp
@@ -314,8 +314,8 @@ WRITE8_MEMBER( s6_state::dig0_w )
{
m_strobe = data & 15;
m_data_ok = true;
- output_set_value("led0", !BIT(data, 4));
- output_set_value("led1", !BIT(data, 5));
+ machine().output().set_value("led0", !BIT(data, 4));
+ machine().output().set_value("led1", !BIT(data, 5));
}
WRITE8_MEMBER( s6_state::dig1_w )
@@ -323,8 +323,8 @@ WRITE8_MEMBER( s6_state::dig1_w )
static const UINT8 patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0, 0, 0, 0, 0, 0 }; // MC14558
if (m_data_ok)
{
- output_set_digit_value(m_strobe+20, patterns[data&15]);
- output_set_digit_value(m_strobe, patterns[data>>4]);
+ machine().output().set_digit_value(m_strobe+20, patterns[data&15]);
+ machine().output().set_digit_value(m_strobe, patterns[data>>4]);
}
m_data_ok = false;
}
diff --git a/src/mame/drivers/s6a.cpp b/src/mame/drivers/s6a.cpp
index da580dafb21..14d17a04af3 100644
--- a/src/mame/drivers/s6a.cpp
+++ b/src/mame/drivers/s6a.cpp
@@ -297,8 +297,8 @@ WRITE8_MEMBER( s6a_state::dig0_w )
{
m_strobe = data & 15;
m_data_ok = true;
- output_set_value("led0", !BIT(data, 4));
- output_set_value("led1", !BIT(data, 5));
+ machine().output().set_value("led0", !BIT(data, 4));
+ machine().output().set_value("led1", !BIT(data, 5));
}
WRITE8_MEMBER( s6a_state::dig1_w )
@@ -306,8 +306,8 @@ WRITE8_MEMBER( s6a_state::dig1_w )
static const UINT8 patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0, 0, 0, 0, 0, 0 }; // MC14558
if (m_data_ok)
{
- output_set_digit_value(m_strobe+16, patterns[data&15]);
- output_set_digit_value(m_strobe, patterns[data>>4]);
+ machine().output().set_digit_value(m_strobe+16, patterns[data&15]);
+ machine().output().set_digit_value(m_strobe, patterns[data>>4]);
}
m_data_ok = false;
}
diff --git a/src/mame/drivers/s7.cpp b/src/mame/drivers/s7.cpp
index 8b29223f824..f2f772e3f52 100644
--- a/src/mame/drivers/s7.cpp
+++ b/src/mame/drivers/s7.cpp
@@ -302,7 +302,7 @@ WRITE8_MEMBER( s7_state::dig0_w )
m_strobe = data & 15;
data ^= 0xf0; // inverted by ic33
m_data_ok = true;
- output_set_digit_value(60, patterns[data>>4]); // diag digit
+ machine().output().set_digit_value(60, patterns[data>>4]); // diag digit
}
WRITE8_MEMBER( s7_state::dig1_w )
@@ -310,8 +310,8 @@ WRITE8_MEMBER( s7_state::dig1_w )
static const UINT8 patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0, 0, 0, 0, 0, 0 }; // MC14558
if (m_data_ok)
{
- output_set_digit_value(m_strobe+16, patterns[data&15]);
- output_set_digit_value(m_strobe, patterns[data>>4]);
+ machine().output().set_digit_value(m_strobe+16, patterns[data&15]);
+ machine().output().set_digit_value(m_strobe, patterns[data>>4]);
}
m_data_ok = false;
}
diff --git a/src/mame/drivers/s8.cpp b/src/mame/drivers/s8.cpp
index ee832eb5c14..020cee4301a 100644
--- a/src/mame/drivers/s8.cpp
+++ b/src/mame/drivers/s8.cpp
@@ -223,7 +223,7 @@ WRITE8_MEMBER( s8_state::dig0_w )
data &= 0x7f;
m_strobe = data & 15;
m_data_ok = true;
- output_set_digit_value(60, patterns[data>>4]); // diag digit
+ machine().output().set_digit_value(60, patterns[data>>4]); // diag digit
}
WRITE8_MEMBER( s8_state::dig1_w )
@@ -231,8 +231,8 @@ WRITE8_MEMBER( s8_state::dig1_w )
static const UINT8 patterns[16] = { 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7d,0x07,0x7f,0x6f,0,0,0,0,0,0 }; // MC14543
if (m_data_ok)
{
- output_set_digit_value(m_strobe+16, patterns[data&15]);
- output_set_digit_value(m_strobe, patterns[data>>4]);
+ machine().output().set_digit_value(m_strobe+16, patterns[data&15]);
+ machine().output().set_digit_value(m_strobe, patterns[data>>4]);
}
m_data_ok = false;
}
diff --git a/src/mame/drivers/s8a.cpp b/src/mame/drivers/s8a.cpp
index 199dc57a9e9..7613b9a5377 100644
--- a/src/mame/drivers/s8a.cpp
+++ b/src/mame/drivers/s8a.cpp
@@ -195,7 +195,7 @@ WRITE8_MEMBER( s8a_state::dig0_w )
data &= 0x7f;
m_strobe = data & 15;
m_data_ok = true;
- output_set_digit_value(60, patterns[data>>4]); // diag digit
+ machine().output().set_digit_value(60, patterns[data>>4]); // diag digit
}
WRITE8_MEMBER( s8a_state::dig1_w )
@@ -203,8 +203,8 @@ WRITE8_MEMBER( s8a_state::dig1_w )
static const UINT8 patterns[16] = { 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7d,0x07,0x7f,0x6f,0,0,0,0,0,0 }; // MC14543
if (m_data_ok)
{
- output_set_digit_value(m_strobe+16, patterns[data&15]);
- output_set_digit_value(m_strobe, patterns[data>>4]);
+ machine().output().set_digit_value(m_strobe+16, patterns[data&15]);
+ machine().output().set_digit_value(m_strobe, patterns[data>>4]);
}
m_data_ok = false;
}
diff --git a/src/mame/drivers/s9.cpp b/src/mame/drivers/s9.cpp
index 87984f1a16f..596542f8812 100644
--- a/src/mame/drivers/s9.cpp
+++ b/src/mame/drivers/s9.cpp
@@ -231,7 +231,7 @@ WRITE8_MEMBER( s9_state::dig0_w )
data &= 0x7f;
m_strobe = data & 15;
m_data_ok = true;
- output_set_digit_value(60, patterns[data>>4]); // diag digit
+ machine().output().set_digit_value(60, patterns[data>>4]); // diag digit
}
WRITE8_MEMBER( s9_state::dig1_w )
@@ -239,8 +239,8 @@ WRITE8_MEMBER( s9_state::dig1_w )
static const UINT8 patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0, 0, 0, 0, 0, 0 }; // MC14558
if (m_data_ok)
{
- output_set_digit_value(m_strobe+16, patterns[data&15]);
- output_set_digit_value(m_strobe, patterns[data>>4]);
+ machine().output().set_digit_value(m_strobe+16, patterns[data&15]);
+ machine().output().set_digit_value(m_strobe, patterns[data>>4]);
}
m_data_ok = false;
}
diff --git a/src/mame/drivers/sage2.cpp b/src/mame/drivers/sage2.cpp
index 6b39a24db2e..299dd88a5b0 100644
--- a/src/mame/drivers/sage2.cpp
+++ b/src/mame/drivers/sage2.cpp
@@ -344,7 +344,7 @@ WRITE8_MEMBER( sage2_state::ppi1_pc_w )
m_pic->ir7_w(BIT(data, 2));
// processor LED
- output_set_led_value(0, BIT(data, 3));
+ machine().output().set_led_value(0, BIT(data, 3));
// centronics
m_centronics->write_strobe(BIT(data, 4));
diff --git a/src/mame/drivers/sanremo.cpp b/src/mame/drivers/sanremo.cpp
index 033014708a7..04f67046464 100644
--- a/src/mame/drivers/sanremo.cpp
+++ b/src/mame/drivers/sanremo.cpp
@@ -193,13 +193,13 @@ WRITE8_MEMBER(sanremo_state::lamps_w)
-x-- ---- BET
x--- ---- (always on)
*/
- output_set_lamp_value(0, (data >> 0) & 1); /* DISCARD 1 */
- output_set_lamp_value(1, (data >> 1) & 1); /* DISCARD 2 */
- output_set_lamp_value(2, (data >> 2) & 1); /* DISCARD 3 */
- output_set_lamp_value(3, (data >> 3) & 1); /* DISCARD 4 */
- output_set_lamp_value(4, (data >> 4) & 1); /* DISCARD 5 */
- output_set_lamp_value(5, (data >> 5) & 1); /* START */
- output_set_lamp_value(6, (data >> 6) & 1); /* BET */
+ machine().output().set_lamp_value(0, (data >> 0) & 1); /* DISCARD 1 */
+ machine().output().set_lamp_value(1, (data >> 1) & 1); /* DISCARD 2 */
+ machine().output().set_lamp_value(2, (data >> 2) & 1); /* DISCARD 3 */
+ machine().output().set_lamp_value(3, (data >> 3) & 1); /* DISCARD 4 */
+ machine().output().set_lamp_value(4, (data >> 4) & 1); /* DISCARD 5 */
+ machine().output().set_lamp_value(5, (data >> 5) & 1); /* START */
+ machine().output().set_lamp_value(6, (data >> 6) & 1); /* BET */
}
WRITE8_MEMBER(sanremo_state::banksel_w)
diff --git a/src/mame/drivers/savia84.cpp b/src/mame/drivers/savia84.cpp
index e334adee284..3c96582bcbc 100644
--- a/src/mame/drivers/savia84.cpp
+++ b/src/mame/drivers/savia84.cpp
@@ -131,7 +131,7 @@ void savia84_state::machine_reset()
WRITE8_MEMBER( savia84_state::savia84_8255_porta_w ) // OUT F8 - output segments on the selected digit
{
m_segment = ~data & 0x7f;
- if (m_digit && (m_digit != m_digit_last)) output_set_digit_value(m_digit, m_segment);
+ if (m_digit && (m_digit != m_digit_last)) machine().output().set_digit_value(m_digit, m_segment);
m_digit_last = m_digit;
}
@@ -141,7 +141,7 @@ WRITE8_MEMBER( savia84_state::savia84_8255_portb_w ) // OUT F9 - light the 8 led
for (int i = 0; i < 8; i++)
{
sprintf(ledname,"led%d",i);
- output_set_value(ledname, !BIT(data, i));
+ machine().output().set_value(ledname, !BIT(data, i));
}
}
diff --git a/src/mame/drivers/sbrkout.cpp b/src/mame/drivers/sbrkout.cpp
index 35916102b81..eeeb6195f11 100644
--- a/src/mame/drivers/sbrkout.cpp
+++ b/src/mame/drivers/sbrkout.cpp
@@ -282,24 +282,24 @@ WRITE8_MEMBER(sbrkout_state::pot_mask2_w)
WRITE8_MEMBER(sbrkout_state::start_1_led_w)
{
- output_set_led_value(0, offset & 1);
+ machine().output().set_led_value(0, offset & 1);
}
WRITE8_MEMBER(sbrkout_state::start_2_led_w)
{
- output_set_led_value(1, offset & 1);
+ machine().output().set_led_value(1, offset & 1);
}
WRITE8_MEMBER(sbrkout_state::serve_led_w)
{
- output_set_led_value(0, ~offset & 1);
+ machine().output().set_led_value(0, ~offset & 1);
}
WRITE8_MEMBER(sbrkout_state::serve_2_led_w)
{
- output_set_led_value(1, ~offset & 1);
+ machine().output().set_led_value(1, ~offset & 1);
}
WRITE8_MEMBER(sbrkout_state::coincount_w)
diff --git a/src/mame/drivers/sc1.cpp b/src/mame/drivers/sc1.cpp
index 18a8d05dda4..13077c73158 100644
--- a/src/mame/drivers/sc1.cpp
+++ b/src/mame/drivers/sc1.cpp
@@ -73,13 +73,13 @@ WRITE8_MEMBER( sc1_state::pio_port_a_w )
UINT8 digit = BITSWAP8( data,3,4,6,0,1,2,7,5 );
if (m_matrix & 0x04)
- output_set_digit_value(3, digit & 0x7f);
+ machine().output().set_digit_value(3, digit & 0x7f);
if (m_matrix & 0x08)
- output_set_digit_value(2, digit & 0x7f);
+ machine().output().set_digit_value(2, digit & 0x7f);
if (m_matrix & 0x10)
- output_set_digit_value(1, digit & 0x7f);
+ machine().output().set_digit_value(1, digit & 0x7f);
if (m_matrix & 0x20)
- output_set_digit_value(0, digit & 0x7f);
+ machine().output().set_digit_value(0, digit & 0x7f);
}
diff --git a/src/mame/drivers/sc2.cpp b/src/mame/drivers/sc2.cpp
index 8c938d173ba..f94a6b80354 100644
--- a/src/mame/drivers/sc2.cpp
+++ b/src/mame/drivers/sc2.cpp
@@ -120,29 +120,29 @@ void sc2_state::sc2_update_display()
if (!BIT(m_led_selected, 0))
{
- output_set_digit_value(0, digit_data);
+ machine().output().set_digit_value(0, digit_data);
m_led_7seg_data[0] = digit_data;
- output_set_led_value(0, BIT(m_digit_data, 7));
+ machine().output().set_led_value(0, BIT(m_digit_data, 7));
}
if (!BIT(m_led_selected, 1))
{
- output_set_digit_value(1, digit_data);
+ machine().output().set_digit_value(1, digit_data);
m_led_7seg_data[1] = digit_data;
- output_set_led_value(1, BIT(m_digit_data, 7));
+ machine().output().set_led_value(1, BIT(m_digit_data, 7));
}
if (!BIT(m_led_selected, 2))
{
- output_set_digit_value(2, digit_data);
+ machine().output().set_digit_value(2, digit_data);
m_led_7seg_data[2] = digit_data;
}
if (!BIT(m_led_selected, 3))
{
- output_set_digit_value(3, digit_data);
+ machine().output().set_digit_value(3, digit_data);
m_led_7seg_data[3] = digit_data;
}
}
diff --git a/src/mame/drivers/sderby.cpp b/src/mame/drivers/sderby.cpp
index d856b5f5154..9b913ed020b 100644
--- a/src/mame/drivers/sderby.cpp
+++ b/src/mame/drivers/sderby.cpp
@@ -202,9 +202,9 @@ WRITE16_MEMBER(sderby_state::sderby_out_w)
x--- ---- End of Race lamp.
*/
- output_set_lamp_value(1, (data & 1)); /* Lamp 1 - START */
- output_set_lamp_value(2, (data >> 1) & 1); /* Lamp 2 - BET */
- output_set_lamp_value(3, (data >> 15) & 1); /* Lamp 3 - END OF RACE */
+ machine().output().set_lamp_value(1, (data & 1)); /* Lamp 1 - START */
+ machine().output().set_lamp_value(2, (data >> 1) & 1); /* Lamp 2 - BET */
+ machine().output().set_lamp_value(3, (data >> 15) & 1); /* Lamp 3 - END OF RACE */
machine().bookkeeping().coin_counter_w(0, data & 0x2000);
}
@@ -247,13 +247,13 @@ WRITE16_MEMBER(sderby_state::scmatto_out_w)
--x- ---- Coin counter.
*/
- output_set_lamp_value(1, (data & 1)); /* Lamp 1 - HOLD 1 */
- output_set_lamp_value(2, (data >> 1) & 1); /* Lamp 2 - HOLD 2 */
- output_set_lamp_value(3, (data >> 2) & 1); /* Lamp 3 - HOLD 3 */
- output_set_lamp_value(4, (data >> 3) & 1); /* Lamp 4 - HOLD 4 */
- output_set_lamp_value(5, (data >> 4) & 1); /* Lamp 5 - HOLD 5 */
- output_set_lamp_value(6, (data >> 5) & 1); /* Lamp 6 - START */
- output_set_lamp_value(7, (data >> 6) & 1); /* Lamp 7 - BET */
+ machine().output().set_lamp_value(1, (data & 1)); /* Lamp 1 - HOLD 1 */
+ machine().output().set_lamp_value(2, (data >> 1) & 1); /* Lamp 2 - HOLD 2 */
+ machine().output().set_lamp_value(3, (data >> 2) & 1); /* Lamp 3 - HOLD 3 */
+ machine().output().set_lamp_value(4, (data >> 3) & 1); /* Lamp 4 - HOLD 4 */
+ machine().output().set_lamp_value(5, (data >> 4) & 1); /* Lamp 5 - HOLD 5 */
+ machine().output().set_lamp_value(6, (data >> 5) & 1); /* Lamp 6 - START */
+ machine().output().set_lamp_value(7, (data >> 6) & 1); /* Lamp 7 - BET */
machine().bookkeeping().coin_counter_w(0, data & 0x2000);
}
@@ -283,8 +283,8 @@ WRITE16_MEMBER(sderby_state::roulette_out_w)
---- x--- Unknown (always activated).
*/
- output_set_lamp_value(1, (data & 1)); /* Lamp 1 - START */
- output_set_lamp_value(2, (data >> 1) & 1); /* Lamp 2 - BET */
+ machine().output().set_lamp_value(1, (data & 1)); /* Lamp 1 - START */
+ machine().output().set_lamp_value(2, (data >> 1) & 1); /* Lamp 2 - BET */
}
diff --git a/src/mame/drivers/sdk85.cpp b/src/mame/drivers/sdk85.cpp
index 8438add6efe..72bfc866dcb 100644
--- a/src/mame/drivers/sdk85.cpp
+++ b/src/mame/drivers/sdk85.cpp
@@ -98,7 +98,7 @@ WRITE8_MEMBER( sdk85_state::scanlines_w )
WRITE8_MEMBER( sdk85_state::digit_w )
{
if (m_digit < 6)
- output_set_digit_value(m_digit, BITSWAP8(data, 3, 2, 1, 0, 7, 6, 5, 4)^0xff);
+ machine().output().set_digit_value(m_digit, BITSWAP8(data, 3, 2, 1, 0, 7, 6, 5, 4)^0xff);
}
READ8_MEMBER( sdk85_state::kbd_r )
diff --git a/src/mame/drivers/sdk86.cpp b/src/mame/drivers/sdk86.cpp
index c895211950a..7bd16b452a8 100644
--- a/src/mame/drivers/sdk86.cpp
+++ b/src/mame/drivers/sdk86.cpp
@@ -115,7 +115,7 @@ WRITE8_MEMBER( sdk86_state::scanlines_w )
WRITE8_MEMBER( sdk86_state::digit_w )
{
if (m_digit < 8)
- output_set_digit_value(m_digit, data);
+ machine().output().set_digit_value(m_digit, data);
}
READ8_MEMBER( sdk86_state::kbd_r )
diff --git a/src/mame/drivers/seabattl.cpp b/src/mame/drivers/seabattl.cpp
index b0a64aee03d..89083c78118 100644
--- a/src/mame/drivers/seabattl.cpp
+++ b/src/mame/drivers/seabattl.cpp
@@ -285,7 +285,7 @@ WRITE8_MEMBER(seabattl_state::seabattl_control_w)
// bit 4: lamp
// bit 5: enable wave
machine().bookkeeping().coin_counter_w(0, BIT(data, 2));
- output_set_lamp_value(0, BIT(data,4));
+ machine().output().set_lamp_value(0, BIT(data,4));
m_waveenable = BIT(data, 5);
}
diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp
index b5eaf6af88e..4539e7b8020 100644
--- a/src/mame/drivers/segahang.cpp
+++ b/src/mame/drivers/segahang.cpp
@@ -69,8 +69,8 @@ WRITE8_MEMBER( segahang_state::video_lamps_w )
m_segaic16vid->set_display_enable(data & 0x10);
// bits 2 & 3: control the lamps
- set_led_status(machine(), 1, data & 0x08);
- set_led_status(machine(), 0, data & 0x04);
+ machine().output().set_led_value(1, data & 0x08);
+ machine().output().set_led_value(0, data & 0x04);
// bits 0 & 1: update coin counters
machine().bookkeeping().coin_counter_w(1, data & 0x02);
diff --git a/src/mame/drivers/segajw.cpp b/src/mame/drivers/segajw.cpp
index f5d2cda8035..1d735cd8c4a 100644
--- a/src/mame/drivers/segajw.cpp
+++ b/src/mame/drivers/segajw.cpp
@@ -110,7 +110,7 @@ READ8_MEMBER(segajw_state::lamps_r)
WRITE8_MEMBER(segajw_state::lamps_w)
{
for(int i=0; i<8; i++)
- output_set_lamp_value((offset * 8) + i, BIT(data, i));
+ machine().output().set_lamp_value((offset * 8) + i, BIT(data, i));
m_lamps[offset] = data;
}
@@ -126,7 +126,7 @@ WRITE16_MEMBER(segajw_state::coinlockout_w)
m_coin_lockout = data;
for(int i=0; i<3; i++)
- output_set_indexed_value("towerlamp", i, BIT(data, 3 + i));
+ machine().output().set_indexed_value("towerlamp", i, BIT(data, 3 + i));
}
WRITE8_MEMBER(segajw_state::audiocpu_cmd_w)
diff --git a/src/mame/drivers/segaorun.cpp b/src/mame/drivers/segaorun.cpp
index 1b443a03487..6e03026aafa 100644
--- a/src/mame/drivers/segaorun.cpp
+++ b/src/mame/drivers/segaorun.cpp
@@ -407,20 +407,20 @@ WRITE8_MEMBER( segaorun_state::bankmotor_control_w )
if (data < 8)
{
// left
- output_set_value("Bank_Motor_Direction", 1);
- output_set_value("Bank_Motor_Speed", 8 - data);
+ machine().output().set_value("Bank_Motor_Direction", 1);
+ machine().output().set_value("Bank_Motor_Speed", 8 - data);
}
else if (data == 8)
{
// no movement
- output_set_value("Bank_Motor_Direction", 0);
- output_set_value("Bank_Motor_Speed", 0);
+ machine().output().set_value("Bank_Motor_Direction", 0);
+ machine().output().set_value("Bank_Motor_Speed", 0);
}
else
{
// right
- output_set_value("Bank_Motor_Direction", 2);
- output_set_value("Bank_Motor_Speed", data - 8);
+ machine().output().set_value("Bank_Motor_Direction", 2);
+ machine().output().set_value("Bank_Motor_Speed", data - 8);
}
}
@@ -736,9 +736,9 @@ WRITE16_MEMBER( segaorun_state::outrun_custom_io_w )
// D1: Brake lamp
// other bits: ?
machine().sound().system_enable(data & 0x80);
- output_set_value("Vibration_motor", data >> 5 & 1);
- output_set_value("Start_lamp", data >> 2 & 1);
- output_set_value("Brake_lamp", data >> 1 & 1);
+ machine().output().set_value("Vibration_motor", data >> 5 & 1);
+ machine().output().set_value("Start_lamp", data >> 2 & 1);
+ machine().output().set_value("Brake_lamp", data >> 1 & 1);
}
return;
@@ -815,8 +815,8 @@ WRITE16_MEMBER( segaorun_state::shangon_custom_io_w )
// other bits: ?
m_adc_select = data >> 6 & 3;
m_segaic16vid->set_display_enable(data >> 5 & 1);
- output_set_value("Vibration_motor", data >> 3 & 1);
- output_set_value("Start_lamp", data >> 2 & 1);
+ machine().output().set_value("Vibration_motor", data >> 3 & 1);
+ machine().output().set_value("Start_lamp", data >> 2 & 1);
}
return;
diff --git a/src/mame/drivers/segas16a.cpp b/src/mame/drivers/segas16a.cpp
index fcf5d2c842e..8cc895e65bb 100644
--- a/src/mame/drivers/segas16a.cpp
+++ b/src/mame/drivers/segas16a.cpp
@@ -181,8 +181,8 @@ WRITE8_MEMBER( segas16a_state::misc_control_w )
// bits 2 & 3: control the lamps, allowing for overrides
if (((m_video_control ^ data) & 0x0c) && !m_lamp_changed_w.isnull())
m_lamp_changed_w(m_video_control ^ data, data);
- set_led_status(machine(), 1, data & 0x08);
- set_led_status(machine(), 0, data & 0x04);
+ machine().output().set_led_value(1, data & 0x08);
+ machine().output().set_led_value(0, data & 0x04);
m_video_control = data;
diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp
index a51c9b4105f..8f89b8213d0 100644
--- a/src/mame/drivers/segas16b.cpp
+++ b/src/mame/drivers/segas16b.cpp
@@ -1130,8 +1130,8 @@ WRITE16_MEMBER( segas16b_state::standard_io_w )
m_sprites->set_flip(data & 0x40);
if (!m_disable_screen_blanking)
m_segaic16vid->set_display_enable(data & 0x20);
- set_led_status(machine(), 1, data & 0x08);
- set_led_status(machine(), 0, data & 0x04);
+ machine().output().set_led_value(1, data & 0x08);
+ machine().output().set_led_value(0, data & 0x04);
machine().bookkeeping().coin_counter_w(1, data & 0x02);
machine().bookkeeping().coin_counter_w(0, data & 0x01);
return;
@@ -1600,9 +1600,9 @@ WRITE16_MEMBER( segas16b_state::hwchamp_custom_io_w )
// bit 4 is GONG
// if (data & 0x10) popmessage("GONG");
// are the following really lamps?
- // set_led_status(space.machine(), 1,data & 0x20);
- // set_led_status(space.machine(), 2,data & 0x40);
- // set_led_status(space.machine(), 3,data & 0x80);
+ // space.machine().output().set_led_value(1,data & 0x20);
+ // space.machine().output().set_led_value(2,data & 0x40);
+ // space.machine().output().set_led_value(3,data & 0x80);
break;
}
break;
diff --git a/src/mame/drivers/segas18.cpp b/src/mame/drivers/segas18.cpp
index 3263dd3123e..e501db1ee63 100644
--- a/src/mame/drivers/segas18.cpp
+++ b/src/mame/drivers/segas18.cpp
@@ -418,9 +418,9 @@ WRITE16_MEMBER( segas18_state::lghost_custom_io_w )
WRITE8_MEMBER( segas18_state::lghost_gun_recoil_w )
{
- output_set_value("P1_Gun_Recoil", (~data & 0x01));
- output_set_value("P2_Gun_Recoil", (~data & 0x02)>>1);
- output_set_value("P3_Gun_Recoil", (~data & 0x04)>>2);
+ machine().output().set_value("P1_Gun_Recoil", (~data & 0x01));
+ machine().output().set_value("P2_Gun_Recoil", (~data & 0x02)>>1);
+ machine().output().set_value("P3_Gun_Recoil", (~data & 0x04)>>2);
}
diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp
index 62cac59f7a2..db1fb7a3d24 100644
--- a/src/mame/drivers/segas32.cpp
+++ b/src/mame/drivers/segas32.cpp
@@ -4945,15 +4945,15 @@ void segas32_state::segas32_common_init(read16_delegate custom_r, write16_delega
void segas32_state::radm_sw1_output( int which, UINT16 data )
{
if (which == 0)
- output_set_value("Start_lamp", BIT(data, 2));
+ machine().output().set_value("Start_lamp", BIT(data, 2));
}
void segas32_state::radm_sw2_output( int which, UINT16 data )
{
if (which == 0)
{
- output_set_value("Wiper_lamp", BIT(data, 0));
- output_set_value("Lights_lamp", BIT(data, 1));
+ machine().output().set_value("Wiper_lamp", BIT(data, 0));
+ machine().output().set_value("Lights_lamp", BIT(data, 1));
}
}
@@ -4961,8 +4961,8 @@ void segas32_state::radr_sw2_output( int which, UINT16 data )
{
if (which == 0)
{
- output_set_value("Entry_lamp", BIT(data, 0));
- output_set_value("Winner_lamp", BIT(data, 1));
+ machine().output().set_value("Entry_lamp", BIT(data, 0));
+ machine().output().set_value("Winner_lamp", BIT(data, 1));
}
}
@@ -4970,8 +4970,8 @@ void segas32_state::alien3_sw1_output( int which, UINT16 data )
{
if (which == 0)
{
- output_set_value("Player1_Gun_Recoil", BIT(data, 2));
- output_set_value("Player2_Gun_Recoil", BIT(data, 3));
+ machine().output().set_value("Player1_Gun_Recoil", BIT(data, 2));
+ machine().output().set_value("Player2_Gun_Recoil", BIT(data, 3));
}
}
@@ -4979,8 +4979,8 @@ void segas32_state::arescue_sw1_output( int which, UINT16 data )
{
if (which == 0)
{
- output_set_value("Start_lamp", BIT(data, 2));
- output_set_value("Back_lamp", BIT(data, 4));
+ machine().output().set_value("Start_lamp", BIT(data, 2));
+ machine().output().set_value("Back_lamp", BIT(data, 4));
}
}
@@ -4988,8 +4988,8 @@ void segas32_state::f1lap_sw1_output( int which, UINT16 data )
{
if (which == 0)
{
- output_set_value("lamp0", BIT(data, 2));
- output_set_value("lamp1", BIT(data, 3));
+ machine().output().set_value("lamp0", BIT(data, 2));
+ machine().output().set_value("lamp1", BIT(data, 3));
}
}
@@ -4997,8 +4997,8 @@ void segas32_state::jpark_sw1_output( int which, UINT16 data )
{
if (which == 0)
{
- output_set_value("Left_lamp", BIT(data, 2));
- output_set_value("Right_lamp", BIT(data, 3));
+ machine().output().set_value("Left_lamp", BIT(data, 2));
+ machine().output().set_value("Right_lamp", BIT(data, 3));
}
}
@@ -5007,15 +5007,15 @@ void segas32_state::orunners_sw1_output( int which, UINT16 data )
/* note ma = monitor A and mb = Monitor B */
if (which == 0)
{
- output_set_value("MA_Check_Point_lamp", BIT(data, 1));
- output_set_value("MA_Race_Leader_lamp", BIT(data, 3));
- output_set_value("MA_Steering_Wheel_motor", BIT(data, 4));
+ machine().output().set_value("MA_Check_Point_lamp", BIT(data, 1));
+ machine().output().set_value("MA_Race_Leader_lamp", BIT(data, 3));
+ machine().output().set_value("MA_Steering_Wheel_motor", BIT(data, 4));
}
else
{
- output_set_value("MB_Check_Point_lamp", BIT(data, 1));
- output_set_value("MB_Race_Leader_lamp", BIT(data, 3));
- output_set_value("MB_Steering_Wheel_motor", BIT(data, 4));
+ machine().output().set_value("MB_Check_Point_lamp", BIT(data, 1));
+ machine().output().set_value("MB_Race_Leader_lamp", BIT(data, 3));
+ machine().output().set_value("MB_Steering_Wheel_motor", BIT(data, 4));
}
}
@@ -5026,13 +5026,13 @@ void segas32_state::orunners_sw2_output( int which, UINT16 data )
/* the bijokkoy driver might be used as an example for handling these outputs */
if (which == 0)
{
- output_set_value("MA_DJ_Music_lamp", BIT(data, 0));
- output_set_value("MA_<<_>>_lamp", BIT(data, 1));
+ machine().output().set_value("MA_DJ_Music_lamp", BIT(data, 0));
+ machine().output().set_value("MA_<<_>>_lamp", BIT(data, 1));
}
else
{
- output_set_value("MB_DJ_Music_lamp", BIT(data, 0));
- output_set_value("MB_<<_>>_lamp", BIT(data, 1));
+ machine().output().set_value("MB_DJ_Music_lamp", BIT(data, 0));
+ machine().output().set_value("MB_<<_>>_lamp", BIT(data, 1));
}
}
@@ -5040,68 +5040,68 @@ void segas32_state::harddunk_sw1_output( int which, UINT16 data )
{
if (which == 0)
{
- output_set_value("1P_Start_lamp", BIT(data, 2));
- output_set_value("2P_Start_lamp", BIT(data, 3));
+ machine().output().set_value("1P_Start_lamp", BIT(data, 2));
+ machine().output().set_value("2P_Start_lamp", BIT(data, 3));
}
else
{
- output_set_value("4P_Start_lamp", BIT(data, 2));
- output_set_value("5P_Start_lamp", BIT(data, 3));
+ machine().output().set_value("4P_Start_lamp", BIT(data, 2));
+ machine().output().set_value("5P_Start_lamp", BIT(data, 3));
}
}
void segas32_state::harddunk_sw2_output( int which, UINT16 data )
{
if (which == 0)
- output_set_value("Left_Winner_lamp", BIT(data, 0));
+ machine().output().set_value("Left_Winner_lamp", BIT(data, 0));
else
- output_set_value("Right_Winner_lamp", BIT(data, 0));
+ machine().output().set_value("Right_Winner_lamp", BIT(data, 0));
}
void segas32_state::harddunk_sw3_output( int which, UINT16 data )
{
- output_set_value("3P_Start_lamp", BIT(data, 4));
- output_set_value("6P_Start_lamp", BIT(data, 5));
+ machine().output().set_value("3P_Start_lamp", BIT(data, 4));
+ machine().output().set_value("6P_Start_lamp", BIT(data, 5));
}
void segas32_state::titlef_sw1_output( int which, UINT16 data )
{
if (which == 0)
{
- output_set_value("Blue_Button_1P_lamp", BIT(data, 2));
- output_set_value("Blue_Button_2P_lamp", BIT(data, 3));
+ machine().output().set_value("Blue_Button_1P_lamp", BIT(data, 2));
+ machine().output().set_value("Blue_Button_2P_lamp", BIT(data, 3));
}
else
{
- output_set_value("Red_Button_1P_lamp", BIT(data, 2));
- output_set_value("Red_Button_2P_lamp", BIT(data, 3));
+ machine().output().set_value("Red_Button_1P_lamp", BIT(data, 2));
+ machine().output().set_value("Red_Button_2P_lamp", BIT(data, 3));
}
}
void segas32_state::titlef_sw2_output( int which, UINT16 data )
{
if (which == 0)
- output_set_value("Blue_Corner_lamp", BIT(data, 0));
+ machine().output().set_value("Blue_Corner_lamp", BIT(data, 0));
else
- output_set_value("Red_Corner_lamp", BIT(data, 0));
+ machine().output().set_value("Red_Corner_lamp", BIT(data, 0));
}
void segas32_state::scross_sw1_output( int which, UINT16 data )
{
/* note ma = monitor A and mb = Monitor B */
if (which == 0)
- output_set_value("MA_Start_lamp", BIT(data, 2));
+ machine().output().set_value("MA_Start_lamp", BIT(data, 2));
else
- output_set_value("MB_Start_lamp", BIT(data, 2));
+ machine().output().set_value("MB_Start_lamp", BIT(data, 2));
}
void segas32_state::scross_sw2_output( int which, UINT16 data )
{
/* Note: I'm not an expert on digits, so I didn't know the right map to use, I just added it manually and it seems to work fine. */
if (which == 0)
- output_set_value("MA_Digit", data);
+ machine().output().set_value("MA_Digit", data);
else
- output_set_value("MB_Digit", data);
+ machine().output().set_value("MB_Digit", data);
}
/*************************************
diff --git a/src/mame/drivers/segaufo.cpp b/src/mame/drivers/segaufo.cpp
index d7bc6f4dbe5..6420a63ab0e 100644
--- a/src/mame/drivers/segaufo.cpp
+++ b/src/mame/drivers/segaufo.cpp
@@ -162,7 +162,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(ufo_state::update_info)
// 3 C: 000 = closed, 100 = open
for (int p = 0; p < 2; p++)
for (int m = 0; m < 4; m++)
- output_set_indexed_value("counter", p*4 + m, (UINT8)(m_player[p].motor[m].position * 100));
+ machine().output().set_indexed_value("counter", p*4 + m, (UINT8)(m_player[p].motor[m].position * 100));
#if 0
char msg1[0x100] = {0};
@@ -274,7 +274,7 @@ WRITE8_MEMBER(ufo_state::cp_lamps_w)
// d0-d3: p1/p2 button lamps
// other bits: ?
for (int i = 0; i < 4; i++)
- output_set_lamp_value(i, ~data >> i & 1);
+ machine().output().set_lamp_value(i, ~data >> i & 1);
}
WRITE8_MEMBER(ufo_state::cp_digits_w)
@@ -284,7 +284,7 @@ WRITE8_MEMBER(ufo_state::cp_digits_w)
// d0-d3: cpanel digit
// other bits: ?
- output_set_digit_value(offset & 1, lut_7448[data & 0xf]);
+ machine().output().set_digit_value(offset & 1, lut_7448[data & 0xf]);
}
WRITE8_MEMBER(ufo_state::crane_xyz_w)
@@ -313,8 +313,8 @@ WRITE8_MEMBER(ufo_state::ufo_lamps_w)
// 11 = red, red
// 01 = green, red
// 10 = red, green
- output_set_lamp_value(10, data & 3);
- output_set_lamp_value(11, data >> 2 & 3);
+ machine().output().set_lamp_value(10, data & 3);
+ machine().output().set_lamp_value(11, data >> 2 & 3);
// d4,d5: ?
// d6,d7: coincounters
@@ -381,7 +381,7 @@ WRITE8_MEMBER(ufo_state::ex_cp_lamps_w)
{
// d0,d1,d4,d5: p1/p2 button lamps
for (int i = 0; i < 4; i++)
- output_set_lamp_value(i, ~data >> ((i&1) + (i&2) * 2) & 1);
+ machine().output().set_lamp_value(i, ~data >> ((i&1) + (i&2) * 2) & 1);
// d2,d3,d6,d7: p1/p2 coincounters
for (int i = 0; i < 4; i++)
@@ -412,7 +412,7 @@ WRITE8_MEMBER(ufo_state::ex_ufo800_lamps_w)
// d0-d4: 5 red leds on ufo
// other bits: ?
for (int i = 0; i < 5; i++)
- output_set_lamp_value(10 + i, data >> i & 1);
+ machine().output().set_lamp_value(10 + i, data >> i & 1);
}
/* 315-5338A */
@@ -423,7 +423,7 @@ WRITE8_MEMBER(ufo_state::ex_ufo21_lamps_w)
// d1-d6 are the 6 red leds on each ufo
// d7: ?
for (int i = 1; i < 7; i++)
- output_set_lamp_value(10 + offset * 10 + i, data >> i & 1);
+ machine().output().set_lamp_value(10 + offset * 10 + i, data >> i & 1);
}
WRITE8_MEMBER(ufo_state::ex_upd_start_w)
diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp
index 595b3fcc312..8366d3b10b2 100644
--- a/src/mame/drivers/segaxbd.cpp
+++ b/src/mame/drivers/segaxbd.cpp
@@ -864,10 +864,10 @@ void segaxbd_state::generic_iochip0_lamps_w(UINT8 data)
// d6: danger lamp
// in clone aburner, lamps work only in testmode?
- output_set_lamp_value(0, (data >> 5) & 0x01);
- output_set_lamp_value(1, (data >> 6) & 0x01);
- output_set_lamp_value(2, (data >> 1) & 0x01);
- output_set_lamp_value(3, (data >> 2) & 0x01);
+ machine().output().set_lamp_value(0, (data >> 5) & 0x01);
+ machine().output().set_lamp_value(1, (data >> 6) & 0x01);
+ machine().output().set_lamp_value(2, (data >> 1) & 0x01);
+ machine().output().set_lamp_value(3, (data >> 2) & 0x01);
}
diff --git a/src/mame/drivers/segaybd.cpp b/src/mame/drivers/segaybd.cpp
index 728659816a4..aff73d4f7e8 100644
--- a/src/mame/drivers/segaybd.cpp
+++ b/src/mame/drivers/segaybd.cpp
@@ -416,7 +416,7 @@ void segaybd_state::gforce2_output_cb1(UINT16 data)
void segaybd_state::gforce2_output_cb2(UINT16 data)
{
- output_set_value("start_lamp", BIT(data, 2));
+ machine().output().set_value("start_lamp", BIT(data, 2));
}
@@ -429,28 +429,28 @@ void segaybd_state::gloc_output_cb1(UINT16 data)
{
if (data < 32)
{
- output_set_value("right_motor_position", data);
+ machine().output().set_value("right_motor_position", data);
// normalization here prevents strange data from being transferred
// we do this because for some odd reason
// gloc starts with one piston all up and one all down.... at least data-wise it does
if (data > 1 && data < 29)
- output_set_value("right_motor_position_nor", data);
+ machine().output().set_value("right_motor_position_nor", data);
}
if (data < 40 && data > 31)
- output_set_value("right_motor_speed", data - 32);
+ machine().output().set_value("right_motor_speed", data - 32);
if (data < 96 && data > 63)
{
- output_set_value("left_motor_position", data);
+ machine().output().set_value("left_motor_position", data);
// normalized version... you know... for the kids
if ((data - 64) > 1 && (data - 64) < 29)
- output_set_value("left_motor_position_nor", data - 64);
+ machine().output().set_value("left_motor_position_nor", data - 64);
}
if (data < 104 && data > 95)
- output_set_value("left_motor_speed", data - 96);
+ machine().output().set_value("left_motor_speed", data - 96);
}
@@ -461,9 +461,9 @@ void segaybd_state::gloc_output_cb1(UINT16 data)
void segaybd_state::gloc_output_cb2(UINT16 data)
{
- output_set_value("start_lamp", BIT(data, 2));
- output_set_value("danger_lamp", BIT(data, 5));
- output_set_value("crash_lamp", BIT(data, 6));
+ machine().output().set_value("start_lamp", BIT(data, 2));
+ machine().output().set_value("danger_lamp", BIT(data, 5));
+ machine().output().set_value("crash_lamp", BIT(data, 6));
}
@@ -475,9 +475,9 @@ void segaybd_state::gloc_output_cb2(UINT16 data)
void segaybd_state::r360_output_cb2(UINT16 data)
{
// r360 cabinet
- output_set_value("start_lamp", BIT(data, 2));
+ machine().output().set_value("start_lamp", BIT(data, 2));
// even though the same output is used, I've split them to avoid confusion.
- output_set_value("emergency_stop_lamp", BIT(data, 2));
+ machine().output().set_value("emergency_stop_lamp", BIT(data, 2));
}
@@ -501,44 +501,44 @@ void segaybd_state::pdrift_output_cb1(UINT16 data)
// moving left
{
// in this rare instance, the bottom bits are used for positional data
- output_set_value("bank_data_raw", data);
- output_set_value("vibration_motor", 0);
+ machine().output().set_value("bank_data_raw", data);
+ machine().output().set_value("vibration_motor", 0);
switch (m_pdrift_bank)
// we want to go left one step at a time
{
case 1:
// all left
- output_set_value("bank_motor_position", 1);
+ machine().output().set_value("bank_motor_position", 1);
m_pdrift_bank = 1;
break;
case 2:
- output_set_value("bank_motor_position", 1);
+ machine().output().set_value("bank_motor_position", 1);
m_pdrift_bank = 1;
break;
case 3:
- output_set_value("bank_motor_position", 2);
+ machine().output().set_value("bank_motor_position", 2);
m_pdrift_bank = 2;
break;
case 4:
// centered
- output_set_value("bank_motor_position", 3);
+ machine().output().set_value("bank_motor_position", 3);
m_pdrift_bank = 3;
break;
case 5:
- output_set_value("bank_motor_position", 4);
+ machine().output().set_value("bank_motor_position", 4);
m_pdrift_bank = 4;
break;
case 6:
- output_set_value("bank_motor_position", 5);
+ machine().output().set_value("bank_motor_position", 5);
m_pdrift_bank = 5;
break;
case 7:
// all right
- output_set_value("bank_motor_position", 6);
+ machine().output().set_value("bank_motor_position", 6);
m_pdrift_bank = 6;
break;
default:
- output_set_value("bank_motor_position", 4);
+ machine().output().set_value("bank_motor_position", 4);
m_pdrift_bank = 4;
break;
}
@@ -548,44 +548,44 @@ void segaybd_state::pdrift_output_cb1(UINT16 data)
// moving right
{
// in this rare instance, the bottom bits are used for positional data
- output_set_value("bank_data_raw", data);
- output_set_value("vibration_motor", 0);
+ machine().output().set_value("bank_data_raw", data);
+ machine().output().set_value("vibration_motor", 0);
switch (m_pdrift_bank)
// we want to go right one step at a time
{
case 1:
// all left
- output_set_value("bank_motor_position", 2);
+ machine().output().set_value("bank_motor_position", 2);
m_pdrift_bank = 2;
break;
case 2:
- output_set_value("bank_motor_position", 3);
+ machine().output().set_value("bank_motor_position", 3);
m_pdrift_bank = 3;
break;
case 3:
- output_set_value("bank_motor_position", 4);
+ machine().output().set_value("bank_motor_position", 4);
m_pdrift_bank = 4;
break;
case 4:
// centered
- output_set_value("bank_motor_position", 5);
+ machine().output().set_value("bank_motor_position", 5);
m_pdrift_bank = 5;
break;
case 5:
- output_set_value("bank_motor_position", 6);
+ machine().output().set_value("bank_motor_position", 6);
m_pdrift_bank = 6;
break;
case 6:
- output_set_value("bank_motor_position", 7);
+ machine().output().set_value("bank_motor_position", 7);
m_pdrift_bank = 7;
break;
case 7:
// all right
- output_set_value("bank_motor_position", 7);
+ machine().output().set_value("bank_motor_position", 7);
m_pdrift_bank = 7;
break;
default:
- output_set_value("bank_motor_position", 4);
+ machine().output().set_value("bank_motor_position", 4);
m_pdrift_bank = 4;
break;
@@ -595,11 +595,11 @@ void segaybd_state::pdrift_output_cb1(UINT16 data)
else
{
// the vibration value uses the first few bits to give a number between 0 and 7
- output_set_value("vibration_motor", data & 7);
+ machine().output().set_value("vibration_motor", data & 7);
// normalize the data and subtract the vibration value from it*/
m_pdrift_bank = data - (data & 7);
- output_set_value("bank_data_raw", m_pdrift_bank & 0xFF);
+ machine().output().set_value("bank_data_raw", m_pdrift_bank & 0xFF);
// position values from left to right
// 56 48 40 120 72 80 88
@@ -611,27 +611,27 @@ void segaybd_state::pdrift_output_cb1(UINT16 data)
{
case 56:
// all left
- output_set_value("bank_motor_position", 1);
+ machine().output().set_value("bank_motor_position", 1);
break;
case 48:
- output_set_value("bank_motor_position", 2);
+ machine().output().set_value("bank_motor_position", 2);
break;
case 40:
- output_set_value("bank_motor_position", 3);
+ machine().output().set_value("bank_motor_position", 3);
break;
case 120:
// centered
- output_set_value("bank_motor_position", 4);
+ machine().output().set_value("bank_motor_position", 4);
break;
case 72:
- output_set_value("bank_motor_position", 5);
+ machine().output().set_value("bank_motor_position", 5);
break;
case 80:
- output_set_value("bank_motor_position", 6);
+ machine().output().set_value("bank_motor_position", 6);
break;
case 88:
// all right
- output_set_value("bank_motor_position", 7);
+ machine().output().set_value("bank_motor_position", 7);
break;
// these are the only valid values but 24 pops up sometimes when we crash
}
@@ -647,8 +647,8 @@ void segaybd_state::pdrift_output_cb1(UINT16 data)
void segaybd_state::pdrift_output_cb2(UINT16 data)
{
- output_set_value("start_lamp", BIT(data, 2));
- output_set_value("upright_wheel_motor", BIT(data, 1));
+ machine().output().set_value("start_lamp", BIT(data, 2));
+ machine().output().set_value("upright_wheel_motor", BIT(data, 1));
}
@@ -659,11 +659,11 @@ void segaybd_state::pdrift_output_cb2(UINT16 data)
void segaybd_state::rchase_output_cb2(UINT16 data)
{
- output_set_value("left_start_lamp", BIT(data, 2));
- output_set_value("right_start_lamp", BIT(data, 1));
+ machine().output().set_value("left_start_lamp", BIT(data, 2));
+ machine().output().set_value("right_start_lamp", BIT(data, 1));
- output_set_value("P1_Gun_Recoil", BIT(data, 6));
- output_set_value("P2_Gun_Recoil", BIT(data, 5));
+ machine().output().set_value("P1_Gun_Recoil", BIT(data, 6));
+ machine().output().set_value("P2_Gun_Recoil", BIT(data, 5));
}
@@ -2732,8 +2732,8 @@ DRIVER_INIT_MEMBER(segaybd_state,gloc)
m_output_cb1 = output_delegate(FUNC(segaybd_state::gloc_output_cb1), this);
m_output_cb2 = output_delegate(FUNC(segaybd_state::gloc_output_cb2), this);
- output_set_value("left_motor_position_nor", 16);
- output_set_value("right_motor_position_nor", 16);
+ machine().output().set_valu